fix spm runtime

SourcePointUSA · Apr 19, 2024 · 28e93c0 · 28e93c0
1 parent fe1865d
commit 28e93c0
Show file tree

Hide file tree

Showing 27 changed files with 3,866 additions and 166 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
@@ -163,7 +163,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 +1010,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8249DC982B59AB3D004F45B4 /* ConsentViewController in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2531,7 +2529,6 @@
 			);
 			name = SPMBuild;
 			packageProductDependencies = (
-				8249DC972B59AB3D004F45B4 /* ConsentViewController */,
 			);
 			productName = SPMBuild;
 			productReference = 8255B6C827A9661100C9A70D /* SPMBuild.app */;
@@ -2762,7 +2759,6 @@
 			);
 			mainGroup = 607FACC71AFB9204008FA782;
 			packageReferences = (
-				827C3DEE2B59979300191CCD /* XCRemoteSwiftPackageReference "ios-cmp-app" */,
 				82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */,
 			);
 			productRefGroup = 607FACD11AFB9204008FA782 /* Products */;
@@ -6000,14 +5996,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		827C3DEE2B59979300191CCD /* XCRemoteSwiftPackageReference "ios-cmp-app" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "http://github.com/SourcePointUSA/ios-cmp-app.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 7.4.5;
-			};
-		};
 		82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/johnxnguyen/Down";
@@ -6019,11 +6007,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		8249DC972B59AB3D004F45B4 /* ConsentViewController */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 827C3DEE2B59979300191CCD /* XCRemoteSwiftPackageReference "ios-cmp-app" */;
-			productName = ConsentViewController;
-		};
 		82CD6F842B59CC3600CAD663 /* Down */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */;

diff --git a/Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "3b8368769f82c03aa3d4f8dfa65fa26c3b577444e9310697e7f3b1e56ad62c00",
   "pins" : [
     {
       "identity" : "down",
@@ -8,16 +9,7 @@
         "revision" : "f34b166be1f1db4aa8f573067e901d72f2a6be57",
         "version" : "0.11.0"
       }
-    },
-    {
-      "identity" : "ios-cmp-app",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SourcePointUSA/ios-cmp-app.git",
-      "state" : {
-        "revision" : "711ccf8a8aaf222308009699e505df500429656e",
-        "version" : "7.6.5"
-      }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
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
@@ -25,46 +25,46 @@
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>ConsentViewController.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>ios-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>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>ConsentViewController.framework/ConsentViewController</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-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>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>