Merge pull request #656 from CleverTap/develop

Release core v7.0.0 and ptv1.2.4 SDK-3921
CleverTap · Aug 5, 2024 · c101918 · c101918
2 parents f1dc65b + a34ba9c
commit c101918
Show file tree

Hide file tree

Showing 237 changed files with 15,788 additions and 4,916 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## CHANGE LOG.
 
+### August 5, 2024
+* [CleverTap Android SDK v7.0.0](docs/CTCORECHANGELOG.md)
+* [CleverTap Push Templates SDK v1.2.4](docs/CTPUSHTEMPLATESCHANGELOG.md).
+
+
 ### April 11, 2024
 
 * [CleverTap Android SDK v6.2.1](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:6.2.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:7.0.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.2.1", ext: 'aar')
+        implementation (name: "clevertap-android-sdk-7.0.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.2.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:7.0.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).
@@ -85,7 +85,7 @@ Add your FCM generated `google-services.json` file to your project and add the f
 apply plugin: 'com.google.gms.google-services'
 ```
 Interstitial InApp Notification templates support Audio and Video with the help of ExoPlayer. To enable Audio/Video in your Interstitial InApp Notifications, add the following dependencies in your `build.gradle` file :
-    
+**Note:** Clevertap supports `AndroidX Media3` from `v7.0.0+` to replace the deprecated `ExoPlayer` libraries. While Clevertap continues to support `ExoPlayer`, migration is recommended. For migration, refer to [this](EXAMPLES.md#migrating-from-exoplayer-to-androidx-media3)
 ```groovy
     implementation "com.google.android.exoplayer:exoplayer:2.19.1"
     implementation "com.google.android.exoplayer:exoplayer-hls:2.19.1"

diff --git a/build.gradle b/build.gradle
@@ -68,6 +68,9 @@ task copyTemplates {
     props.put("exoplayer", libs.exoplayer.exoplayer.get())
     props.put("exoplayer_ui", libs.exoplayer.ui.get())
     props.put("exoplayer_hls", libs.exoplayer.hls.get())
+    props.put("media3", libs.media3.exoplayer.get())
+    props.put("media3_ui", libs.media3.ui.get())
+    props.put("media3_hls", libs.media3.hls.get())
     props.put("installreferrer", libs.installreferrer.get())
     props.put("firebase_messaging", libs.firebase.messaging.get())
     props.put("androidx_core_core", libs.androidx.core.core.get())

diff --git a/clevertap-core/build.gradle b/clevertap-core/build.gradle
@@ -34,8 +34,12 @@ android {
 
 dependencies {
     compileOnly(libs.firebase.messaging)
+
+    // For Media
     compileOnly(libs.bundles.exoplayer)
     compileOnly(libs.glide)
+    compileOnly(libs.bundles.media3)
+
     //for notification
     compileOnly(libs.androidx.core.core)
     compileOnly(libs.androidx.viewpager)

diff --git a/clevertap-core/consumer-rules.pro b/clevertap-core/consumer-rules.pro
@@ -6,6 +6,9 @@
 -keep class com.google.android.exoplayer2.ExoPlayer{*;}
 -keep class com.google.android.exoplayer2.source.hls.HlsMediaSource{*;}
 -keep class com.google.android.exoplayer2.ui.StyledPlayerView{*;}
+-keep class androidx.media3.exoplayer.ExoPlayer{*;}
+-keep class androidx.media3.exoplayer.hls.HlsMediaSource{*;}
+-keep class androidx.media3.ui.PlayerView{*;}
 -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient{*;}
 -keep class com.google.android.gms.common.GooglePlayServicesUtil{*;}
 -keepnames class * implements android.os.Parcelable {

diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java
@@ -117,7 +117,6 @@ public Void call() {
             }
         }
         baseEventQueueManager.pushInitialEventsAsync();
-        inAppController.checkExistingInAppNotifications(activity);
         inAppController.checkPendingInAppNotifications(activity);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,7 +117,6 @@ public Void call() { @@
                 }
             }
             baseEventQueueManager.pushInitialEventsAsync();
-            inAppController.checkExistingInAppNotifications(activity);
             inAppController.checkPendingInAppNotifications(activity);
         }
@@ Expand Down @@