Merge pull request #196 from CleverTap/develop

PR for release 4.2.0 SDK-905

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## CHANGE LOG
 
+### July 15, 2021
+
+* [CleverTap Android SDK v4.2.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)
+* [CleverTap Huawei Push SDK v1.0.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTHUAWEIPUSHCHANGELOG.md)
+
 ### May 4, 2021
 
 * [CleverTap Android SDK v4.1.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)

README.md

@@ -24,15 +24,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:4.1.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:4.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-4.1.1", ext: 'aar')
+        implementation (name: "clevertap-android-sdk-4.2.0", ext: 'aar')
     }
 ```
 
@@ -44,7 +44,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie
 
 ```groovy
      dependencies {      
-         implementation "com.clevertap.android:clevertap-android-sdk:4.1.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:4.2.0"
          implementation "androidx.core:core:1.3.0"
          implementation "com.google.firebase:firebase-messaging:20.2.4"
          implementation "com.google.android.gms:play-services-ads:19.4.0" // Required only if you enable Google ADID collection in the SDK (turned off by default).
@@ -69,8 +69,8 @@ Also be sure to include the `google-services.json` classpath in your Project lev
         
          }       
          dependencies {      
-             classpath "com.android.tools.build:gradle:4.1.2" 
-             classpath "com.google.gms:google-services:4.3.3"        
+             classpath "com.android.tools.build:gradle:4.2.1"
+             classpath "com.google.gms:google-services:4.3.3"
         
              // NOTE: Do not place your application dependencies here; they belong       
              // in the individual module build.gradle files      

build.gradle

@@ -2,25 +2,24 @@ apply plugin: 'org.sonarqube'
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    // do not change order of apply
-    apply from: 'gradle-scripts/versions.gradle'
-    apply from: 'gradle-scripts/dependencies.gradle'
 
     repositories {
         google()// Google's Maven repository
         mavenCentral()
         gradlePluginPortal()
-        maven { url 'http://developer.huawei.com/repo/' }
+        maven {
+            url 'https://developer.huawei.com/repo/' }
 
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:$gradlePluginVersion"
-        classpath "com.google.gms:google-services:$googleServicesPluginVersion"// Google Services plugin
-        classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion"
-        classpath "com.huawei.agconnect:agcp:$huaweiPluginVersion"// Huawei Push Plugin
-        classpath "org.jacoco:org.jacoco.core:$jacocoVersion"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"
+        classpath Libs.com_android_tools_build_gradle
+        classpath Libs.google_services// Google Services plugin
+        //classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion"
+        classpath Libs.agcp// Huawei Push Plugin
+        classpath Libs.org_jacoco_core
+        classpath Libs.kotlin_gradle_plugin
+        classpath Libs.sonarqube_gradle_plugin
+
     }
 }
 
@@ -29,7 +28,8 @@ allprojects {
         google()
         mavenCentral()
         gradlePluginPortal()
-        maven { url 'http://developer.huawei.com/repo/' }
+        maven {
+            url 'https://developer.huawei.com/repo/' }
         flatDir {
             dirs 'libs'
         }
@@ -49,18 +49,44 @@ task clean(type: Delete) {
 }
 
 task copyTemplates {
+    def props = new Properties()
+    file("versions.properties").withInputStream { props.load(it) }
     outputs.upToDateWhen { false }
+    props.put("clevertap_android_sdk",Libs.clevertap_android_sdk.dropRight(1))
+    props.put("clevertap_geofence_sdk",Libs.clevertap_geofence_sdk.dropRight(1))
+    props.put("clevertap_hms_sdk",Libs.clevertap_hms_sdk.dropRight(1))
+    props.put("clevertap_xiaomi_sdk",Libs.clevertap_xiaomi_sdk.dropRight(1))
+    props.put("play_services_location",Libs.play_services_location.dropRight(1))
+    props.put("work_runtime",Libs.work_runtime.dropRight(1))
+    props.put("concurrent_futures",Libs.concurrent_futures.dropRight(1))
+    props.put("push",Libs.push.dropRight(1))
+    props.put("appcompat",Libs.appcompat.dropRight(1))
+    props.put("viewpager",Libs.viewpager.dropRight(1))
+    props.put("material",Libs.material.dropRight(1))
+    props.put("glide",Libs.glide.dropRight(1))
+    props.put("recyclerview",Libs.recyclerview.dropRight(1))
+    props.put("exoplayer",Libs.exoplayer.dropRight(1))
+    props.put("exoplayer_ui",Libs.exoplayer_ui.dropRight(1))
+    props.put("exoplayer_hls",Libs.exoplayer_hls.dropRight(1))
+    props.put("installreferrer",Libs.installreferrer.dropRight(1))
+    props.put("firebase_messaging",Libs.firebase_messaging.dropRight(1))
+    props.put("androidx_core_core",Libs.androidx_core_core.dropRight(1))
+    props.put("agcp",Libs.agcp.dropRight(1))
+    props.put("com_android_tools_build_gradle",Libs.com_android_tools_build_gradle.dropRight(1))
+    props.put("google_services",Libs.google_services.dropRight(1))
+    props.put("play_services_ads",Libs.play_services_ads.dropRight(1))
+
     doLast{
         copy {
             from 'templates/README.md'
             into "."
-            expand('ext': project.ext.properties)
+            expand('ext': props.asImmutable())
         }
         copy {
             from 'templates'
             exclude "README.md"
             into "docs/"
-            expand('ext': project.ext.properties)
+            expand('ext': props.asImmutable())
         }
     }
-}
+}

buildSrc/.gitignore

@@ -0,0 +1,2 @@
+.gradle/
+build/

buildSrc/build.gradle.kts

@@ -0,0 +1,8 @@
+repositories {
+    google()
+    mavenCentral()
+}
+plugins {
+    `kotlin-dsl`
+}
+

buildSrc/settings.gradle.kts

@@ -0,0 +1,10 @@
+pluginManagement {
+    plugins {
+        id("de.fayard.refreshVersions") version "0.10.0"
+    }
+}
+
+plugins {
+    id("de.fayard.refreshVersions")
+}
+

buildSrc/src/main/kotlin/Libs.kt

@@ -0,0 +1,184 @@
+/**
+ * Generated by
+ *    $ ./gradlew buildSrcLibs
+ * Re-run when you add a new dependency to the build
+ *
+ * Find which updates are available by running
+ *     $ ./gradlew refreshVersions
+ * And edit the file `versions.properties`
+ *
+ * See https://github.com/jmfayard/refreshVersions
+ */
+object Libs {
+
+    const val androidx_annotation: String = "androidx.annotation:annotation:_"
+
+    const val appcompat: String = "androidx.appcompat:appcompat:_"
+
+    const val concurrent_futures: String = "androidx.concurrent:concurrent-futures:_"
+
+    const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:_"
+
+    const val coordinatorlayout: String = "androidx.coordinatorlayout:coordinatorlayout:_"
+
+    const val androidx_core_core: String = "androidx.core:core:_"
+
+    const val core_ktx: String = "androidx.core:core-ktx:_"
+
+    const val databinding_adapters: String = "androidx.databinding:databinding-adapters:_"
+
+    const val databinding_common: String = "androidx.databinding:databinding-common:_"
+
+    const val databinding_compiler: String = "androidx.databinding:databinding-compiler:_"
+
+    const val databinding_runtime: String = "androidx.databinding:databinding-runtime:_"
+
+    const val fragment: String = "androidx.fragment:fragment:_"
+
+    const val fragment_ktx: String = "androidx.fragment:fragment-ktx:_"
+
+    const val lifecycle_livedata_ktx: String = "androidx.lifecycle:lifecycle-livedata-ktx:_"
+
+    const val lifecycle_viewmodel_ktx: String = "androidx.lifecycle:lifecycle-viewmodel-ktx:_"
+
+    const val multidex: String = "androidx.multidex:multidex:_"
+
+    const val multidex_instrumentation: String = "androidx.multidex:multidex-instrumentation:_"
+
+    const val recyclerview: String = "androidx.recyclerview:recyclerview:_"
+
+    const val espresso_core: String = "androidx.test.espresso:espresso-core:_"
+
+    const val androidx_test_ext_junit: String = "androidx.test.ext:junit:_"
+
+    const val androidx_test_core: String = "androidx.test:core:_"
+
+    const val androidx_test_rules: String = "androidx.test:rules:_"
+
+    const val androidx_test_runner: String = "androidx.test:runner:_"
+
+    const val viewpager: String = "androidx.viewpager:viewpager:_"
+
+    const val work_runtime: String = "androidx.work:work-runtime:_"
+
+    const val work_testing: String = "androidx.work:work-testing:_"
+
+    const val installreferrer: String = "com.android.installreferrer:installreferrer:_"
+
+    const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:_"
+
+    const val lint_api: String = "com.android.tools.lint:lint-api:_"
+
+    const val lint_checks: String = "com.android.tools.lint:lint-checks:_"
+
+    const val lint_gradle: String = "com.android.tools.lint:lint-gradle:_"
+
+    const val clevertap_android_sdk: String = "com.clevertap.android:clevertap-android-sdk:_"
+
+    const val clevertap_geofence_sdk: String = "com.clevertap.android:clevertap-geofence-sdk:_"
+
+    const val clevertap_hms_sdk: String = "com.clevertap.android:clevertap-hms-sdk:_"
+
+    const val clevertap_xiaomi_sdk: String = "com.clevertap.android:clevertap-xiaomi-sdk:_"
+
+    const val glide: String = "com.github.bumptech.glide:glide:_"
+
+    const val exoplayer: String = "com.google.android.exoplayer:exoplayer:_"
+
+    const val exoplayer_hls: String = "com.google.android.exoplayer:exoplayer-hls:_"
+
+    const val exoplayer_ui: String = "com.google.android.exoplayer:exoplayer-ui:_"
+
+    const val play_services_ads: String = "com.google.android.gms:play-services-ads:_"
+
+    const val play_services_location: String = "com.google.android.gms:play-services-location:_"
+
+    const val material: String = "com.google.android.material:material:_"
+
+    const val gson: String = "com.google.code.gson:gson:_"
+
+    const val firebase_messaging: String = "com.google.firebase:firebase-messaging:_"
+
+    const val google_services: String = "com.google.gms:google-services:_"
+
+    const val truth: String = "com.google.truth:truth:_"
+
+    const val agcp: String = "com.huawei.agconnect:agcp:_"
+
+    const val push: String = "com.huawei.hms:push:_"
+
+    const val de_fayard_buildsrclibs_gradle_plugin: String =
+        "de.fayard.buildSrcLibs:de.fayard.buildSrcLibs.gradle.plugin:_"
+
+    const val catch_exception: String = "eu.codearte.catch-exception:catch-exception:_"
+
+    const val junit_junit: String = "junit:junit:_"
+
+    const val awaitility: String = "org.awaitility:awaitility:_"
+
+    const val org_jacoco_agent: String = "org.jacoco:org.jacoco.agent:_"
+
+    const val org_jacoco_ant: String = "org.jacoco:org.jacoco.ant:_"
+
+    const val org_jacoco_core: String = "org.jacoco:org.jacoco.core:_"
+
+    const val kotlin_annotation_processing_gradle: String =
+        "org.jetbrains.kotlin:kotlin-annotation-processing-gradle:_"
+
+    const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:_"
+
+    const val kotlin_scripting_compiler_embeddable: String =
+        "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:_"
+
+    const val kotlin_stdlib_jdk7: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:_"
+
+    const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:_"
+
+    const val kotlin_test: String = "org.jetbrains.kotlin:kotlin-test:_"
+
+    const val junit_jupiter_api: String = "org.junit.jupiter:junit-jupiter-api:_"
+
+    const val junit_jupiter_engine: String = "org.junit.jupiter:junit-jupiter-engine:_"
+
+    const val junit_platform_runner: String = "org.junit.platform:junit-platform-runner:_"
+
+    const val mockito_core: String = "org.mockito:mockito-core:_"
+
+    const val mockito_inline: String = "org.mockito:mockito-inline:_"
+
+    const val opentest4j: String = "org.opentest4j:opentest4j:_"
+
+    const val powermock_api_mockito2: String = "org.powermock:powermock-api-mockito2:_"
+
+    const val powermock_classloading_xstream: String =
+        "org.powermock:powermock-classloading-xstream:_"
+
+    const val powermock_core: String = "org.powermock:powermock-core:_"
+
+    const val powermock_module_junit4: String = "org.powermock:powermock-module-junit4:_"
+
+    const val powermock_module_junit4_rule: String = "org.powermock:powermock-module-junit4-rule:_"
+
+    const val robolectric: String = "org.robolectric:robolectric:_"
+
+    const val jsonassert: String = "org.skyscreamer:jsonassert:_"
+
+    const val sonarqube_gradle_plugin: String =
+        "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:_"
+
+    const val xmlpull: String = "xmlpull:xmlpull:_"
+}
+
+object Android {
+
+    // Android SDK
+    const val compileSdkVersionVal = 30
+    const val targetSdkVersionVal = 30
+    const val buildToolsVersionVal = "30.0.3"
+    const val minSdkVersionVal = 16
+}
+
+object SDKTest {
+
+    const val jacocoToolVersion = "0.8.4"
+}