diff --git a/CTExample/Assets/Plugins/Android/baseProjectTemplate.gradle b/CTExample/Assets/Plugins/Android/baseProjectTemplate.gradle index fc346665..db1bb571 100644 --- a/CTExample/Assets/Plugins/Android/baseProjectTemplate.gradle +++ b/CTExample/Assets/Plugins/Android/baseProjectTemplate.gradle @@ -3,8 +3,8 @@ plugins { // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.7.2' apply false + id 'com.android.library' version '8.7.2' apply false id 'com.google.gms.google-services' version '4.4.2' apply false **BUILD_SCRIPT_DEPS** } diff --git a/CTExample/Assets/Plugins/Android/launcherTemplate.gradle b/CTExample/Assets/Plugins/Android/launcherTemplate.gradle index 68c23bff..0f8398d6 100644 --- a/CTExample/Assets/Plugins/Android/launcherTemplate.gradle +++ b/CTExample/Assets/Plugins/Android/launcherTemplate.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.application' +apply from: 'setupSymbols.gradle' +apply from: '../shared/keepUnitySymbols.gradle' apply plugin: 'com.google.gms.google-services' dependencies { @@ -8,10 +10,11 @@ dependencies { } android { + ndkVersion "**NDKVERSION**" namespace "**NAMESPACE**" ndkPath "**NDKPATH**" - compileSdkVersion **APIVERSION** + compileSdk **APIVERSION** buildToolsVersion '**BUILDTOOLS**' compileOptions { @@ -20,22 +23,23 @@ android { } defaultConfig { - minSdkVersion **MINSDKVERSION** - targetSdkVersion **TARGETSDKVERSION** + minSdk **MINSDK** + targetSdk **TARGETSDK** applicationId '**APPLICATIONID**' ndk { + debugSymbolLevel **DEBUGSYMBOLLEVEL** abiFilters **ABIFILTERS** } versionCode **VERSIONCODE** versionName '**VERSIONNAME**' } - aaptOptions { + androidResources { noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ') ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~" }**SIGN** - lintOptions { + lint { abortOnError false } @@ -49,7 +53,7 @@ android { minifyEnabled **MINIFY_RELEASE** proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** } - }**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS** + }**PACKAGING****PLAY_ASSET_PACKS****SPLITS** **BUILT_APK_LOCATION** bundle { language { diff --git a/CTExample/Assets/Plugins/Android/mainTemplate.gradle b/CTExample/Assets/Plugins/Android/mainTemplate.gradle index 2e7b64b2..e546d0c7 100644 --- a/CTExample/Assets/Plugins/Android/mainTemplate.gradle +++ b/CTExample/Assets/Plugins/Android/mainTemplate.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.library' +apply from: '../shared/keepUnitySymbols.gradle' **APPLY_PLUGINS** dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // MANDATORY for CleverTap App Inbox - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.viewpager:viewpager:1.0.0' - implementation 'com.google.android.material:material:1.4.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'com.github.bumptech.glide:glide:4.12.0' // Optional ExoPlayer Libraries for CleverTap Audio/Video Inbox Messages. @@ -17,20 +18,21 @@ dependencies { implementation "com.google.android.exoplayer:exoplayer-ui:2.19.1" // Optional CleverTap push templates - implementation 'com.clevertap.android:push-templates:1.2.4' + implementation 'com.clevertap.android:push-templates:1.4.0' // Optional AndroidX Media3 Libraries for CleverTap Audio/Video Inbox Messages. // Audio/Video messages will be dropped without these dependencies - // implementation "androidx.media3:media3-exoplayer:1.1.1" - // implementation "androidx.media3:media3-exoplayer-hls:1.1.1" - // implementation "androidx.media3:media3-ui:1.1.1" + // implementation "androidx.media3:media3-exoplayer:1.4.0" + // implementation "androidx.media3:media3-exoplayer-hls:1.4.0" + // implementation "androidx.media3:media3-ui:1.4.0" **DEPS**} android { - namespace "com.unity3d.player" + ndkVersion "**NDKVERSION**" + namespace "com.unity3d.player" ndkPath "**NDKPATH**" - compileSdkVersion **APIVERSION** + compileSdk **APIVERSION** buildToolsVersion '**BUILDTOOLS**' compileOptions { @@ -39,9 +41,11 @@ android { } defaultConfig { - minSdkVersion **MINSDKVERSION** - targetSdkVersion **TARGETSDKVERSION** +**DEFAULT_CONFIG_SETUP** + minSdk **MINSDK** + targetSdk **TARGETSDK** ndk { + debugSymbolLevel **DEBUGSYMBOLLEVEL** abiFilters **ABIFILTERS** } versionCode **VERSIONCODE** @@ -49,14 +53,14 @@ android { consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD** } - lintOptions { + lint { abortOnError false } - aaptOptions { + androidResources { noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ') ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~" - }**PACKAGING_OPTIONS** + }**PACKAGING** } **IL_CPP_BUILD_SETUP** **SOURCE_BUILD_SETUP** diff --git a/CTExample/Packages/manifest.json b/CTExample/Packages/manifest.json index 8c9d505c..2e9ed526 100644 --- a/CTExample/Packages/manifest.json +++ b/CTExample/Packages/manifest.json @@ -1,17 +1,18 @@ { "dependencies": { "com.clevertap.clevertap-sdk-unity": "file:../../CleverTap", - "com.unity.collab-proxy": "2.5.2", + "com.unity.collab-proxy": "2.8.1", "com.unity.feature.2d": "2.0.1", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.mobile.notifications": "2.3.2", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.9", - "com.unity.timeline": "1.7.6", - "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.4", + "com.unity.ide.rider": "3.0.36", + "com.unity.ide.visualstudio": "2.0.23", + "com.unity.mobile.notifications": "2.4.0", + "com.unity.multiplayer.center": "1.0.0", + "com.unity.test-framework": "1.5.1", + "com.unity.timeline": "1.8.7", + "com.unity.ugui": "2.0.0", + "com.unity.visualscripting": "1.9.6", "com.yasirkula.ingamedebugconsole": "https://github.com/yasirkula/UnityIngameDebugConsole.git", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/CTExample/Packages/packages-lock.json b/CTExample/Packages/packages-lock.json index 1eecb54e..d4b9e9a8 100644 --- a/CTExample/Packages/packages-lock.json +++ b/CTExample/Packages/packages-lock.json @@ -7,40 +7,40 @@ "dependencies": {} }, "com.unity.2d.animation": { - "version": "9.1.2", + "version": "10.1.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.3", + "com.unity.2d.common": "9.0.7", "com.unity.2d.sprite": "1.0.0", - "com.unity.collections": "1.1.0", + "com.unity.collections": "1.2.4", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.1.6", + "version": "1.1.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.common": "6.0.6", "com.unity.mathematics": "1.2.6", "com.unity.modules.animation": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.3", + "version": "9.0.7", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.7.3", "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", + "com.unity.modules.uielements": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.burst": "1.8.4" }, "url": "https://packages.unity.com" }, @@ -52,13 +52,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.5", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.2", - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.animation": "9.1.1" + "com.unity.2d.common": "9.0.4", + "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -69,12 +68,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.4", + "version": "10.0.7", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.3", "com.unity.mathematics": "1.1.0", + "com.unity.2d.common": "9.0.7", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -89,19 +88,18 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.1.2", + "version": "4.1.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", "com.unity.modules.tilemap": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.21", "depth": 3, "source": "registry", "dependencies": { @@ -111,46 +109,47 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.5.2", + "version": "2.8.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.5.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.17", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework": "1.4.5", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.feature.2d": { "version": "2.0.1", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.1.2", + "com.unity.2d.animation": "10.1.4", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.5", + "com.unity.2d.psdimporter": "9.0.3", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.4", + "com.unity.2d.spriteshape": "10.0.7", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.2", - "com.unity.2d.aseprite": "1.1.6" + "com.unity.2d.tilemap.extras": "4.1.0", + "com.unity.2d.aseprite": "1.1.9" } }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -159,7 +158,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.23", "depth": 0, "source": "registry", "dependencies": { @@ -168,14 +167,14 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.mobile.notifications": { - "version": "2.3.2", + "version": "2.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -183,40 +182,55 @@ }, "url": "https://packages.unity.com" }, - "com.unity.test-framework": { - "version": "1.1.33", + "com.unity.multiplayer.center": { + "version": "1.0.0", "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.4", + "depth": 3, "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.5.1", + "depth": 0, + "source": "builtin", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, - "com.unity.textmeshpro": { - "version": "3.0.9", - "depth": 0, + "com.unity.test-framework.performance": { + "version": "3.1.0", + "depth": 3, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.8.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -225,7 +239,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.4", + "version": "1.9.6", "depth": 0, "source": "registry", "dependencies": { @@ -241,6 +255,12 @@ "dependencies": {}, "hash": "657868960eb569a5943117f1458bf2aee813d8c8" }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -288,6 +308,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -376,7 +402,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/CTExample/ProjectSettings/ProjectVersion.txt b/CTExample/ProjectSettings/ProjectVersion.txt index 8fb87e60..7a12cc2b 100644 --- a/CTExample/ProjectSettings/ProjectVersion.txt +++ b/CTExample/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.50f1 -m_EditorVersionWithRevision: 2022.3.50f1 (c3db7f8bf9b1) +m_EditorVersion: 6000.0.49f1 +m_EditorVersionWithRevision: 6000.0.49f1 (840e0a9776d9) diff --git a/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle b/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle index fb8d6dbe..bc707f8c 100644 --- a/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle +++ b/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle @@ -6,21 +6,24 @@ ext { artifact = 'clevertap-android-wrapper' libraryDescription = 'The CleverTap Android Wrapper for Unity SDK' - mindSdkVersionVal = 19 - compileSdkVersionVal = 34 + mindSdkVersionVal = 21 + compileSdkVersionVal = 35 targetSdkVersionVal = compileSdkVersionVal - buildToolsVersionVal = "34.0.0" libraryVersion = "3.1.0" } android { - compileSdkVersion compileSdkVersionVal - buildToolsVersion buildToolsVersionVal + // Checking if namespace exists is needed for 2021.3 (AGP 4.0.1) + // When 2021.3 is dropped, remove this check + if (project.android.hasProperty("namespace")) { + namespace "com.clevertap.unity" + } + compileSdk compileSdkVersionVal defaultConfig { - minSdkVersion mindSdkVersionVal - targetSdkVersion targetSdkVersionVal + minSdk mindSdkVersionVal + targetSdk targetSdkVersionVal versionCode libraryVersion.replaceAll('\\.', '').toInteger() versionName libraryVersion @@ -45,7 +48,7 @@ repositories { dependencies { compileOnly fileTree('libs') - api 'com.clevertap.android:clevertap-android-sdk:7.1.2' - implementation 'com.google.firebase:firebase-messaging:23.0.6' - implementation 'androidx.core:core:1.9.0' + api 'com.clevertap.android:clevertap-android-sdk:7.4.0' + implementation 'com.google.firebase:firebase-messaging:24.0.0' + implementation 'androidx.core:core:1.13.0' } diff --git a/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/src/main/java/com/clevertap/unity/CleverTapUnityPlugin.java b/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/src/main/java/com/clevertap/unity/CleverTapUnityPlugin.java index dc0f170b..9dff723d 100644 --- a/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/src/main/java/com/clevertap/unity/CleverTapUnityPlugin.java +++ b/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/src/main/java/com/clevertap/unity/CleverTapUnityPlugin.java @@ -197,16 +197,6 @@ public void onCallbackAdded(String callbackName) { CleverTapMessageSender.getInstance().flushBuffer(callback); } - public void setPushToken(String token, String region, String type) { - if (PushConstants.PushType.valueOf(type.toLowerCase()).equals(PushConstants.PushType.FCM)) { - clevertap.pushFcmRegistrationId(token, true); - } else if (PushConstants.PushType.valueOf(type.toLowerCase()).equals(PushConstants.PushType.BPS)) { - clevertap.pushBaiduRegistrationId(token, true); - } else if (PushConstants.PushType.valueOf(type.toLowerCase()).equals(PushConstants.PushType.HPS)) { - clevertap.pushHuaweiRegistrationId(token, true); - } - } - public void setOptOut(boolean value) { try { clevertap.setOptOut(value);