From cec718a62c329dd6855fc5b94192c7c65563a7f8 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 17 Apr 2024 17:21:14 +0200 Subject: [PATCH] Remove explicit dependency on MapboxCommon --- xcode_cloud/Demo.xcodeproj/project.pbxproj | 41 ------------------- .../xcshareddata/swiftpm/Package.resolved | 15 +++---- 2 files changed, 8 insertions(+), 48 deletions(-) diff --git a/xcode_cloud/Demo.xcodeproj/project.pbxproj b/xcode_cloud/Demo.xcodeproj/project.pbxproj index cbf55d892..1f97462b6 100644 --- a/xcode_cloud/Demo.xcodeproj/project.pbxproj +++ b/xcode_cloud/Demo.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165D2B9A387100B9BE88 /* MapboxSearch */; }; 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = 040B165F2B9A387100B9BE88 /* MapboxSearchUI */; }; - 040CD5172BCDBAA200DEB4E9 /* MapboxCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */; }; 04A4218E2BCD6CD600007D9C /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217C2BCD6CD600007D9C /* Main.strings */; }; 04A4218F2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A4217E2BCD6CD600007D9C /* PlaceAutocompleteMainViewController.swift */; }; 04A421902BCD6CD600007D9C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 04A4217F2BCD6CD600007D9C /* Assets.xcassets */; }; @@ -23,8 +21,6 @@ 04A421982BCD6CD600007D9C /* AddressAutofillResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A421892BCD6CD600007D9C /* AddressAutofillResultViewController.swift */; }; 04A421992BCD6CD600007D9C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A4218B2BCD6CD600007D9C /* AppDelegate.swift */; }; 04A4219B2BCD6CD600007D9C /* San Carlos, California.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 04A4218D2BCD6CD600007D9C /* San Carlos, California.gpx */; }; - E6FC5AEA2640418F00240BBB /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */; }; - E6FC5AEC2640418F00240BBB /* CwlPosixPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -51,11 +47,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 040B165E2B9A387100B9BE88 /* MapboxSearch in Frameworks */, 040B16602B9A387100B9BE88 /* MapboxSearchUI in Frameworks */, - 040CD5172BCDBAA200DEB4E9 /* MapboxCommon in Frameworks */, - E6FC5AEC2640418F00240BBB /* CwlPosixPreconditionTesting in Frameworks */, - E6FC5AEA2640418F00240BBB /* CwlPreconditionTesting in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -126,11 +118,7 @@ ); name = Demo; packageProductDependencies = ( - E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */, - E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */, - 040B165D2B9A387100B9BE88 /* MapboxSearch */, 040B165F2B9A387100B9BE88 /* MapboxSearchUI */, - 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */, ); productName = Demo; productReference = E6E85A082640199800C0EF0F /* Demo.app */; @@ -163,7 +151,6 @@ packageReferences = ( E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */, 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */, - 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */, ); productRefGroup = E6E85A092640199800C0EF0F /* Products */; projectDirPath = ""; @@ -454,14 +441,6 @@ kind = branch; }; }; - 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/mapbox/mapbox-common-ios.git"; - requirement = { - kind = exactVersion; - version = 24.2.0; - }; - }; E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mattgallagher/CwlPreconditionTesting.git"; @@ -473,31 +452,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 040B165D2B9A387100B9BE88 /* MapboxSearch */ = { - isa = XCSwiftPackageProductDependency; - package = 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */; - productName = MapboxSearch; - }; 040B165F2B9A387100B9BE88 /* MapboxSearchUI */ = { isa = XCSwiftPackageProductDependency; package = 040B165C2B9A387100B9BE88 /* XCRemoteSwiftPackageReference "mapbox-search-ios" */; productName = MapboxSearchUI; }; - 040CD5162BCDBAA200DEB4E9 /* MapboxCommon */ = { - isa = XCSwiftPackageProductDependency; - package = 040CD5152BCDBAA200DEB4E9 /* XCRemoteSwiftPackageReference "mapbox-common-ios" */; - productName = MapboxCommon; - }; - E6FC5AE92640418F00240BBB /* CwlPreconditionTesting */ = { - isa = XCSwiftPackageProductDependency; - package = E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; - productName = CwlPreconditionTesting; - }; - E6FC5AEB2640418F00240BBB /* CwlPosixPreconditionTesting */ = { - isa = XCSwiftPackageProductDependency; - package = E6FC5AE82640418F00240BBB /* XCRemoteSwiftPackageReference "CwlPreconditionTesting" */; - productName = CwlPosixPreconditionTesting; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = E6E85A002640199800C0EF0F /* Project object */; diff --git a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a29bd2d00..fa157d85b 100644 --- a/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xcode_cloud/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,12 +1,13 @@ { + "originHash" : "3c7aa5350f176ddb4ecb4087f3a78addec24e3ca96da6ea7048e18e3028add2b", "pins" : [ { "identity" : "cwlcatchexception", "kind" : "remoteSourceControl", "location" : "https://github.com/mattgallagher/CwlCatchException.git", "state" : { - "revision" : "682841464136f8c66e04afe5dbd01ab51a3a56f2", - "version" : "2.1.0" + "revision" : "3ef6999c73b6938cc0da422f2c912d0158abb0a0", + "version" : "2.2.0" } }, { @@ -14,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git", "state" : { - "revision" : "02b7a39a99c4da27abe03cab2053a9034379639f", - "version" : "2.0.0" + "revision" : "2ef56b2caf25f55fa7eef8784c30d5a767550f54", + "version" : "2.2.1" } }, { @@ -23,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "72474daaeabb644edd449492f9e668f716da72e6", - "version" : "24.2.0" + "revision" : "15aed0b292a0fe0672113c1b69be04bd350c8bb3", + "version" : "24.3.1" } }, { @@ -37,5 +38,5 @@ } } ], - "version" : 2 + "version" : 3 }