Skip to content

Commit 3507599

Browse files
committed
Merge branch 'develop' into DIA-4057-refactor-cmp-class-abstract
* develop: Update `unitypackage` Update `CHANGELOG.md` Update `package.json` Update `AndroidResolver` and `mainTemplate.gradle` Change `language` from enum to string in `configLib` Update android and ios native dependencies # Conflicts: # Assets/ConsentManagementProvider/Plugins/iOS/Source/SwiftBridge.swift # Assets/ConsentManagementProvider/Plugins/iOS/Source/Unity.mm # Assets/ConsentManagementProvider/Scripts/wrapper/iOS/ConsentWrapperIOS.cs
2 parents 062e9e1 + 086ef40 commit 3507599

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
* "subspecs" (optional)
3232
Subspecs to include for the pod.
3333
-->
34-
<iosPod name="ConsentViewController" version="7.6.8" bitcodeEnabled="true"
34+
<iosPod name="ConsentViewController" version="7.6.10" bitcodeEnabled="true"
3535
minTargetSdk="10.0" addToAllTargets="true">
3636

3737
</iosPod>
3838
</iosPods>
3939

4040
<androidPackages>
4141
<!-- <androidPackage spec="org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.0" />-->
42-
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.8.4" />
42+
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.8.5" />
4343
</androidPackages>
4444
</dependencies>

Assets/Plugins/Android/mainTemplate.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apply plugin: 'com.android.library'
1616
dependencies {
1717
implementation fileTree(dir: 'libs', include: ['*.jar'])
1818
// Android Resolver Dependencies Start
19-
implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.8.4' // Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml:42
19+
implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.8.5' // Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml:42
2020
// Android Resolver Dependencies End
2121
**DEPS**}
2222

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2.3.5
2+
* Unity SDK brought to v7.8.5 Android & v7.6.10 iOS native SDK [#65](https://github.com/SourcePointUSA/unity-sdk/pull/65)
3+
14
# 2.3.4
25
* 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:
36
* [DIA-4112](https://sourcepoint.atlassian.net/browse/DIA-4112) Fixed: Links to vendors' privacy policy pages now working on Android devices

ProjectSettings/AndroidResolverDependencies.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<packages>
3-
<package>com.sourcepoint.cmplibrary:cmplibrary:7.8.4</package>
3+
<package>com.sourcepoint.cmplibrary:cmplibrary:7.8.5</package>
44
</packages>
55
<files />
66
<settings>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.sourcepoint.unitycmp",
33
"displayName": "Sourcepoint Consent Message Plugin",
4-
"version": "2.3.4",
4+
"version": "2.3.5",
55
"unity": "2021.3",
66
"description": "Native UI Privacy Manager for both GDPR and CCPA legislations.",
77
"author": {
-380 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)