Prepare release 0.6.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,7 +20,7 @@ A clear and concise description of what you expected to happen.
 
 ## System
  - OS: [e.g. macOS 11, iOS 14]
- - Conbini: [e.g. 0.7.0]
+ - Conbini: [e.g. 0.6.1]
    You can check this in your SPM `Package.swift` file (or `Package.resolved` file). Alternatively, go to Xcode's Source Control Navigator (`⌘+2`) and click on `Conbini`.
 
 ## Additional context

.github/ISSUE_TEMPLATE/question.md

@@ -16,5 +16,5 @@ Add any other context about the question here.
 ## System
 Delete section if not applicable
  - OS: [e.g. macOS 11, iOS 14]
- - Conbini: [e.g. 0.7.0]
+ - Conbini: [e.g. 0.6.1]
    You can check this in your SPM `Package.swift` file (or `Package.resolved` file). Alternatively, go to Xcode's Source Control Navigator (`⌘+2`) and click on `Conbini`.

Package.swift

@@ -1,17 +1,20 @@
 // swift-tools-version:5.1
 import PackageDescription
 
-let package = Package(
+var package = Package(
     name: "Conbini",
     platforms: [
         .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)
     ],
     products: [
         .library(name: "Conbini", targets: ["Conbini"]),
+        .library(name: "ConbiniForTesting", targets: ["ConbiniForTesting"])
     ],
     dependencies: [],
     targets: [
-        .target(name: "Conbini", dependencies: [], path: "sources"),
-        .testTarget(name: "ConbiniTests", dependencies: ["Conbini"], path: "tests"),
+        .target(name: "Conbini", path: "sources/runtime"),
+        .target(name: "ConbiniForTesting", path: "sources/testing"),
+        .testTarget(name: "ConbiniTests", dependencies: ["Conbini"], path: "tests/runtime"),
+        .testTarget(name: "ConbiniForTestingTests", dependencies: ["Conbini", "ConbiniForTesting"], path: "tests/testing"),
     ]
 )

README.md

@@ -24,14 +24,22 @@ import PackageDescription
 let package = Package(
     /* Your package name, supported platforms, and generated products go here */
     dependencies: [
-        .package(url: "https://github.com/dehesa/Conbini.git", from: "0.7.0")
+        .package(url: "https://github.com/dehesa/Conbini.git", from: "0.6.1")
     ],
     targets: [
         .target(name: /* Your target name here */, dependencies: ["Conbini"])
     ]
 )
 ```
 
+If you want to use Conbini's [testing](#testing) extension, you need to define the `CONBINI_FOR_TESTING` flag on your SPM targets or testing targets. Conbini testing extensions require `XCTest`, which is not available in runtime on some platforms (such as watchOS), or you may not want to link to such dynamic library (e.g. when building command-line tools).
+
+```swift
+targets: [
+    .testTarget(name: /* Your target name here */, dependencies: ["Conbini"], swiftSettings: [.define("CONBINI_FOR_TESTING")])
+]
+```
+
 </p></details>
 
 <details><summary>Import <code>Conbini</code> in the file that needs it.</summary><p>
@@ -40,6 +48,11 @@ let package = Package(
 import Conbini
 ```
 
+The testing conveniences depend on [XCTest](https://developer.apple.com/documentation/xctest), which is not available on regular execution. That is why Conbini is offered in two flavors:
+
+-   `import Conbini` includes all code excepts the testing conveniences.
+-   `import ConbiniForTesting` includes the testing functionality only.
+
 </p></details>
 </ul>
 

sources/subscribers/Expectations.swift → sources/testing/Expectations.swift

@@ -1,4 +1,4 @@
-#if !os(watchOS) && canImport(XCTest)
+#if !os(watchOS)
 import XCTest
 import Combine
 

sources/subscribers/XCTestCase.swift → sources/testing/XCTestCase.swift

@@ -1,4 +1,4 @@
-#if !os(watchOS) && canImport(XCTest)
+#if !os(watchOS)
 import XCTest
 import Combine
 import Foundation

tests/operators/AssignOpTests.swift → tests/runtime/operators/AssignOpTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -54,4 +53,3 @@ extension AssignOpTests {
         XCTAssert(objC.value == data.last!)
     }
 }
-#endif

tests/operators/DelayedRetryOpTests.swift → tests/runtime/operators/DelayedRetryOpTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -101,4 +100,3 @@ extension DelayedRetryOpTests {
         cancellable.cancel()
     }
 }
-#endif

tests/operators/HandleEndOpTests.swift → tests/runtime/operators/HandleEndOpTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -132,4 +131,3 @@ extension HandleEndOpTests {
         cancellable.cancel()
     }
 }
-#endif

tests/operators/ResultOpTests.swift → tests/runtime/operators/ResultOpTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -74,4 +73,3 @@ extension ResultOpTests {
         self.wait(for: [expA], timeout: 0.2)
     }
 }
-#endif

tests/operators/ThenOpTests.swift → tests/runtime/operators/ThenOpTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -55,4 +54,3 @@ extension ThenOpTests {
         cancellable.cancel()
     }
 }
-#endif

tests/publishers/DeferredCompleteTests.swift → tests/runtime/publishers/DeferredCompleteTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -90,4 +89,3 @@ extension DeferredCompleteTests {
         cancellable.cancel()
     }
 }
-#endif

tests/publishers/DeferredFutureTests.swift → tests/runtime/publishers/DeferredFutureTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -80,4 +79,3 @@ extension DeferredFutureTests {
         cancellable.cancel()
     }
 }
-#endif

tests/publishers/DeferredPassthroughTests.swift → tests/runtime/publishers/DeferredPassthroughTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -87,4 +86,3 @@ extension DeferredPassthroughTests {
         XCTAssertEqual(.init(values.prefix(upTo: 2)), receivedValues)
     }
 }
-#endif

tests/publishers/DeferredResultTests.swift → tests/runtime/publishers/DeferredResultTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -53,4 +52,3 @@ extension DeferredResultTests {
         self.wait(for: [exp], timeout: 0.2)
     }
 }
-#endif

tests/publishers/DeferredTryCompleteTests.swift → tests/runtime/publishers/DeferredTryCompleteTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -83,4 +82,3 @@ extension DeferredTryCompleteTests {
         self.wait(for: [exp], timeout: 0.2)
     }
 }
-#endif

tests/publishers/DeferredTryValueTests.swift → tests/runtime/publishers/DeferredTryValueTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -51,4 +50,3 @@ extension DeferredTryValueTests {
         self.wait(for: [exp], timeout: 0.2)
     }
 }
-#endif

tests/publishers/DeferredValueTests.swift → tests/runtime/publishers/DeferredValueTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -37,4 +36,3 @@ extension DeferredValueTests {
         self.wait(for: [exp], timeout: 0.2)
     }
 }
-#endif

tests/subscribers/FixedSinkTests.swift → tests/runtime/subscribers/FixedSinkTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -86,4 +85,3 @@ extension FixedSinkTests {
         subscriber.cancel()
     }
 }
-#endif

tests/subscribers/GraduatedSinkTests.swift → tests/runtime/subscribers/GraduatedSinkTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -65,4 +64,3 @@ extension GraduatedSinkTests {
         subscriber.cancel()
     }
 }
-#endif

tests/utils/BufferTests.swift → tests/runtime/utils/BufferTests.swift

@@ -1,4 +1,3 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
 import Combine
@@ -70,4 +69,3 @@ extension BufferTests {
         XCTAssertEqual(input.map { $0 * 4 }, output)
     }
 }
-#endif

tests/subscribers/ExpectationsTests.swift → tests/testing/ExpectationsTests.swift

@@ -1,6 +1,6 @@
-#if !os(watchOS)
 import XCTest
 import Conbini
+import ConbiniForTesting
 import Combine
 
 /// Tests the correct behavior of the *expectation* conveniences.
@@ -82,4 +82,3 @@ extension ExpectationsTests {
         XCTAssertEqual(.init(values[0..<2]), subjectEmitted)
     }
 }
-#endif