DIA-6166 fix swift 5/6 compatibility

.github/workflows/release.yml

@@ -37,11 +37,13 @@ jobs:
           chmod +x ./release.sh
           ./release.sh -v=${{ inputs.version }}
 
-      - name: Upload build log on failure
+      - name: Upload build logs on failure
         if: failure() && steps.release.conclusion == 'failure'
         uses: actions/upload-artifact@v4
         with:
-          name: build-log-${{ inputs.version }}
-          path: build/build.log
+          name: build-logs-${{ inputs.version }}
+          path: |
+            build/*.log
+            build/**/*.log
           if-no-files-found: warn
           retention-days: 5

.gitignore

@@ -3,7 +3,8 @@
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
 ## Build generated
-build/
+build/**
+!build/.gitkeep
 DerivedData/
 
 ## Various settings

ConsentViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'ConsentViewController'
-  s.version = '7.12.6'
+  s.version = '7.12.7-rc.3'
   s.summary = 'SourcePoint\'s ConsentViewController to handle privacy consents.'
   s.static_framework = true
   s.homepage = 'https://www.sourcepoint.com'

ConsentViewController/Classes/SPConsentManager.swift

@@ -254,7 +254,7 @@ import UIKit
 }
 
 @objc extension SPConsentManager: SPSDK {
-    public static let VERSION = "7.12.6"
+    public static let VERSION = "7.12.7-rc.3"
 
     public var gdprApplies: Bool { spCoordinator.userData.gdpr?.applies ?? false }
 

Example/ConsentViewController.xcodeproj/project.pbxproj

@@ -323,7 +323,7 @@
 		82CD6F7D2B59CB0700CAD663 /* SPAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B312F2B2ABC504000B62E23 /* SPAction.swift */; };
 		82CD6F7E2B59CB0700CAD663 /* SPMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B312F5C2ABC504000B62E23 /* SPMessageViewController.swift */; };
 		82CD6F7F2B59CB0700CAD663 /* SPJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B312F5D2ABC504000B62E23 /* SPJson.swift */; };
-		82CD6F852B59CC3600CAD663 /* Down in Frameworks */ = {isa = PBXBuildFile; productRef = 82CD6F842B59CC3600CAD663 /* Down */; };
+		82CDDBEF2EAF9840005B0ECF /* TVUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82CDDBEE2EAF9840005B0ECF /* TVUIKit.framework */; };
 		82CFB3EF2A431D89002B0EF2 /* SPCCPAConsentSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CFB3EE2A431D89002B0EF2 /* SPCCPAConsentSpec.swift */; };
 		82CFDE312924057500F86A69 /* JSONLocalDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CFDE302924057500F86A69 /* JSONLocalDataViewController.swift */; };
 		82D6CE222B8CD186004677E9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 82D6CE212B8CD186004677E9 /* PrivacyInfo.xcprivacy */; };
@@ -775,6 +775,7 @@
 		82CD6E9A2B59CA2C00CAD663 /* NSObjectExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSObjectExtensions.swift; sourceTree = "<group>"; };
 		82CD6E9C2B59CA2C00CAD663 /* SPLocalStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SPLocalStorage.swift; sourceTree = "<group>"; };
 		82CD6E9D2B59CA2C00CAD663 /* SPUserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SPUserDefaults.swift; sourceTree = "<group>"; };
+		82CDDBEE2EAF9840005B0ECF /* TVUIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TVUIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS18.0.sdk/System/Library/Frameworks/TVUIKit.framework; sourceTree = DEVELOPER_DIR; };
 		82CFB3EE2A431D89002B0EF2 /* SPCCPAConsentSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPCCPAConsentSpec.swift; sourceTree = "<group>"; };
 		82CFDE302924057500F86A69 /* JSONLocalDataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONLocalDataViewController.swift; sourceTree = "<group>"; };
 		82D6CE212B8CD186004677E9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -849,7 +850,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				82CD6F852B59CC3600CAD663 /* Down in Frameworks */,
+				82CDDBEF2EAF9840005B0ECF /* TVUIKit.framework in Frameworks */,
 				820B08B22B6021A6004E77E8 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2102,6 +2103,7 @@
 		EEE3CDAB8AFE80647B1E565B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				82CDDBEE2EAF9840005B0ECF /* TVUIKit.framework */,
 				8203A3BE2C904C3E00BACFE7 /* SPMobileCore.xcframework */,
 				8216E2632BB32B74006FEF11 /* ConsentViewController.framework */,
 				820B08B12B6021A6004E77E8 /* Foundation.framework */,
@@ -2185,7 +2187,6 @@
 			);
 			name = "SPMConsentViewController-tvOS";
 			packageProductDependencies = (
-				82CD6F842B59CC3600CAD663 /* Down */,
 			);
 			productName = ConsentViewController;
 			productReference = 0B312EE52ABC4E4000B62E23 /* ConsentViewController.framework */;
@@ -2654,7 +2655,6 @@
 			);
 			mainGroup = 607FACC71AFB9204008FA782;
 			packageReferences = (
-				82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */,
 				827CB8062BD6B6A500792550 /* XCRemoteSwiftPackageReference "ios-cmp-app" */,
 			);
 			productRefGroup = 607FACD11AFB9204008FA782 /* Products */;
@@ -5895,14 +5895,6 @@
 				kind = branch;
 			};
 		};
-		82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/johnxnguyen/Down";
-			requirement = {
-				kind = exactVersion;
-				version = 0.11.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -5911,11 +5903,6 @@
 			package = 827CB8062BD6B6A500792550 /* XCRemoteSwiftPackageReference "ios-cmp-app" */;
 			productName = ConsentViewController;
 		};
-		82CD6F842B59CC3600CAD663 /* Down */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 82CD6F832B59CC3600CAD663 /* XCRemoteSwiftPackageReference "Down" */;
-			productName = Down;
-		};
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - ConsentViewController (7.12.6):
+  - ConsentViewController (7.12.7-beta.4):
     - SPMobileCore (= 0.1.13)
   - FirebaseAnalytics (11.13.0):
     - FirebaseAnalytics/AdIdSupport (= 11.13.0)
@@ -170,7 +170,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ConsentViewController: f5330a26490773846e72545f13a6897256d3ff62
+  ConsentViewController: f5a72b3c2ff72858314cc4df3a1200c33556656c
   FirebaseAnalytics: 630349facf4a114a0977e5d7570e104261973287
   FirebaseCore: c692c7f1c75305ab6aff2b367f25e11d73aa8bd0
   FirebaseCoreInternal: 29d7b3af4aaf0b8f3ed20b568c13df399b06f68c

Package.swift

@@ -16,7 +16,9 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "ConsentViewController",
-            path: "./XCFramework/SPM/ConsentViewController.xcframework"
+            // path: "./build/SPMConsentViewController.xcframework" <-- use for local development
+            url: "https://github.com/SourcePointUSA/ios-cmp-app/releases/download/7.12.7-rc.3/SPMConsentViewController.xcframework.zip",
+            checksum: "3df1359a56401a38521e5000391a55753a7bf2200e98b157c52f80283d108fb8"
         )
     ]
 )

README.md

@@ -7,7 +7,7 @@
 In your `Podfile` add the following line to your app target:
 
 ```
-pod 'ConsentViewController', '7.12.6'
+pod 'ConsentViewController', '7.12.7-rc.3'
 ```
 
 The SDK has a static transitive dependency. If you use `use_frameworks!` on your Podfile, make sure to link it statically: