diff --git a/CTExample/Assets/Plugins/Android/baseProjectTemplate.gradle b/CTExample/Assets/Plugins/Android/baseProjectTemplate.gradle index fc346665..30e8b93f 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.6.0' apply false + id 'com.android.library' version '8.6.0' 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..e8a8b31e 100644 --- a/CTExample/Assets/Plugins/Android/launcherTemplate.gradle +++ b/CTExample/Assets/Plugins/Android/launcherTemplate.gradle @@ -10,6 +10,7 @@ dependencies { android { namespace "**NAMESPACE**" ndkPath "**NDKPATH**" + ndkVersion '23.1.7779620' compileSdkVersion **APIVERSION** buildToolsVersion '**BUILDTOOLS**' diff --git a/CTExample/Assets/Plugins/Android/mainTemplate.gradle b/CTExample/Assets/Plugins/Android/mainTemplate.gradle index 2e7b64b2..a05d16bc 100644 --- a/CTExample/Assets/Plugins/Android/mainTemplate.gradle +++ b/CTExample/Assets/Plugins/Android/mainTemplate.gradle @@ -29,6 +29,7 @@ dependencies { android { namespace "com.unity3d.player" ndkPath "**NDKPATH**" + ndkVersion '23.1.7779620' compileSdkVersion **APIVERSION** buildToolsVersion '**BUILDTOOLS**' diff --git a/CleverTap/Editor/AndroidReplaceGradleVersionPostProcessor.cs b/CleverTap/Editor/AndroidReplaceGradleVersionPostProcessor.cs new file mode 100644 index 00000000..12c21322 --- /dev/null +++ b/CleverTap/Editor/AndroidReplaceGradleVersionPostProcessor.cs @@ -0,0 +1,40 @@ +#if UNITY_ANDROID && UNITY_EDITOR +using System.IO; +using UnityEditor.Android; +using UnityEngine; + +namespace CleverTapSDK.Private +{ + public class AndroidReplaceGradleVersionPostProcessor : IPostGenerateGradleAndroidProject + { + public int callbackOrder => 1; + + public void OnPostGenerateGradleAndroidProject(string path) + { + ReplaceGradleWrapperVersion(path); + } + + private static void ReplaceGradleWrapperVersion(string unityLibraryPath) + { + var gradleWrapperPath = Path.Combine(unityLibraryPath, "../gradle/wrapper/gradle-wrapper.properties"); + if (!File.Exists(gradleWrapperPath)) + { + Debug.LogError($"Gradle wrapper file not found at {gradleWrapperPath}"); + return; + } + + var lines = File.ReadAllLines(gradleWrapperPath); + for (int i = 0; i < lines.Length; i++) + { + if (lines[i].StartsWith("distributionUrl")) + { + lines[i] = "distributionUrl=https\\://services.gradle.org/distributions/gradle-8.7-bin.zip"; + Debug.Log($"Updated Gradle wrapper version to 8.7 in {gradleWrapperPath}"); + break; + } + } + File.WriteAllLines(gradleWrapperPath, lines); + } + } +} +#endif diff --git a/CleverTap/Editor/AndroidReplaceGradleVersionPostProcessor.cs.meta b/CleverTap/Editor/AndroidReplaceGradleVersionPostProcessor.cs.meta new file mode 100644 index 00000000..c27480b2 --- /dev/null +++ b/CleverTap/Editor/AndroidReplaceGradleVersionPostProcessor.cs.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 882632f6aac95485c81f318162c713a5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle b/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle index fb8d6dbe..f852b249 100644 --- a/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle +++ b/CleverTap/Plugins/Android/clevertap-android-wrapper.androidlib/build.gradle @@ -6,17 +6,17 @@ 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 + namespace "com.clevertap.unity" defaultConfig { minSdkVersion mindSdkVersionVal @@ -45,7 +45,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);