Skip to content

Commit dff9d09

Browse files
committed
Merge branch 'develop' into prepare-2.2.1
2 parents a542f89 + 1010180 commit dff9d09

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ extension SwiftBridge {
303303
}
304304

305305
public func print(_ items: Any..., separator: String = " ", terminator: String = "\n") {
306-
if logger.level == .debug {
306+
if OSLogger.defaultLevel == .debug {
307307
printLog(items)
308308
}
309309
}

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.3.0" bitcodeEnabled="true"
34+
<iosPod name="ConsentViewController" version="7.6.0" 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.6.0" />
42+
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.7.0" />
4343
</androidPackages>
4444
</dependencies>
Binary file not shown.
Binary file not shown.

Assets/Plugins/Android/com.sourcepoint.cmplibrary.cmplibrary-7.6.0.aar.meta renamed to Assets/Plugins/Android/com.sourcepoint.cmplibrary.cmplibrary-7.7.0.aar.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/packages-lock.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,16 @@
130130
"dependencies": {},
131131
"url": "https://packages.unity.com"
132132
},
133+
"com.unity.mobile.android-logcat": {
134+
"version": "1.3.2",
135+
"depth": 0,
136+
"source": "registry",
137+
"dependencies": {},
138+
"url": "https://packages.unity.com"
139+
},
133140
"com.unity.nuget.newtonsoft-json": {
134-
"version": "3.0.2",
135-
"depth": 2,
141+
"version": "3.2.1",
142+
"depth": 0,
136143
"source": "registry",
137144
"dependencies": {},
138145
"url": "https://packages.unity.com"

ProjectSettings/AndroidResolverDependencies.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<dependencies>
22
<packages>
3-
<package>com.sourcepoint.cmplibrary:cmplibrary:7.2.7</package>
3+
<package>com.sourcepoint.cmplibrary:cmplibrary:7.7.0</package>
44
</packages>
55
<files>
6-
<file>Assets/Plugins/Android/com.sourcepoint.cmplibrary.cmplibrary-7.2.7.aar</file>
6+
<file>Assets/Plugins/Android/com.sourcepoint.cmplibrary.cmplibrary-7.7.0.aar</file>
77
<file>Assets/Plugins/Android/com.squareup.okhttp3.okhttp-4.9.0.jar</file>
88
<file>Assets/Plugins/Android/com.squareup.okio.okio-2.8.0.jar</file>
99
<file>Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar</file>
@@ -15,7 +15,7 @@
1515
<file>Assets/Plugins/Android/org.jetbrains.kotlinx.kotlinx-serialization-json-jvm-1.3.0.jar</file>
1616
</files>
1717
<settings>
18-
<setting name="androidAbis" value="armeabi-v7a" />
18+
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a,x86,x86_64" />
1919
<setting name="bundleId" value="com.DefaultCompany.ConsentMessagePlugin" />
2020
<setting name="explodeAars" value="True" />
2121
<setting name="gradleBuildEnabled" value="True" />

0 commit comments

Comments
 (0)