Commit 3507599
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.csFile tree
6 files changed
+8
-5
lines changed- Assets
- ExternalDependencyManager/Editor
- Plugins/Android
- ProjectSettings
- unitypackage
6 files changed
+8
-5
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
1 | 4 | | |
2 | 5 | | |
3 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
Binary file not shown.
0 commit comments