Merge pull request #715 from CleverTap/develop

Core SDK 7.1.0 release
CleverTap · Dec 24, 2024 · b6193ee · b6193ee
2 parents 5124bed + 053713c
commit b6193ee
Show file tree

Hide file tree

Showing 58 changed files with 4,690 additions and 1,316 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## CHANGE LOG.
 
+### December 24, 2024
+* [CleverTap Android SDK v7.1.0](docs/CTCORECHANGELOG.md)
+
 ### November 29, 2024
 * [CleverTap Android SDK v7.0.3](docs/CTCORECHANGELOG.md)
 

diff --git a/README.md b/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:7.0.3"
+         implementation "com.clevertap.android:clevertap-android-sdk:7.1.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-7.0.3", ext: 'aar')
+        implementation (name: "clevertap-android-sdk-7.1.0", ext: 'aar')
     }
 ```
 
@@ -46,10 +46,10 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie
 
 ```groovy
      dependencies {      
-         implementation "com.clevertap.android:clevertap-android-sdk:7.0.3"
+         implementation "com.clevertap.android:clevertap-android-sdk:7.1.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).
+         implementation "com.google.android.gms:play-services-ads:23.6.0" // Required only if you enable Google ADID collection in the SDK (turned off by default).
      }
 ```
 
@@ -70,7 +70,7 @@ Also be sure to include the `google-services.json` classpath in your Project lev
         
          }       
          dependencies {      
-             classpath "com.android.tools.build:gradle:8.2.2"
+             classpath "com.android.tools.build:gradle:8.7.0"
              classpath "com.google.gms:google-services:4.4.0"
         
              // NOTE: Do not place your application dependencies here; they belong       

diff --git a/clevertap-core/src/androidTest/kotlin/PIFlushWorkInstrumentationTest.kt b/clevertap-core/src/androidTest/kotlin/PIFlushWorkInstrumentationTest.kt
@@ -12,12 +12,13 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.testing.SynchronousExecutor
 import androidx.work.testing.WorkManagerTestInitHelper
+import com.clevertap.android.sdk.AnalyticsManagerBundler.notificationViewedJson
+import com.clevertap.android.sdk.AnalyticsManagerBundler.wzrkBundleToJson
 import com.clevertap.android.sdk.CleverTapAPI
 import com.clevertap.android.sdk.CleverTapAPI.LogLevel.VERBOSE
 import com.clevertap.android.sdk.CleverTapInstanceConfig
 import com.clevertap.android.sdk.Constants
 import com.clevertap.android.sdk.pushnotification.work.CTFlushPushImpressionsWork
-import com.clevertap.android.sdk.utils.CTJsonConverter
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.json.JSONObject
@@ -83,14 +84,7 @@ class PIFlushWorkInstrumentationTest{
         }
 
         listOf(Pair(defaultInstance,bundle),Pair(ctInstance1,bundle1), Pair(ctInstance2,bundle2)).map {
-            val event = JSONObject()
-            try {
-                val notif: JSONObject = CTJsonConverter.getWzrkFields(it.second)
-                event.put("evtName", Constants.NOTIFICATION_VIEWED_EVENT_NAME)
-                event.put("evtData", notif)
-            } catch (ignored: Throwable) {
-                //no-op
-            }
+            val event = notificationViewedJson(it.second)
             Pair(it.first,event)
         }.forEach {
             it.first!!.coreState!!.databaseManager.queuePushNotificationViewedEventToDB(myContext, it.second)