Merge pull request #170 from CleverTap/develop

Prepare release 0.5.2
CleverTap · Jul 20, 2021 · 9f0bda7 · 9f0bda7
2 parents 43a6b10 + 4f78e67
commit 9f0bda7
Show file tree

Hide file tree

Showing 11 changed files with 189 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 0.5.2 *(20th July 2021)*
+-------------------------------------------
+- Supports CleverTap Android SDK `v4.2.0`
+- Android SDK `v4.2.0` fixes NPE for `recordScreenView()` in Android
+
 Version 0.5.1 *(5th May 2021)*
 -------------------------------------------
 - Update and Freeze [CleverTap React Native Podspec](/clevertap-react-native.podspec) to a specific version of a CleverTap iOS SDK

diff --git a/Starter/android/app/build.gradle b/Starter/android/app/build.gradle
@@ -75,7 +75,8 @@ import com.android.build.OutputFile
 
 project.ext.react = [
     entryFile: "index.js",
-    enableHermes: false
+    enableHermes: false,
+    nodeExecutableAndArgs:  ["/usr/local/bin/node"]
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -147,7 +148,7 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 dependencies {
     implementation project(':clevertap-react-native')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'com.clevertap.android:clevertap-android-sdk:4.1.1'
+    implementation 'com.clevertap.android:clevertap-android-sdk:4.2.0'
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation 'com.google.android.gms:play-services-base:17.4.0'
     implementation 'com.google.firebase:firebase-messaging:20.2.4'
@@ -162,6 +163,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0' //Mandatory for App Inbox
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.clevertap.android:clevertap-hms-sdk:1.0.2'//Optional dependency for hms
+    implementation 'com.huawei.hms:push:5.3.0.304'//Optional dependency for hms
 
     if (enableHermes) {
       // For RN 0.60.x
@@ -188,3 +191,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
 }
 
 //apply plugin: 'com.google.gms.google-services'//Uncomment for Firebase Messaging
+apply plugin: 'com.huawei.agconnect'//Add This at the bottom of the file
diff --git a/Starter/android/build.gradle b/Starter/android/build.gradle
@@ -3,18 +3,20 @@
 buildscript {
     ext {
         buildToolsVersion = "29.0.3"
-        minSdkVersion = 16
+        minSdkVersion = 17
         compileSdkVersion = 29
         targetSdkVersion = 29
         supportLibVersion = "28.0.0"
     }
     repositories {
         google()
         jcenter()
+        maven {url 'https://developer.huawei.com/repo/'}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.google.gms:google-services:4.3.3'//Uncomment for Firebase Messaging
+        classpath 'com.huawei.agconnect:agcp:1.4.2.300'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,15 +25,16 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
         google()
-        jcenter()
+        mavenCentral()
+        gradlePluginPortal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
         maven {
             url "$rootDir/../node_modules/jsc-android/dist"
         }
+        maven {url 'https://developer.huawei.com/repo/'}
     }
 }
diff --git a/Starter/android/gradle/wrapper/gradle-wrapper.properties b/Starter/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 07 13:49:55 IST 2020
+#Tue Jun 22 21:08:18 IST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/Starter/package-lock.json b/Starter/package-lock.json
diff --git a/Starter/package.json b/Starter/package.json
@@ -10,7 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "clevertap-react-native": "git+https://github.com/CleverTap/clevertap-react-native.git#develop",
+    "clevertap-react-native": "git+https://github.com/CleverTap/clevertap-react-native.git#task/update_core_4.2.0/SDK-958",
     "react": "16.9.0",
     "react-native": "^0.63.3"
   },

diff --git a/android/build.gradle b/android/build.gradle
@@ -21,8 +21,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 51
-        versionName "0.5.1"
+        versionCode 52
+        versionName "0.5.2"
     }
     buildTypes {
         release {
@@ -39,10 +39,11 @@ dependencies {
         maven { url "$rootDir/../node_modules/react-native/android" }
     }
 
-    api 'com.clevertap.android:clevertap-android-sdk:4.1.1'
+    api 'com.clevertap.android:clevertap-android-sdk:4.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.1'
     //compile 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.facebook.react:react-native:+'
+    compileOnly 'androidx.annotation:annotation:1.1.0'
 }
 
 repositories {

diff --git a/android/src/main/java/com/clevertap/react/CleverTapPackage.java b/android/src/main/java/com/clevertap/react/CleverTapPackage.java
@@ -35,7 +35,7 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
 
     /**
      * @param reactContext
-     * @return a list of view managers that should be registered with {@link UIManagerModule}
+     * @return a list of view managers
      */
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {

diff --git a/docs/install.md b/docs/install.md
@@ -25,14 +25,6 @@
 	};
     ```
     
-    3. The CleverTap SDK is not yet upgraded to AndroidX. Add the following to your gradle.properties file
-    
-    
-  
-    ```android.useAndroidX=true
-   	 android.enableJetifier=true
-    ```
-
   
   ## Steps for iOS ##
   
@@ -68,7 +60,7 @@ 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.0.0'
+    implementation 'com.clevertap.android:clevertap-android-sdk:4.2.0'
     implementation 'com.google.android.gms:play-services-base:17.4.0'
     implementation 'com.google.firebase:firebase-messaging:20.2.4'
     implementation 'com.google.android.exoplayer:exoplayer:2.11.5' //Optional for Audio/Video

diff --git a/docs/integration.md b/docs/integration.md
@@ -49,7 +49,6 @@ Note: Need to use **@import CleverTapSDK;** instead of **#import <CleverTapSDK/C
     @Override
     public void onCreate() {
 	    // Register the CleverTap ActivityLifecycleCallback; before calling super
-        CleverTapAPI.setUIEditorConnectionEnabled(false);
         ActivityLifecycleCallback.register(this);	
         super.onCreate();
     }

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