Merge pull request #65 from SourcePointUSA/prepare-2.3.5

Prepare 2.3.5

Author: Nevazhnovu

Assets/ConsentManagementProvider/Plugins/iOS/Source/SwiftBridge.swift

@@ -107,7 +107,7 @@ import UIKit
         gdpr: Bool,
         ccpa: Bool,
         usnat: Bool,
-        language: SPMessageLanguage,
+        language: String,
         gdprPmId: String,
         ccpaPmId: String,
         usnatPmId: String) {
@@ -128,7 +128,7 @@ import UIKit
                     usnat: usnat ? SPCampaign(targetingParams: usnatTargetingParams, transitionCCPAAuth: config.transitionCCPAAuth, supportLegacyUSPString: config.supportLegacyUSPString) : nil,
                     ios14: SPCampaign()
                 ),
-                language: language,
+                language: SPMessageLanguage.init(rawValue: language) ?? SPMessageLanguage.BrowserDefault,
                 delegate: self
             )}()
         }

Assets/ConsentManagementProvider/Plugins/iOS/Source/Unity.mm

@@ -81,9 +81,9 @@ void _setSupportLegacyUSPString(bool value)
         [swiftBridge setSupportLegacyUSPStringWithValue:value];
     }
 
-    void _configLib(int accountId, int propertyId, char* propertyName, bool gdpr, bool ccpa, bool usnat, SPMessageLanguage language, char* gdprPmId, char* ccpaPmId, char* usnatPmId)
+    void _configLib(int accountId, int propertyId, char* propertyName, bool gdpr, bool ccpa, bool usnat, char* language, char* gdprPmId, char* ccpaPmId, char* usnatPmId)
     {
-        [swiftBridge configLibWithAccountId:accountId propertyId:propertyId propertyName:[NSString stringWithFormat:@"%s", propertyName] gdpr:gdpr ccpa:ccpa usnat:usnat language:language gdprPmId:[NSString stringWithFormat:@"%s", gdprPmId] ccpaPmId:[NSString stringWithFormat:@"%s", ccpaPmId] usnatPmId:[NSString stringWithFormat:@"%s", usnatPmId]];
+        [swiftBridge configLibWithAccountId:accountId propertyId:propertyId propertyName:[NSString stringWithFormat:@"%s", propertyName] gdpr:gdpr ccpa:ccpa usnat:usnat language:[NSString stringWithFormat:@"%s", language] gdprPmId:[NSString stringWithFormat:@"%s", gdprPmId] ccpaPmId:[NSString stringWithFormat:@"%s", ccpaPmId] usnatPmId:[NSString stringWithFormat:@"%s", usnatPmId]];
     }
 
     void _loadMessage()

Assets/ConsentManagementProvider/Scripts/wrapper/iOS/ConsentWrapperIOS.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ConsentManagementProviderLib.Enum;
 #if UNITY_IOS && !UNITY_EDITOR_OSX
 using System.Runtime.InteropServices;
 #endif
@@ -37,7 +38,7 @@ private set
         [DllImport("__Internal")]
         private static extern void _setSupportLegacyUSPString(bool value);
         [DllImport("__Internal")]
-        private static extern void _configLib(int accountId, int propertyId, string propertyName, bool gdpr, bool ccpa, bool usnat, MESSAGE_LANGUAGE language, string gdprPmId, string ccpaPmId, string usnatPmId);
+        private static extern void _configLib(int accountId, int propertyId, string propertyName, bool gdpr, bool ccpa, bool usnat, string language, string gdprPmId, string ccpaPmId, string usnatPmId);
         [DllImport("__Internal")]
         private static extern void _loadMessage();
         [DllImport("__Internal")]
@@ -121,7 +122,9 @@ public void InitializeLib(
                 _setTransitionCCPAAuth((bool)transitionCCPAAuth);
             if(supportLegacyUSPString != null)
                 _setSupportLegacyUSPString((bool)supportLegacyUSPString);
-            _configLib(accountId, propertyId, propertyName, gdpr, ccpa, usnat, language, gdprPmId, ccpaPmId, usnatPmId);
+
+            string langName = CSharp2JavaStringEnumMapper.GetMessageLanguageKey(language);
+            _configLib(accountId, propertyId, propertyName, gdpr, ccpa, usnat, langName, gdprPmId, ccpaPmId, usnatPmId);
 #endif
         }
 

Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml

@@ -31,14 +31,14 @@
          * "subspecs" (optional)
            Subspecs to include for the pod.
      -->
-    <iosPod name="ConsentViewController" version="7.6.8" bitcodeEnabled="true"
+    <iosPod name="ConsentViewController" version="7.6.10" bitcodeEnabled="true"
             minTargetSdk="10.0" addToAllTargets="true">
 
     </iosPod>
   </iosPods>
 
   <androidPackages>
 <!--    <androidPackage spec="org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.0" />-->
-    <androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.8.4" />
+    <androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.8.5" />
   </androidPackages>
 </dependencies>

Assets/Plugins/Android/mainTemplate.gradle

@@ -16,7 +16,7 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.8.4' // Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml:42
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.8.5' // Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml:42
 // Android Resolver Dependencies End
 **DEPS**}
 

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.3.5
+* Unity SDK brought to v7.8.5 Android & v7.6.10 iOS native SDK [#65](https://github.com/SourcePointUSA/unity-sdk/pull/65)
+
 # 2.3.4
 * Unity SDK brought up to v7.8.4 of Native Android SDK [#62](https://github.com/SourcePointUSA/unity-sdk/pull/62) which fixes the following:
 * [DIA-4112](https://sourcepoint.atlassian.net/browse/DIA-4112) Fixed: Links to vendors' privacy policy pages now working on Android devices

ProjectSettings/AndroidResolverDependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
   <packages>
-    <package>com.sourcepoint.cmplibrary:cmplibrary:7.8.4</package>
+    <package>com.sourcepoint.cmplibrary:cmplibrary:7.8.5</package>
   </packages>
   <files />
   <settings>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.sourcepoint.unitycmp",
   "displayName": "Sourcepoint Consent Message Plugin",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "unity": "2021.3",
   "description": "Native UI Privacy Manager for both GDPR and CCPA legislations.",
   "author": {