Update CleverTap SDK to 6.1.1

vasct · vasct · commit ef325578774b · 2024-03-25T17:38:09.000+02:00
Update AGP to 7.4.2
Upadte Gradle wrapper to 7.5
diff --git a/AndroidSDK/AndroidManifest.xml b/AndroidSDK/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.leanplum"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
           android:versionCode="1"
           android:versionName="1.0">
 
diff --git a/AndroidSDK/build.gradle b/AndroidSDK/build.gradle
@@ -20,6 +20,7 @@ dependencies {
 }
 
 android {
+    namespace "com.leanplum"
     compileSdkVersion COMPILE_SDK_VERSION
 
     defaultConfig {
diff --git a/AndroidSDKCore/build.gradle b/AndroidSDKCore/build.gradle
@@ -8,7 +8,7 @@ plugins {
 apply from: "../common-methods.gradle"
 
 android {
-
+    namespace 'com.leanplum.core'
     compileSdkVersion COMPILE_SDK_VERSION
     useLibrary 'org.apache.http.legacy'
 
diff --git a/AndroidSDKCore/src/main/AndroidManifest.xml b/AndroidSDKCore/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.leanplum.core"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Minimum permissions needed for SDK to work. -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/AndroidSDKFcm/build.gradle b/AndroidSDKFcm/build.gradle
@@ -8,6 +8,7 @@ plugins {
 apply from: "../common-methods.gradle"
 
 android {
+    namespace 'com.leanplum.fcm'
     compileSdkVersion COMPILE_SDK_VERSION
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
diff --git a/AndroidSDKFcm/src/main/AndroidManifest.xml b/AndroidSDKFcm/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.leanplum.fcm"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <!-- Leanplum FCM Message Handling Service. -->
diff --git a/AndroidSDKHms/build.gradle b/AndroidSDKHms/build.gradle
@@ -8,9 +8,10 @@ plugins {
 apply from: "../common-methods.gradle"
 
 android {
+    namespace 'com.leanplum.hms'
     compileSdkVersion COMPILE_SDK_VERSION
     defaultConfig {
-        minSdkVersion 18 // version 18 is needed by agconnect plugin
+        minSdkVersion MIN_SDK_VERSION
         defaultConfig {
             consumerProguardFiles 'consumer-proguard-rules.pro'
         }
@@ -33,8 +34,8 @@ dependencies {
     api project(':AndroidSDKCore')
     api project(':AndroidSDKPush')
 
-    implementation 'com.huawei.agconnect:agconnect-core:1.7.2.300'
-    implementation 'com.huawei.hms:push:6.7.0.300'
+    implementation 'com.huawei.agconnect:agconnect-core:1.9.1.300'
+    implementation 'com.huawei.hms:push:6.11.0.300'
 }
 
 task generateJavadoc(type: Javadoc) {
diff --git a/AndroidSDKHms/src/main/AndroidManifest.xml b/AndroidSDKHms/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.leanplum.hms"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
     <service
diff --git a/AndroidSDKLocation/build.gradle b/AndroidSDKLocation/build.gradle
@@ -8,6 +8,7 @@ plugins {
 apply from: "../common-methods.gradle"
 
 android {
+    namespace 'com.leanplum.location'
     compileSdkVersion COMPILE_SDK_VERSION
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
diff --git a/AndroidSDKLocation/src/main/AndroidManifest.xml b/AndroidSDKLocation/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.leanplum.location"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Permissions for geofencing. -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
diff --git a/AndroidSDKMiPush/build.gradle b/AndroidSDKMiPush/build.gradle
@@ -8,6 +8,7 @@ plugins {
 apply from: "../common-methods.gradle"
 
 android {
+    namespace 'com.leanplum.mipush'
     compileSdkVersion COMPILE_SDK_VERSION
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
diff --git a/AndroidSDKMiPush/src/main/AndroidManifest.xml b/AndroidSDKMiPush/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.leanplum.mipush"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service
diff --git a/AndroidSDKPush/build.gradle b/AndroidSDKPush/build.gradle
@@ -8,6 +8,8 @@ plugins {
 apply from: "../common-methods.gradle"
 
 android {
+    namespace 'com.leanplum.push'
+
     compileSdkVersion COMPILE_SDK_VERSION
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
diff --git a/AndroidSDKPush/src/main/AndroidManifest.xml b/AndroidSDKPush/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.leanplum.push">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- New permission required by Android 13 to post notifications. -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
diff --git a/AndroidSDKTests/build.gradle b/AndroidSDKTests/build.gradle
@@ -14,6 +14,7 @@ buildscript {
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION
+    namespace "com.leanplum.tests"
 
     defaultConfig {
         applicationId "com.leanplum.tests"
@@ -56,7 +57,7 @@ android {
             systemProperty "robolectric.dependency.repo.url", "https://repo1.maven.org/maven2"
         }
     }
-    lintOptions {
+    lint {
         abortOnError false
     }
     testOptions.unitTests.includeAndroidResources = true
@@ -85,7 +86,7 @@ dependencies {
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.5'
     testImplementation 'org.bouncycastle:bcmail-jdk15on:1.65'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
diff --git a/AndroidSDKTests/src/main/AndroidManifest.xml b/AndroidSDKTests/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.leanplum.tests" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
     }
 }
diff --git a/common-methods.gradle b/common-methods.gradle
@@ -1,8 +1,8 @@
 // Export methods by turning them into closures
 ext {
     COMPILE_SDK_VERSION = 33
-    APPCOMPAT_LIBRARY_VERSION = '1.2.0'
-    CT_SDK_VERSION = '6.0.0'
+    APPCOMPAT_LIBRARY_VERSION = '1.6.0-rc01'
+    CT_SDK_VERSION = '6.1.1'
     MIN_SDK_VERSION = 19
     JAVA_VERSION = JavaVersion.VERSION_1_8
 
@@ -29,7 +29,12 @@ def publishing_task(libraryArtifactId) {
         failOnError false
         source = android.sourceSets.main.java.sourceFiles
         classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-        classpath += configurations.compile
+        configurations.implementation.setCanBeResolved(true)
+        android.libraryVariants.all { variant ->
+            if (variant.name == 'release') {
+                owner.classpath += variant.javaCompileProvider.get().classpath
+            }
+        }
     }
 
     task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx4g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sdk-version.txt b/sdk-version.txt
@@ -1 +1 @@
-7.3.0
+7.4.0-beta1

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ dependencies {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`android {`
	`23`	`+ namespace "com.leanplum"`
`23`	`24`	`compileSdkVersion COMPILE_SDK_VERSION`
`24`	`25`
`25`	`26`	`defaultConfig {`