Merge pull request #567 from SourcePointUSA/fix_spm_runtime

Fix SPM runtime
SourcePointUSA · Apr 24, 2024 · bffbdec · bffbdec
2 parents fe1865d + 5ceeef6
commit bffbdec
Show file tree

Hide file tree

Showing 28 changed files with 3,885 additions and 159 deletions.
diff --git a/ConsentViewController/Classes/Consents/GoogleConsentMode/SPGCMData.swift b/ConsentViewController/Classes/Consents/GoogleConsentMode/SPGCMData.swift
@@ -23,7 +23,6 @@ public struct SPGCMData: Codable, Equatable {
     public let adStorage, analyticsStorage, adUserData, adPersonalization: Status?
 }
 
-@available(swift, obsoleted: 1.0)
 @objcMembers public class SPGCMDataObjc: NSObject {
     @objc(SPGCMDataObjc_ObjcStatus)
     public enum ObjcStatus: Int, CustomStringConvertible {

diff --git a/Example/ConsentViewController.xcodeproj/project.pbxproj b/Example/ConsentViewController.xcodeproj/project.pbxproj
@@ -143,6 +143,7 @@
 		8216E2612BB31D8D006FEF11 /* Pods_NativePMExampleAppUITests.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 615BBC646752BDBE2B3F2E7C /* Pods_NativePMExampleAppUITests.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		8216F2EE29FAB4B400133C69 /* AuthExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8216F2ED29FAB4B400133C69 /* AuthExampleApp.swift */; };
 		8216F2F029FAB60400133C69 /* CustomMatchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8216F2EF29FAB60400133C69 /* CustomMatchers.swift */; };
+		8224216A2BD6DE870081141F /* ConsentViewController in Frameworks */ = {isa = PBXBuildFile; productRef = 822421692BD6DE870081141F /* ConsentViewController */; };
 		8225BAB0298BF0E300C2E5FA /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8225BAAF298BF0E300C2E5FA /* Config.swift */; };
 		8225BAB2298BF1F200C2E5FA /* Statuses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8225BAB1298BF1F200C2E5FA /* Statuses.swift */; };
 		8229C6162991390300F755AA /* SPClientCoordinatorSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8229C6152991390300F755AA /* SPClientCoordinatorSpec.swift */; };
@@ -163,7 +164,6 @@
 		824796592B7AAD2300D3C4E9 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 824796582B7AAD2300D3C4E9 /* GoogleService-Info.plist */; };
 		8248A497247D17AA00A7D9AD /* SimpleClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8248A496247D17AA00A7D9AD /* SimpleClientSpec.swift */; };
 		8248A499247E5FCC00A7D9AD /* SPGDPRConsentsSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8248A498247E5FCC00A7D9AD /* SPGDPRConsentsSpec.swift */; };
-		8249DC982B59AB3D004F45B4 /* ConsentViewController in Frameworks */ = {isa = PBXBuildFile; productRef = 8249DC972B59AB3D004F45B4 /* ConsentViewController */; };
 		824BC0342463F6B0006D3C18 /* SPActionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 824BC0332463F6B0006D3C18 /* SPActionSpec.swift */; };
 		824E88302729507F00B6C9C8 /* NativeMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 824E882F2729507F00B6C9C8 /* NativeMessageViewController.swift */; };
 		824E88322729516D00B6C9C8 /* NativeMessageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 824E88312729516D00B6C9C8 /* NativeMessageViewController.xib */; };
@@ -1011,7 +1011,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8249DC982B59AB3D004F45B4 /* ConsentViewController in Frameworks */,
+				8224216A2BD6DE870081141F /* ConsentViewController in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2531,7 +2531,7 @@
 			);
 			name = SPMBuild;
 			packageProductDependencies = (
-				8249DC972B59AB3D004F45B4 /* ConsentViewController */,
+				822421692BD6DE870081141F /* ConsentViewController */,
 			);
 			productName = SPMBuild;
 			productReference = 8255B6C827A9661100C9A70D /* SPMBuild.app */;
@@ -2762,8 +2762,8 @@
 			);
 			mainGroup = 607FACC71AFB9204008FA782;
 			packageReferences = (
-				827C3DEE2B59979300191CCD /* XCRemoteSwiftPackageReference "ios-cmp-app" */,
 				82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */,
+				827CB8062BD6B6A500792550 /* XCRemoteSwiftPackageReference "ios-cmp-app" */,
 			);
 			productRefGroup = 607FACD11AFB9204008FA782 /* Products */;
 			projectDirPath = "";
@@ -6000,12 +6000,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		827C3DEE2B59979300191CCD /* XCRemoteSwiftPackageReference "ios-cmp-app" */ = {
+		827CB8062BD6B6A500792550 /* XCRemoteSwiftPackageReference "ios-cmp-app" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "http://github.com/SourcePointUSA/ios-cmp-app.git";
+			repositoryURL = "https://github.com/SourcePointUSA/ios-cmp-app";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 7.4.5;
+				branch = fix_spm_runtime;
+				kind = branch;
 			};
 		};
 		82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */ = {
@@ -6019,9 +6019,9 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		8249DC972B59AB3D004F45B4 /* ConsentViewController */ = {
+		822421692BD6DE870081141F /* ConsentViewController */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 827C3DEE2B59979300191CCD /* XCRemoteSwiftPackageReference "ios-cmp-app" */;
+			package = 827CB8062BD6B6A500792550 /* XCRemoteSwiftPackageReference "ios-cmp-app" */;
 			productName = ConsentViewController;
 		};
 		82CD6F842B59CC3600CAD663 /* Down */ = {

diff --git a/...ConsentViewController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...ConsentViewController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "abab81acced7f9c9c9c5b0eb8571b31043703d07283132d7c8f58c9b85e07076",
+  "originHash" : "6b6f482ad9f7ef01fcc98d61474c88e8b9b189eaa7aad5224ed076d04e36973d",
   "pins" : [
     {
       "identity" : "down",
@@ -13,10 +13,10 @@
     {
       "identity" : "ios-cmp-app",
       "kind" : "remoteSourceControl",
-      "location" : "http://github.com/SourcePointUSA/ios-cmp-app.git",
+      "location" : "https://github.com/SourcePointUSA/ios-cmp-app",
       "state" : {
-        "revision" : "f8a4c16378789962051c8cb03fb512ed3655b52e",
-        "version" : "7.5.0"
+        "branch" : "fix_spm_runtime",
+        "revision" : "fcd7f3289de4f184489e45156e4c978f62cf88be"
       }
     }
   ],

diff --git a/Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "6b6f482ad9f7ef01fcc98d61474c88e8b9b189eaa7aad5224ed076d04e36973d",
   "pins" : [
     {
       "identity" : "down",
@@ -12,10 +13,10 @@
     {
       "identity" : "ios-cmp-app",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SourcePointUSA/ios-cmp-app.git",
+      "location" : "https://github.com/SourcePointUSA/ios-cmp-app",
       "state" : {
-        "revision" : "711ccf8a8aaf222308009699e505df500429656e",
-        "version" : "7.6.5"
+        "branch" : "fix_spm_runtime",
+        "revision" : "f7eb60b362d7df1c07d6ba412d5669ff9790be62"
       }
     }
   ],

diff --git a/XCFramework/SPM/ConsentViewController.xcframework.zip b/XCFramework/SPM/ConsentViewController.xcframework.zip
diff --git a/XCFramework/SPM/ConsentViewController.xcframework/Info.plist b/XCFramework/SPM/ConsentViewController.xcframework/Info.plist
@@ -8,38 +8,38 @@
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>ConsentViewController.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ConsentViewController.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ConsentViewController.framework</string>
 			<key>SupportedArchitectures</key>
@@ -48,23 +48,23 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ConsentViewController.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>