Merge pull request #200 from CleverTap/develop

task SDK-1193: Add Android 12 support and update core-sdk to 4.3.1
CleverTap · Nov 30, 2021 · a3d04b8 · a3d04b8
2 parents dbe773b + 9ed97b0
commit a3d04b8
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+Version 0.7.0 *(30th November 2021)*
+-------------------------------------------
+- Supports CleverTap Android SDK `v4.3.1` backing Android 12
+
 Version 0.6.0 *(3rd September 2021)*
 -------------------------------------------
 - Adds public methods for suspending/discarding & resuming InApp Notifications

diff --git a/Example/android/app/build.gradle b/Example/android/app/build.gradle
@@ -193,24 +193,24 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
     //added from atlasian doc
-    implementation 'com.clevertap.android:clevertap-android-sdk:4.2.0'
+    implementation 'com.clevertap.android:clevertap-android-sdk:4.3.1'
 //    implementation 'com.google.android.gms:play-services-ads:19.0.1'
-    implementation 'com.google.android.gms:play-services-base:17.4.0'
-    implementation 'com.android.installreferrer:installreferrer:2.1'
+    implementation 'com.google.android.gms:play-services-base:17.6.0'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
     implementation 'com.google.firebase:firebase-messaging:20.2.4'
     implementation project(':clevertap-react-native')
     //added from atlasian doc
-	implementation 'com.github.bumptech.glide:glide:4.11.0' //Mandatory for App Inbox
-	implementation 'androidx.recyclerview:recyclerview:1.1.0' //Mandatory for App Inbox
+	implementation 'com.github.bumptech.glide:glide:4.12.0' //Mandatory for App Inbox
+	implementation 'androidx.recyclerview:recyclerview:1.2.1' //Mandatory for App Inbox
     implementation 'androidx.viewpager:viewpager:1.0.0' //Mandatory for App Inbox
-    implementation 'com.google.android.material:material:1.3.0' //Mandatory for App Inbox
-    implementation 'androidx.appcompat:appcompat:1.2.0' //Mandatory for App Inbox
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation 'com.google.android.material:material:1.4.0' //Mandatory for App Inbox
+    implementation 'androidx.appcompat:appcompat:1.3.1' //Mandatory for App Inbox
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'androidx.core:core:1.3.0'
-    implementation 'androidx.fragment:fragment:1.1.0' // InApp
-    implementation 'com.google.android.exoplayer:exoplayer:2.11.5' //Optional for Audio/Video
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.11.5' //Optional for Audio/Video
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.5' //Optional for Audio/Video
+    implementation 'androidx.fragment:fragment:1.3.6' // InApp
+    implementation 'com.google.android.exoplayer:exoplayer:2.15.1' //Optional for Audio/Video
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.1' //Optional for Audio/Video
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.1' //Optional for Audio/Video
     implementation 'com.android.support:multidex:1.0.3'
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {

diff --git a/Example/android/app/src/main/AndroidManifest.xml b/Example/android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+          android:exported="true">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
@@ -28,7 +29,7 @@
 <!--                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>-->
 <!--            </intent-filter>-->
 <!--        </service>-->
-        <service android:name=".MyFirebaseMessagingService">
+        <service android:name=".MyFirebaseMessagingService" android:exported="true">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>

diff --git a/Example/android/build.gradle b/Example/android/build.gradle
@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
+        buildToolsVersion = "30.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "20.1.5948944"
     }
     repositories {

diff --git a/android/build.gradle b/android/build.gradle
@@ -15,14 +15,14 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion '30.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 60
-        versionName "0.6.0"
+        targetSdkVersion 31
+        versionCode 70
+        versionName "0.7.0"
     }
     buildTypes {
         release {
@@ -39,11 +39,11 @@ dependencies {
         maven { url "$rootDir/../node_modules/react-native/android" }
     }
 
-    api 'com.clevertap.android:clevertap-android-sdk:4.2.0'
-    implementation 'com.android.installreferrer:installreferrer:2.1'
+    api 'com.clevertap.android:clevertap-android-sdk:4.3.1'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
     //compile 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.facebook.react:react-native:+'
-    compileOnly 'androidx.annotation:annotation:1.1.0'
+    compileOnly 'androidx.annotation:annotation:1.2.0'
 }
 
 repositories {

diff --git a/docs/install.md b/docs/install.md
@@ -60,21 +60,21 @@ If you're on RN 0.60 or your project configuration doesn't allow to add `use_fra
 ```gradle
 dependencies {
 	...
-    implementation 'com.clevertap.android:clevertap-android-sdk:4.2.0'
-    implementation 'com.google.android.gms:play-services-base:17.4.0'
+    implementation 'com.clevertap.android:clevertap-android-sdk:4.3.1'
+    implementation 'com.google.android.gms:play-services-base:17.6.0'
     implementation 'com.google.firebase:firebase-messaging:20.2.4'
-    implementation 'com.google.android.exoplayer:exoplayer:2.11.5' //Optional for Audio/Video
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.11.5' //Optional for Audio/Video
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.5' //Optional for Audio/Video
-    implementation 'com.github.bumptech.glide:glide:4.11.0' //Mandatory for App Inbox
-    implementation 'androidx.recyclerview:recyclerview:1.1.0' //Mandatory for App Inbox
+    implementation 'com.google.android.exoplayer:exoplayer:2.15.1' //Optional for Audio/Video
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.1' //Optional for Audio/Video
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.1' //Optional for Audio/Video
+    implementation 'com.github.bumptech.glide:glide:4.12.0' //Mandatory for App Inbox
+    implementation 'androidx.recyclerview:recyclerview:1.2.1' //Mandatory for App Inbox
     implementation 'androidx.viewpager:viewpager:1.0.0' //Mandatory for App Inbox
-    implementation 'com.google.android.material:material:1.2.1' //Mandatory for App Inbox
-    implementation 'androidx.appcompat:appcompat:1.2.0' //Mandatory for App Inbox
+    implementation 'com.google.android.material:material:1.4.0' //Mandatory for App Inbox
+    implementation 'androidx.appcompat:appcompat:1.3.1' //Mandatory for App Inbox
     implementation 'androidx.core:core:1.3.0'
-    implementation 'androidx.fragment:fragment:1.1.0' // InApp
+    implementation 'androidx.fragment:fragment:1.3.6' // InApp
     //Mandatory for React Native SDK v0.3.9 and above add the following -
-    implementation 'com.android.installreferrer:installreferrer:2.1'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
 
     //Note - ExoPlayer dependencies are optional but all 3 are required for Audio/Video Inbox and InApp Messages
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clevertap-react-native",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CleverTap React Native SDK.",
   "main": "index.js",
   "types": "index.d.ts",