Release ct v6.2.0

.github/mini_flows/build_code_debug/action.yml

@@ -56,15 +56,4 @@ runs:
         name: assembleDebug-clevertap-pushTemplates
         path:  clevertap-pushtemplates/build/outputs/aar
 
-###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------
-
-    - name: assembleDebug-clevertap-xps
-      shell: bash
-      run: ./gradlew :clevertap-xps:assembleDebug
-
-    - name: Upload AAR and apk files
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: assembleDebug-clevertap-xps
-        path: clevertap-xps/build/outputs/aar
+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------

.github/mini_flows/build_code_release/action.yml

@@ -54,17 +54,4 @@ runs:
       uses: actions/upload-artifact@v3
       with:
         name: assembleRelease-clevertap-pushTemplates
-        path:  clevertap-pushtemplates/build/outputs/aar
-
-    ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------
-
-    - name: assembleRelease-clevertap-xps
-      shell: bash
-      run: ./gradlew :clevertap-xps:assembleRelease
-
-    - name: Upload AAR and apk files
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: assembleRelease-clevertap-xps
-        path: clevertap-xps/build/outputs/aar
+        path:  clevertap-pushtemplates/build/outputs/aar

.github/mini_flows/codechecks_checkstyle/action.yml

@@ -56,15 +56,4 @@ runs:
         name: checkstyle-clevertap-pushTemplates
         path:  clevertap-pushtemplates/build/reports/checkstyle
 
-    ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------
-
-    - name: checkstyle-clevertap-xps
-      shell: bash
-      run: ./gradlew :clevertap-xps:checkstyle
-
-    - name: Upload AAR and apk files
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: checkstyle-clevertap-xps
-        path: clevertap-xps/build/reports/checkstyle
+    ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------

.github/mini_flows/codechecks_detekt/action.yml

@@ -55,16 +55,3 @@ runs:
       with:
         name: detekt-clevertap-pushTemplates
         path:  clevertap-pushtemplates/build/reports/detekt
-
-    ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------
-
-    - name: detekt-clevertap-xps
-      shell: bash
-      run: ./gradlew :clevertap-xps:detekt
-
-    - name: Upload AAR and apk files
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: detekt-clevertap-xps
-        path: clevertap-xps/build/reports/detekt

.github/mini_flows/lint/action.yml

@@ -54,17 +54,4 @@ runs:
       uses: actions/upload-artifact@v3
       with:
         name: lint-clevertap-pushTemplates
-        path:  clevertap-pushtemplates/build/reports/lint-results-debug.html
-
-    ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------
-
-    - name: lint-clevertap-xps
-      shell: bash
-      run: ./gradlew :clevertap-xps:lint
-
-    - name: Upload AAR and apk files
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: lint-clevertap-xps
-        path: clevertap-xps/build/reports/lint-results-debug.html
+        path:  clevertap-pushtemplates/build/reports/lint-results-debug.html

.github/mini_flows/test_and_coverage_debug/action.yml

@@ -64,27 +64,6 @@ runs:
         path: clevertap-hms/build/reports/jacoco
 
 
-    #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----
-    - name: jacocoTestReportDebug-clevertap-xps
-      if: always()
-      shell: bash
-      run: ./gradlew :clevertap-xps:jacocoTestReportDebug  -Pcoverage='true'
-
-    - name: Upload1
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: TestReportDebug-clevertap-xps
-        path: clevertap-xps/build/reports/tests
-
-    - name: Upload2
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: JacocoReportDebug-clevertap-xps
-        path: clevertap-xps/build/reports/jacoco
-
-
 
     #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----
     - name: jacocoTestReportDebug-clevertap-pushtemplates

.github/mini_flows/test_and_coverage_release/action.yml

@@ -63,28 +63,6 @@ runs:
         path: clevertap-hms/build/reports/jacoco
 
 
-    #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----
-    - name: jacocoTestReportRelease-clevertap-xps
-      if: always()
-      shell: bash
-      run: ./gradlew :clevertap-xps:jacocoTestReportRelease  -Pcoverage='true'
-
-    - name: Upload1
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: TestReportRelease-clevertap-xps
-        path: clevertap-xps/build/reports/tests
-
-    - name: Upload2
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: JacocoReportRelease-clevertap-xps
-        path: clevertap-xps/build/reports/jacoco
-
-
-
     #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----
     - name: jacocoTestReportRelease-clevertap-pushtemplates
       if: always()

.github/mini_flows/test_debug/action.yml

@@ -4,11 +4,11 @@ runs:
 
     - name: Run Unit Tests And Code Coverage (DEBUG)
       shell: bash
-      run: ./gradlew :clevertap-core:testDebugUnitTest :clevertap-geofence:testDebugUnitTest  :clevertap-hms:testDebugUnitTest  :clevertap-pushTemplates:testDebugUnitTest :clevertap-xps:testDebugUnitTest
+      run: ./gradlew :clevertap-core:testDebugUnitTest :clevertap-geofence:testDebugUnitTest  :clevertap-hms:testDebugUnitTest  :clevertap-pushTemplates:testDebugUnitTest
 
     - name: Run Unit Tests And Code Coverage (RELEASE)
       shell: bash
-      run: ./gradlew :clevertap-core:testReleaseUnitTest :clevertap-geofence:testReleaseUnitTest  :clevertap-hms:testReleaseUnitTest  :clevertap-pushTemplates:testReleaseUnitTest :clevertap-xps:testReleaseUnitTest
+      run: ./gradlew :clevertap-core:testReleaseUnitTest :clevertap-geofence:testReleaseUnitTest  :clevertap-hms:testReleaseUnitTest  :clevertap-pushTemplates:testReleaseUnitTest
 
     - name: Upload Unit tests
       if: always()
@@ -20,8 +20,6 @@ runs:
 
           clevertap-hms/build/reports/tests
 
-          clevertap-xps/build/reports/tests
-
           clevertap-geofence/build/reports/tests
 
           clevertap-pushtemplates/build/reports/tests

.github/mini_flows/test_release/action.yml

@@ -4,11 +4,11 @@ runs:
 
     - name: Run Unit Tests And Code Coverage (DEBUG)
       shell: bash
-      run: ./gradlew :clevertap-core:testDebugUnitTest :clevertap-geofence:testDebugUnitTest  :clevertap-hms:testDebugUnitTest  :clevertap-pushTemplates:testDebugUnitTest :clevertap-xps:testDebugUnitTest
+      run: ./gradlew :clevertap-core:testDebugUnitTest :clevertap-geofence:testDebugUnitTest  :clevertap-hms:testDebugUnitTest  :clevertap-pushTemplates:testDebugUnitTest
 
     - name: Run Unit Tests And Code Coverage (RELEASE)
       shell: bash
-      run: ./gradlew :clevertap-core:testReleaseUnitTest :clevertap-geofence:testReleaseUnitTest  :clevertap-hms:testReleaseUnitTest  :clevertap-pushTemplates:testReleaseUnitTest :clevertap-xps:testReleaseUnitTest
+      run: ./gradlew :clevertap-core:testReleaseUnitTest :clevertap-geofence:testReleaseUnitTest  :clevertap-hms:testReleaseUnitTest  :clevertap-pushTemplates:testReleaseUnitTest
 
     - name: Upload Unit tests
       if: always()
@@ -20,8 +20,6 @@ runs:
 
           clevertap-hms/build/reports/tests
 
-          clevertap-xps/build/reports/tests
-
           clevertap-geofence/build/reports/tests
 
           clevertap-pushtemplates/build/reports/tests

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG.
 
+### April 3, 2024
+
+* [CleverTap Android SDK v6.2.0](docs/CTCORECHANGELOG.md)
+
 ### February 27, 2024
 
 * [CleverTap Android SDK v6.1.1](docs/CTCORECHANGELOG.md)

README.md

@@ -26,15 +26,15 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend
 
 ```groovy
     dependencies {      
-         implementation "com.clevertap.android:clevertap-android-sdk:6.1.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:6.2.0"
     }
 ```
 
 Alternatively, you can download and add the AAR file included in this repo in your Module libs directory and tell gradle to install it like this:
 
  ```groovy
     dependencies {      
-        implementation (name: "clevertap-android-sdk-6.1.1", ext: 'aar')
+        implementation (name: "clevertap-android-sdk-6.2.0", ext: 'aar')
     }
 ```
 
@@ -46,7 +46,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie
 
 ```groovy
      dependencies {      
-         implementation "com.clevertap.android:clevertap-android-sdk:6.1.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:6.2.0"
          implementation "androidx.core:core:1.9.0"
          implementation "com.google.firebase:firebase-messaging:23.0.6"
          implementation "com.google.android.gms:play-services-ads:22.3.0" // Required only if you enable Google ADID collection in the SDK (turned off by default).

build.gradle

@@ -55,7 +55,6 @@ task copyTemplates {
     props.put("clevertap_rendermax_sdk", libs.version.clevertap.rendermax.sdk.get())
     props.put("clevertap_geofence_sdk", libs.version.clevertap.geofence.sdk.get())
     props.put("clevertap_hms_sdk", libs.version.clevertap.hms.sdk.get())
-    props.put("clevertap_xiaomi_sdk", libs.version.clevertap.xiaomi.sdk.get())
     props.put("push_templates", libs.version.clevertap.push.templates.sdk.get())
     props.put("play_services_location", libs.play.services.location.get())
     props.put("work_runtime", libs.androidx.work.runtime.get())

clevertap-core/build.gradle

@@ -49,8 +49,10 @@ dependencies {
 
     // Unit testing dependencies
     testImplementation(project(":test_shared"))
+    testImplementation(libs.test.robolectric)
     testImplementation(libs.firebase.messaging)
     testImplementation(libs.test.mockk)
+    testImplementation(libs.test.mockito.kotlin)
     testImplementation(libs.test.coroutines)
 
     androidTestImplementation(libs.test.work.testing)

clevertap-core/consumer-rules.pro

@@ -1,6 +1,5 @@
 # For CleverTap SDK's
 -keep class com.clevertap.android.sdk.pushnotification.fcm.FcmPushProvider{*;}
--keep class com.clevertap.android.xps.XiaomiPushProvider{*;}
 -keep class com.clevertap.android.hms.HmsPushProvider{*;}
 -keep class com.google.firebase.messaging.FirebaseMessagingService{*;}
 -keep class com.clevertap.android.sdk.pushnotification.CTNotificationIntentService{*;}

clevertap-core/src/main/AndroidManifest.xml

@@ -20,20 +20,6 @@
             android:enabled="true"
             android:exported="false" />
 
-        <service
-            android:name=".pushnotification.amp.CTBackgroundIntentService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE">
-            <intent-filter>
-                <action android:name="com.clevertap.BG_EVENT" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".pushnotification.amp.CTBackgroundJobService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
         <receiver
             android:name=".pushnotification.fcm.CTFirebaseMessagingReceiver"
             android:exported="true"

clevertap-core/src/main/java/com/clevertap/android/sdk/CTLockManager.java

@@ -6,11 +6,11 @@
 @RestrictTo(Scope.LIBRARY)
 public class CTLockManager {
 
-    private final Boolean eventLock = true;
+    private final Object eventLock = new Object();
 
     private final Object inboxControllerLock = new Object();
 
-    public Boolean getEventLock() {
+    public Object getEventLock() {
         return eventLock;
     }
 

clevertap-core/src/main/java/com/clevertap/android/sdk/CTXtensions.kt

@@ -10,6 +10,7 @@ import android.content.SharedPreferences
 import android.location.Location
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
+import androidx.annotation.MainThread
 import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.core.app.NotificationManagerCompat
@@ -128,6 +129,7 @@ fun NotificationManager.getOrCreateChannel(
  * @param caller The caller.
  * @param context The application context.
  */
+@MainThread
 fun CleverTapAPI.flushPushImpressionsOnPostAsyncSafely(logTag: String, caller: String, context: Context) {
     val flushTask = CTExecutorFactory.executors(coreState.config).postAsyncSafelyTask<Void?>()