use cx 0.3.0

cx-org · Dec 8, 2020 · 3587582 · 3587582
1 parent e5d2460
commit 3587582
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 22 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,35 +6,44 @@
         "repositoryURL": "https://github.com/cx-org/CombineX",
         "state": {
           "branch": null,
-          "revision": "9ce154b155643ec8939d84cb6ae00c331ff3eca0",
-          "version": "0.2.1"
+          "revision": "96cd76ccddac5d0493ebd91d69f1e6e9ccb58f5f",
+          "version": "0.3.0"
         }
       },
       {
-        "package": "Nimble",
-        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "package": "CwlCatchException",
+        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
         "state": {
           "branch": null,
-          "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
-          "version": "8.0.2"
+          "revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
+          "version": "2.0.0"
         }
       },
       {
-        "package": "Quick",
-        "repositoryURL": "https://github.com/Quick/Quick.git",
+        "package": "CwlPreconditionTesting",
+        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
         "state": {
           "branch": null,
-          "revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
-          "version": "2.2.1"
+          "revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
+          "version": "2.0.0"
         }
       },
       {
-        "package": "Semver",
-        "repositoryURL": "https://github.com/ddddxxx/Semver.git",
+        "package": "Nimble",
+        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "state": {
+          "branch": null,
+          "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5",
+          "version": "9.0.0"
+        }
+      },
+      {
+        "package": "Quick",
+        "repositoryURL": "https://github.com/Quick/Quick.git",
         "state": {
           "branch": null,
-          "revision": "6094e6f23a02b52b5d211fd114a4750c4f3ecef3",
-          "version": "0.2.1"
+          "revision": "0038bcbab4292f3b028632556507c124e5ba69f3",
+          "version": "3.0.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -1,31 +1,48 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.2
 
 import PackageDescription
 
 let package = Package(
     name: "CXExtensions",
     platforms: [
-        .macOS(.v10_10), .iOS(.v8), .tvOS(.v9), .watchOS(.v2),
+        .macOS(.v10_10),
+        .iOS(.minimalToolChainSupported),
+        .tvOS(.v9),
+        .watchOS(.v2),
     ],
     products: [
         .library(name: "CXExtensions", targets: ["CXExtensions"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/cx-org/CombineX", .upToNextMinor(from: "0.2.0")),
-        .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
-        // TODO: Use "8.0.2" until https://github.com/Quick/Nimble/issues/705 is fixed.
-        .package(url: "https://github.com/Quick/Nimble.git", .exact("8.0.2")),
+        .package(url: "https://github.com/cx-org/CombineX", .upToNextMinor(from: "0.3.0")),
+        .package(url: "https://github.com/Quick/Quick.git", from: "3.0.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "9.0.0"),
     ],
     targets: [
         .target(
             name: "CXExtensions",
-            dependencies: ["CXShim"]),
+            dependencies: [
+                .product(name: "CXShim", package: "CombineX")
+            ]),
         .testTarget(
             name: "CXExtensionsTests",
-            dependencies: ["CXExtensions", "CXTest", "Quick", "Nimble"]),
+            dependencies: [
+                "CXExtensions",
+                "Quick",
+                "Nimble",
+                .product(name: "CXTest", package: "CombineX"),
+            ]),
     ]
 )
 
+extension SupportedPlatform.IOSVersion {
+    #if compiler(>=5.3)
+    static var minimalToolChainSupported = SupportedPlatform.IOSVersion.v9
+    #else
+    static var minimalToolChainSupported = SupportedPlatform.IOSVersion.v8
+    #endif
+}
+
 enum CombineImplementation {
 
     case combine