Merge pull request #729 from Quick/8.x-fix-swiftpm-CwlPreconditionTes…

…ting-linking-issue [8.x] Fix CwlPreconditionTesting linking issue when used by SwiftPM
Quick · Mar 29, 2020 · 3396b74 · 3396b74
2 parents 827b2b1 + 6e04095
commit 3396b74
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 66 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -6,6 +6,8 @@ included:
   - Tests
 
 excluded:
+  - Package.swift
+  - Package@swift-4.2.swift
   - Carthage/Checkouts
   - Tests/NimbleTests/XCTestManifests.swift
   - Tests/NimbleTests/Helpers/XCTestCaseProvider.swift

diff --git a/...nTesting/Dependencies/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift b/...nTesting/Dependencies/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift
@@ -20,8 +20,8 @@
 
 import Foundation
 
-#if SWIFT_PACKAGE
-import CwlCatchExceptionSupport
+#if canImport(NimbleCwlCatchExceptionSupport)
+import NimbleCwlCatchExceptionSupport
 #endif
 
 private func catchReturnTypeConverter<T: NSException>(_ type: T.Type, block: @escaping () -> Void) -> T? {

diff --git a/...ts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift b/...ts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift
@@ -22,8 +22,8 @@
 
 import Foundation
 
-#if SWIFT_PACKAGE
-	import CwlMachBadInstructionHandler
+#if canImport(NimbleCwlMachBadInstructionHandler)
+import NimbleCwlMachBadInstructionHandler
 #endif
 
 private func raiseBadInstructionException() {

diff --git a/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift
@@ -23,8 +23,9 @@
 import Foundation
 import Swift
 
-#if SWIFT_PACKAGE
-	import CwlMachBadInstructionHandler
+#if canImport(NimbleCwlCatchException) && canImport(NimbleCwlMachBadInstructionHandler)
+import NimbleCwlCatchException
+import NimbleCwlMachBadInstructionHandler
 #endif
 
 private enum PthreadError: Error { case code(Int32) }

diff --git a/Package.resolved b/Package.resolved
@@ -1,24 +1,7 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "CwlCatchException",
-        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
-        "state": {
-          "branch": null,
-          "revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66",
-          "version": "1.2.0"
-        }
-      },
-      {
-        "package": "CwlPreconditionTesting",
-        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
-        "state": {
-          "branch": null,
-          "revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b",
-          "version": "1.2.0"
-        }
-      }
+
     ]
   },
   "version": 1

diff --git a/Package.swift b/Package.swift
@@ -1,6 +1,57 @@
 // swift-tools-version:5.0
 import PackageDescription
 
+var targets: [Target] = [
+    .target(
+        name: "Nimble",
+        dependencies: {
+            #if os(macOS)
+            return [
+                "NimbleCwlPreconditionTesting",
+                "NimbleCwlMachBadInstructionHandler",
+            ]
+            #else
+            return []
+            #endif
+        }()
+    ),
+    .testTarget(
+        name: "NimbleTests",
+        dependencies: ["Nimble"],
+        exclude: ["objc"]
+    ),
+]
+#if os(macOS)
+targets.append(contentsOf: [
+    // https://github.com/Quick/Nimble/blob/8.x-branch/Carthage/Checkouts/CwlPreconditionTesting/Package.swift
+    .target(
+        name: "NimbleCwlPreconditionTesting",
+        dependencies: [
+            .target(name: "NimbleCwlMachBadInstructionHandler"),
+            .target(name: "NimbleCwlCatchException")
+        ],
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting",
+        exclude: [
+            "./CwlCatchBadInstructionPosix.swift"
+        ]
+    ),
+    .target(
+        name: "NimbleCwlMachBadInstructionHandler",
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler"
+    ),
+    // https://github.com/Quick/Nimble/blob/8.x-branch/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift
+    .target(
+        name: "NimbleCwlCatchException",
+        dependencies: [.target(name: "NimbleCwlCatchExceptionSupport")],
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchException"
+    ),
+    .target(
+        name: "NimbleCwlCatchExceptionSupport",
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport"
+    ),
+])
+#endif
+
 let package = Package(
     name: "Nimble",
     platforms: [
@@ -9,25 +60,6 @@ let package = Package(
     products: [
         .library(name: "Nimble", targets: ["Nimble"]),
     ],
-    dependencies: [
-        .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", .exact("1.2.0")),
-    ],
-    targets: [
-        .target(
-            name: "Nimble", 
-            dependencies: {
-                #if os(macOS)
-                return ["CwlPreconditionTesting"]
-                #else
-                return []
-                #endif
-            }()
-        ),
-        .testTarget(
-            name: "NimbleTests", 
-            dependencies: ["Nimble"], 
-            exclude: ["objc"]
-        ),
-    ],
+    targets: targets,
     swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift
@@ -1,30 +1,62 @@
 // swift-tools-version:4.2
 import PackageDescription
 
+var targets: [Target] = [
+    .target(
+        name: "Nimble",
+        dependencies: {
+            #if os(macOS)
+            return [
+                "NimbleCwlPreconditionTesting",
+                "NimbleCwlMachBadInstructionHandler",
+            ]
+            #else
+            return []
+            #endif
+        }()
+    ),
+    .testTarget(
+        name: "NimbleTests",
+        dependencies: ["Nimble"],
+        exclude: ["objc"]
+    ),
+]
+#if os(macOS)
+targets.append(contentsOf: [
+    // https://github.com/Quick/Nimble/blob/8.x-branch/Carthage/Checkouts/CwlPreconditionTesting/Package.swift
+    .target(
+        name: "NimbleCwlPreconditionTesting",
+        dependencies: [
+            .target(name: "NimbleCwlMachBadInstructionHandler"),
+            .target(name: "NimbleCwlCatchException")
+        ],
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting",
+        exclude: [
+            "./CwlCatchBadInstructionPosix.swift"
+        ]
+    ),
+    .target(
+        name: "NimbleCwlMachBadInstructionHandler",
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler"
+    ),
+    // https://github.com/Quick/Nimble/blob/8.x-branch/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift
+    .target(
+        name: "NimbleCwlCatchException",
+        dependencies: [.target(name: "NimbleCwlCatchExceptionSupport")],
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchException"
+    ),
+    .target(
+        name: "NimbleCwlCatchExceptionSupport",
+        path: "Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport"
+    ),
+])
+#endif
+
 let package = Package(
     name: "Nimble",
     products: [
         .library(name: "Nimble", targets: ["Nimble"]),
     ],
-    dependencies: [
-        .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", .exact("1.2.0")),
-    ],
-    targets: [
-        .target(
-            name: "Nimble", 
-            dependencies: {
-                #if os(macOS)
-                return ["CwlPreconditionTesting"]
-                #else
-                return []
-                #endif
-            }()
-        ),
-        .testTarget(
-            name: "NimbleTests", 
-            dependencies: ["Nimble"], 
-            exclude: ["objc"]
-        ),
-    ],
+    targets: targets,
     swiftLanguageVersions: [.v4_2]
 )
diff --git a/Sources/Nimble/Matchers/ThrowAssertion.swift b/Sources/Nimble/Matchers/ThrowAssertion.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(CwlPreconditionTesting)
-import CwlPreconditionTesting
+#if canImport(NimbleCwlPreconditionTesting)
+import NimbleCwlPreconditionTesting
 #endif
 
 public func throwAssertion() -> Predicate<Void> {