Update external dependencies (gradle, sdk, ...) (#398)

* Bump versions of gradle, artifactory, bintray, android sdk, robolectric

* Fix travis with new sdk and tools

* Manually download new Android SDK in travis

* Add publication of classes.jar, bump other dependencies in test project

* Bump source and target java version to 1.8

* Fix pom packaging value to be always aar

* Set version to test artifactory and bintray publishing

* Try disable jar to debug

* Test artifactory publish

* Add bintray and artifactory init to afterEvaluate

* Bump version to test bintray

* Try fix bintray upload

* Test older version of artifactory plugin

* Return jar publication.

* Remove unused ext definitions

* Revert the sdk-version.txt

Co-authored-by: Mayank Sanganeria <[email protected]>

Author: hborisoff

.travis.yml

@@ -1,21 +1,42 @@
 language: android
+
+env:
+  global:
+    - BUILD_API=29
+    - BUILD_TOOLS=29.0.3
+    - ANDROID_HOME=/usr/local/android-sdk
+    - TOOLS=${ANDROID_HOME}/tools
+    # PATH order is important, the 'emulator' script exists in more than one place
+    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
+
 android:
   components:
     - tools
-    - platform-tools
-    - build-tools-28.0.3
-    - android-28
+
+licenses:
+  - 'android-sdk-preview-license-.+'
+  - 'android-sdk-license-.+'
+  - 'google-gdk-license-.+'
 
 before_install:
-  - sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-160.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-160.jar"
+  - sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-165.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-165.jar"
   - sudo echo "security.provider.11=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a ${JAVA_HOME}/jre/lib/security/java.security
 
+before_script:
+  # Install Android SDK
+  - echo 'count=0' > /home/travis/.android/repositories.cfg # avoid harmless sdkmanager warning
+  - echo y | sdkmanager "platform-tools" >/dev/null
+  - echo y | sdkmanager "tools" >/dev/null
+  - echo y | sdkmanager "build-tools;$BUILD_TOOLS" >/dev/null
+  - echo y | sdkmanager "platforms;android-$BUILD_API" >/dev/null
+  - echo y | sdkmanager "extras;android;m2repository" >/dev/null
+
 script:
   - ./gradlew assembleRelease testReleaseUnitTest
 
 before_deploy:
   - ./Tools/verifyTag.sh
-  - ./gradlew assembleRelease makeJar generatePomFileForAarPublication
+  - ./gradlew assembleRelease generatePomFileForAarPublication
 
 after_deploy:
   - ./Tools/triggerRondo.sh

AndroidSDK/build.gradle

@@ -19,7 +19,6 @@ dependencies {
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION
-    //    publishNonDefault true
 
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
@@ -33,6 +32,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

AndroidSDKCore/build.gradle

@@ -9,8 +9,6 @@ android {
     compileSdkVersion COMPILE_SDK_VERSION
     useLibrary 'org.apache.http.legacy'
 
-    publishNonDefault true
-
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
         consumerProguardFiles CONSUMER_PROGUARD_FILES
@@ -23,11 +21,17 @@ android {
         def buildNumber = System.getenv('BUILD_NUMBER') ?: '0'
         buildConfigField 'String', 'BUILD_NUMBER', "\"${buildNumber}\""
     }
+
     buildTypes {
         release {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), PROGUARD_FILES
         }
     }
+
+    compileOptions {
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
 }
 
 dependencies {
@@ -47,4 +51,4 @@ task generateJavadoc(type: Javadoc) {
     failOnError false
 }
 
-publishing_task(LEANPLUM_CORE_ARTIFACT_ID, 'AndroidSDKCore')
+publishing_task(LEANPLUM_CORE_ARTIFACT_ID)

AndroidSDKFcm/build.gradle

@@ -19,6 +19,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
 }
 
 dependencies {
@@ -40,4 +45,4 @@ task generateJavadoc(type: Javadoc) {
     failOnError false
 }
 
-publishing_task(LEANPLUM_FCM_ARTIFACT_ID, 'AndroidSDKFcm')
+publishing_task(LEANPLUM_FCM_ARTIFACT_ID)

AndroidSDKLocation/build.gradle

@@ -19,6 +19,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
 }
 
 dependencies {
@@ -37,4 +42,4 @@ task generateJavadoc(type: Javadoc) {
     failOnError false
 }
 
-publishing_task(LEANPLUM_LOCATION_ARTIFACT_ID, 'AndroidSDKLocation')
+publishing_task(LEANPLUM_LOCATION_ARTIFACT_ID)

AndroidSDKPush/build.gradle

@@ -18,6 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
 }
 
 dependencies {
@@ -33,4 +38,4 @@ task generateJavadoc(type: Javadoc) {
     failOnError false
 }
 
-publishing_task(LEANPLUM_PUSH_ARTIFACT_ID, 'AndroidSDKPush')
+publishing_task(LEANPLUM_PUSH_ARTIFACT_ID)

AndroidSDKTests/build.gradle

@@ -17,6 +17,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
     testOptions {
         unitTests.all {
             maxParallelForks = 2
@@ -47,11 +51,11 @@ dependencies {
     implementation project(':AndroidSDKLocation')
     implementation project(':AndroidSDKFcm')
     implementation "androidx.appcompat:appcompat:${APPCOMPAT_LIBRARY_VERSION}"
-    implementation 'com.google.android.gms:play-services-location:11.6.0'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
 
     // Dependencies used for unit tests.
-    testImplementation 'junit:junit:4.12'
-    testImplementation('org.robolectric:robolectric:4.1') {
+    testImplementation 'junit:junit:4.13'
+    testImplementation('org.robolectric:robolectric:4.3.1') {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
@@ -61,11 +65,11 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.6'
     testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.6'
-    testImplementation 'org.bouncycastle:bcmail-jdk15on:1.54'
+    testImplementation 'org.bouncycastle:bcmail-jdk15on:1.65'
 }
 
 task jarTests(type: Jar, dependsOn: "assembleDebugUnitTest") {
-    classifier = 'tests'
+    archiveClassifier = 'tests'
     from "$buildDir/intermediates/classes/test/debug"
 }
 configurations {

AndroidSDKTests/src/test/java/com/leanplum/LeanplumInboxMessageTest.java

@@ -20,6 +20,7 @@
  */
 package com.leanplum;
 
+import android.os.Build.VERSION_CODES;
 import com.leanplum.internal.Constants;
 
 import org.junit.Test;
@@ -29,6 +30,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,6 +43,7 @@
  * @author Sayaan Saha
  */
 @RunWith(RobolectricTestRunner.class)
+@Config(sdk = VERSION_CODES.P) // temporarily fix issue with Robolectric and Android SDK 29
 public class LeanplumInboxMessageTest {
   /**
    * Test creating a message from json.

build.gradle

@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
-        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.13.0'
+        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3'
     }
 }