From 3c48d7c18384e5d159536036dda64a34a5430a6e Mon Sep 17 00:00:00 2001 From: "Matthew M. Keeler" Date: Fri, 18 Oct 2024 17:02:17 -0400 Subject: [PATCH] ci: Pin transitive dependency (#410) The Quick\Nimble framework is targeting CwlPreconditionTesting, allowing for an update to a new major version. CwlPreconditionTesting released a version that references the new visionOS OS type, which older swift versions don't understand. For now, we are going to pin CwlPreconditionTesting to the pre-visionOS-aware version. We can remove this explicit dependency once we have dropped support for older builds (like xcode 13). --- LaunchDarkly.xcodeproj/project.pbxproj | 16 ++++++++++++++++ Package.swift | 2 ++ 2 files changed, 18 insertions(+) diff --git a/LaunchDarkly.xcodeproj/project.pbxproj b/LaunchDarkly.xcodeproj/project.pbxproj index a2e6aace..3d7a69fc 100644 --- a/LaunchDarkly.xcodeproj/project.pbxproj +++ b/LaunchDarkly.xcodeproj/project.pbxproj @@ -563,6 +563,7 @@ B4903D9E24BD61EF00F087C4 /* Quick in Frameworks */, B4903D9B24BD61D000F087C4 /* Nimble in Frameworks */, B4903D9824BD61B200F087C4 /* OHHTTPStubsSwift in Frameworks */, + A3F4A4812CC2F640006EF480 /* CwlPreconditionTesting in Frameworks */, 8354EFCC1F22491C00C05156 /* LaunchDarkly.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1073,6 +1074,7 @@ B4903D9724BD61B200F087C4 /* OHHTTPStubsSwift */, B4903D9A24BD61D000F087C4 /* Nimble */, B4903D9D24BD61EF00F087C4 /* Quick */, + A3F4A4802CC2F640006EF480 /* CwlPreconditionTesting */, ); productName = DarklyTests; productReference = 8354EFCB1F22491C00C05156 /* LaunchDarklyTests.xctest */; @@ -1156,6 +1158,7 @@ B4903D9C24BD61EF00F087C4 /* XCRemoteSwiftPackageReference "Quick" */, B445A6DE24C0D1CD000BAD6D /* XCRemoteSwiftPackageReference "swift-eventsource" */, A3647AA12C5BF6DD00902D0C /* XCRemoteSwiftPackageReference "DataCompression" */, + A3F4A47F2CC2F625006EF480 /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */, ); productRefGroup = 8354EFC31F22491C00C05156 /* Products */; projectDirPath = ""; @@ -2093,6 +2096,14 @@ minimumVersion = 3.8.0; }; }; + A3F4A47F2CC2F625006EF480 /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/mattgallagher/CwlPreconditionTesting"; + requirement = { + kind = exactVersion; + version = 2.1.2; + }; + }; B445A6DE24C0D1CD000BAD6D /* XCRemoteSwiftPackageReference "swift-eventsource" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/LaunchDarkly/swift-eventsource.git"; @@ -2188,6 +2199,11 @@ package = A3647AA12C5BF6DD00902D0C /* XCRemoteSwiftPackageReference "DataCompression" */; productName = DataCompression; }; + A3F4A4802CC2F640006EF480 /* CwlPreconditionTesting */ = { + isa = XCSwiftPackageProductDependency; + package = A3F4A47F2CC2F625006EF480 /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; + productName = CwlPreconditionTesting; + }; B445A6E324C0D1E3000BAD6D /* LDSwiftEventSource */ = { isa = XCSwiftPackageProductDependency; package = B445A6DE24C0D1CD000BAD6D /* XCRemoteSwiftPackageReference "swift-eventsource" */; diff --git a/Package.swift b/Package.swift index 4b10bace..d0885ab3 100644 --- a/Package.swift +++ b/Package.swift @@ -19,6 +19,7 @@ let package = Package( .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", .exact("9.1.0")), .package(url: "https://github.com/Quick/Quick.git", .exact("4.0.0")), .package(url: "https://github.com/Quick/Nimble.git", .exact("9.2.1")), + .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting", .exact("2.1.2")), .package(name: "LDSwiftEventSource", url: "https://github.com/LaunchDarkly/swift-eventsource.git", .exact("3.3.0")), .package(name: "DataCompression", url: "https://github.com/mw99/DataCompression", .exact("3.8.0")) ], @@ -40,6 +41,7 @@ let package = Package( "LaunchDarkly", .product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs"), .product(name: "Quick", package: "Quick"), + .product(name: "CwlPreconditionTesting", package: "CwlPreconditionTesting"), .product(name: "Nimble", package: "Nimble") ], path: "LaunchDarkly",