bump CwlPreconditionTesting to 2.2.0

Quick · Nov 14, 2023 · 3ff34fc · 3ff34fc
1 parent 5cf19ca
commit 3ff34fc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,2 @@
 github "mattgallagher/CwlCatchException" ~> 2.0
-github "bitmovin-engineering/CwlPreconditionTesting" "bitmovin/main"
+github "mattgallagher/CwlPreconditionTesting" ~> 2.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "bitmovin-engineering/CwlPreconditionTesting" "1a3d129278e6e1b0622fdc965fe4d0f9b6cea3e3"
 github "mattgallagher/CwlCatchException" "2.1.2"
+github "mattgallagher/CwlPreconditionTesting" "2.2.0"
diff --git a/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift b/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift
@@ -20,7 +20,7 @@
 
 import Foundation
 
-#if SWIFT_PACKAGE
+#if SWIFT_PACKAGE || COCOAPODS
 import CwlCatchExceptionSupport
 #endif
 

diff --git a/...ts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift b/...ts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift
@@ -22,7 +22,7 @@
 
 import Foundation
 
-#if SWIFT_PACKAGE
+#if SWIFT_PACKAGE || COCOAPODS
 	import CwlMachBadInstructionHandler
 #endif
 

diff --git a/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift
@@ -23,7 +23,7 @@
 import Foundation
 import Swift
 
-#if SWIFT_PACKAGE
+#if SWIFT_PACKAGE || COCOAPODS
 	import CwlCatchException
 	import CwlMachBadInstructionHandler
 #endif

diff --git a/[email protected] b/[email protected]
@@ -19,8 +19,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        // TODO: use official repo once merged
-        .package(url: "https://github.com/bitmovin-engineering/CwlPreconditionTesting.git", branch: "bitmovin/feature/visionos-support"),
+        .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", .upToNextMajor(from: "2.2.0")),
     ],
     targets: {
         var testHelperDependencies: [PackageDescription.Target.Dependency] = ["Nimble"]