Merge pull request #392 from SourcePointUSA/prepare_6.7.2

Prepare 6.7.2
SourcePointUSA · Oct 26, 2022 · 9370dfd · 9370dfd
2 parents 923f1e5 + 0d262fe
commit 9370dfd
Show file tree

Hide file tree

Showing 47 changed files with 682 additions and 738 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -22,7 +22,7 @@ jobs:
         - name: Select Xcode version 14.0.1
           run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
         - name: Building Swift Package
-          run: xcodebuild clean build -scheme SPMBuild -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
+          run: xcodebuild clean build -scheme SPMBuild -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0'
         - uses: actions/upload-artifact@v2
           if: failure()
           name: Upload Swift Package build results
@@ -35,7 +35,7 @@ jobs:
         - name: Select Xcode version 14.0.1
           run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
         - name: ObjC-ExampleApp testing -> iPhone 14 Pro (iOS 16.0)
-          run: xcodebuild clean test -scheme ObjC-ExampleApp -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
+          run: xcodebuild test -scheme ObjC-ExampleApp -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0'
         - uses: actions/upload-artifact@v2
           if: failure()
           name: Upload ObjCExampleApp tests results
@@ -48,10 +48,10 @@ jobs:
         - name: Select Xcode version 14.0.1
           run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
         - name: NativeMessageExample testing -> iPhone 14 Pro (iOS 16.0)
-          run: xcodebuild clean test -scheme NativeMessageExample -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
+          run: xcodebuild test -scheme NativeMessageExample -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0'
         - uses: actions/upload-artifact@v2
           if: failure()
-          name: Upload NativeExampleApp tests results
+          name: Upload NativeMessageExample tests results
           with:
             path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult
   ConsentViewController:
@@ -60,11 +60,11 @@ jobs:
         - uses: actions/checkout@v2
         - name: Select Xcode version 14.0.1
           run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
-        - name: ConsentViewController_ExampleTests Unit and SPGDPRExampleAppUITests UI testing -> iPhone 14 Pro (iOS 16.0)
-          run: xcodebuild clean test -scheme ConsentViewController_Example -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO" -retry-tests-on-failure -test-iterations 10
+        - name: ConsentViewController testing -> iPhone 14 Pro (iOS 16.0)
+          run: xcodebuild test -scheme ConsentViewController_Example -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0'
         - uses: actions/upload-artifact@v2
           if: failure()
-          name: Upload ConsentViewController_ExampleTests tests results
+          name: Upload ConsentViewController tests results
           with:
             path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult
   NativePMExampleApp:
@@ -73,25 +73,23 @@ jobs:
         - uses: actions/checkout@v2
         - name: Select Xcode version 14.0.1
           run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
-        - name: NativePMExampleApp UI testing -> Apple TV Simulator (tvOS 16.1)
-          run: xcodebuild clean test -scheme NativePMExampleApp -workspace ConsentViewController.xcworkspace -destination 'platform=tvOS Simulator,name=Apple TV,OS=16.1' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
+        - name: ConsentViewController testing -> iPhone 14 Pro (iOS 16.0)
+          run: xcodebuild test -scheme NativePMExampleApp -workspace ConsentViewController.xcworkspace -destination 'platform=tvOS Simulator,name=Apple TV,OS=16.1'
         - uses: actions/upload-artifact@v2
           if: failure()
           name: Upload NativePMExampleApp tests results
           with:
-            path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult           
-  meta-app-tests:
-      runs-on: macos-12
-      steps:
-        - uses: actions/checkout@v2
-        - name: Select Xcode version 14.0.1
-          run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
-        - name: SourcePointMetaApp testing -> iPhone 14 Pro (iOS 16.0)
-          run: xcodebuild clean test -scheme SourcePointMetaApp -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
-        - uses: actions/upload-artifact@v2
-          if: failure()
-          name: Upload MetaApp tests results
-          with:
-            path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult
-
-
+            path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult 
+  # MetaApp:
+  #     runs-on: macos-12
+  #     steps:
+  #       - uses: actions/checkout@v2
+  #       - name: Select Xcode version 14.0.1
+  #         run: sudo xcode-select -s '/Applications/Xcode_14.0.1.app/Contents/Developer'
+  #       - name: SourcePointMetaApp testing -> iPhone 14 Pro (iOS 16.0)
+  #         run: xcodebuild test -scheme SourcePointMetaApp -workspace ConsentViewController.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.0'
+  #       - uses: actions/upload-artifact@v2
+  #         if: failure()
+  #         name: Upload SourcePointMetaApp tests results
+  #         with:
+  #           path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult         
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 6.7.2 (Oct, 26, 2022)
+* Added support to custom actions coming from the privacy manager. [#391](https://github.com/SourcePointUSA/ios-cmp-app/pull/391)
+
 # 6.7.1 (Sep, 22, 2022)
 * Flipped default value of cleanUserDataOnError from `true` to `false`.
 In the event of an error, the SDK will now, by default, keep consent data unchanged while prior to this release the SDK would remove all its data from the user's device.

diff --git a/ConsentViewController.podspec b/ConsentViewController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ConsentViewController'
-  s.version          = '6.7.1'
+  s.version          = '6.7.2'
   s.summary          = 'SourcePoint\'s ConsentViewController to handle privacy consents.'
   s.homepage         = 'https://www.sourcepoint.com'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/ConsentViewController/Classes/SPConsentManager.swift b/ConsentViewController/Classes/SPConsentManager.swift
@@ -290,7 +290,7 @@ import UIKit
 }
 
 @objc extension SPConsentManager: SPSDK {
-    public static let VERSION = "6.7.1"
+    public static let VERSION = "6.7.2"
 
     public static func clearAllData() {
         SPUserDefaults(storage: UserDefaults.standard).clear()

diff --git a/Example/ConsentViewController.xcodeproj/project.pbxproj b/Example/ConsentViewController.xcodeproj/project.pbxproj
@@ -4046,7 +4046,7 @@
 			repositoryURL = "http://github.com/SourcePointUSA/ios-cmp-app.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = "6.5.1-pre.1";
+				minimumVersion = "6.7.2-pre.1";
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/...ConsentViewController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...ConsentViewController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "ConsentViewController",
-        "repositoryURL": "https://github.com/SourcePointUSA/ios-cmp-app.git",
-        "state": {
-          "branch": null,
-          "revision": "9bdedadb546f9d1913bcddbacbf1915f691408fe",
-          "version": "6.1.7"
-        }
+  "pins" : [
+    {
+      "identity" : "ios-cmp-app",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SourcePointUSA/ios-cmp-app.git",
+      "state" : {
+        "revision" : "7f145c21be033ad5cc9d608ab60344b2bc7f2bd3",
+        "version" : "6.7.2-pre.1"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/...entViewController.xcodeproj/xcshareddata/xcschemes/ConsentViewController_Example.xcscheme b/...entViewController.xcodeproj/xcshareddata/xcschemes/ConsentViewController_Example.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1250"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -38,10 +38,15 @@
             ReferencedContainer = "container:Pods/Pods.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:ConsentViewController_Example.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO"
-            parallelizable = "YES"
             testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
@@ -52,8 +57,7 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8214B276249CC13B00167BFE"

diff --git a/Example/ConsentViewController.xcodeproj/xcshareddata/xcschemes/NativeMessageExample.xcscheme b/Example/ConsentViewController.xcodeproj/xcshareddata/xcschemes/NativeMessageExample.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1300"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,6 +27,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:NativeMessageExample.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Example/ConsentViewController.xcodeproj/xcshareddata/xcschemes/NativePMExampleApp.xcscheme b/Example/ConsentViewController.xcodeproj/xcshareddata/xcschemes/NativePMExampleApp.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1250"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,6 +27,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:NativePMExampleApp.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO"

diff --git a/Example/ConsentViewController.xcodeproj/xcshareddata/xcschemes/ObjC-ExampleApp.xcscheme b/Example/ConsentViewController.xcodeproj/xcshareddata/xcschemes/ObjC-ExampleApp.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1300"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,6 +27,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:ObjC-ExampleApp.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Example/ConsentViewController.xcworkspace/contents.xcworkspacedata b/Example/ConsentViewController.xcworkspace/contents.xcworkspacedata
diff --git a/Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "http://github.com/SourcePointUSA/ios-cmp-app.git",
       "state" : {
-        "revision" : "7742de6bd8dc7f40b2f14a3fb5c0e8cdeb1eed15",
-        "version" : "6.7.0"
+        "revision" : "7f145c21be033ad5cc9d608ab60344b2bc7f2bd3",
+        "version" : "6.7.2-pre.1"
       }
     }
   ],