Upgrade Android Gradle plugin to 8.2.2 (#564)

Upgrade compileSdk version to 34
Update build and dependencies to be compatible with Java 17

Author: vasct

.travis.yml

@@ -5,8 +5,8 @@ language: android
 env:
   global:
     - JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2
-    - BUILD_API=31
-    - BUILD_TOOLS=31.0.0
+    - BUILD_API=34
+    - BUILD_TOOLS=34.0.0
     - ABI=x86
     - EMU_API=22
     - EMU_FLAVOR=default
@@ -24,11 +24,6 @@ android:
   components:
     - tools
 
-# Uncomment and remove lines in before_install when issue with JDK is resolved
-# Check thread here: https://travis-ci.community/t/installing-oraclejdk-11-failed/13050/10
-# jdk:
-  # - oraclejdk11
-
 licenses:
   - 'android-sdk-preview-license-.+'
   - 'android-sdk-license-.+'
@@ -37,8 +32,8 @@ licenses:
 before_install:
   - curl -s "https://get.sdkman.io" | bash
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
-  - sdk install java 11.0.12-open
-  - sdk use java 11.0.12-open
+  - sdk install java 17.0.2-open
+  - sdk use java 17.0.2-open
   # Install cmdline-tools (older tools doesn't support Java 11)
   - wget -q "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" -O android-commandline-tools-linux.zip
   - mkdir -p ${ANDROID_HOME}/cmdline-tools

AndroidSDKCore/build.gradle

@@ -9,7 +9,7 @@ apply from: "../common-methods.gradle"
 
 android {
     namespace 'com.leanplum.core'
-    compileSdkVersion COMPILE_SDK_VERSION
+    compileSdk COMPILE_SDK_VERSION
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
@@ -36,6 +36,9 @@ android {
         sourceCompatibility JAVA_VERSION
         targetCompatibility JAVA_VERSION
     }
+    kotlinOptions {
+        jvmTarget = JAVA_VERSION
+    }
 }
 
 dependencies {

AndroidSDKCore/src/main/java/com/leanplum/internal/LeanplumEventDataManager.java

@@ -21,6 +21,7 @@
 
 package com.leanplum.internal;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -118,6 +119,7 @@ List<Map<String, Object>> getEvents(int count) {
           null, KEY_ROWID + " ASC", "" + count);
       hasDatabaseError = false;
       while (cursor.moveToNext()) {
+        @SuppressLint("Range")
         Map<String, Object> requestArgs = JsonConverter.mapFromJson(new JSONObject(
             cursor.getString(cursor.getColumnIndex(COLUMN_DATA))));
         events.add(requestArgs);

AndroidSDKFcm/build.gradle

@@ -35,10 +35,7 @@ dependencies {
     api project(':AndroidSDKPush')
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
-    compileOnly('com.google.firebase:firebase-messaging:[20.3.0,)') {
-        exclude module: 'support-v4'
-    }
-
+    compileOnly('com.google.firebase:firebase-messaging:23.0.8')
     implementation "com.clevertap.android:clevertap-android-sdk:${CT_SDK_VERSION}"
 }
 

AndroidSDKLocation/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     api project(':AndroidSDKCore')
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
-    compileOnly('com.google.android.gms:play-services-location:[10.0.0,)') {
+    compileOnly('com.google.android.gms:play-services-location:[16.0.0,)') {
         exclude module: 'support-v4'
     }
 }

AndroidSDKPush/src/main/java/com/leanplum/LeanplumNotificationHelper.java

@@ -36,15 +36,13 @@
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.text.TextUtils;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
-import android.text.TextUtils;
-import android.util.TypedValue;
-import android.widget.RemoteViews;
-
 import androidx.core.app.NotificationManagerCompat;
-import com.leanplum.internal.Constants;
+
 import com.leanplum.internal.Constants.Keys;
 import com.leanplum.internal.JsonConverter;
 import com.leanplum.internal.Log;

AndroidSDKTests/build.gradle

@@ -73,17 +73,19 @@ dependencies {
 
     // Dependencies used for unit tests.
     testImplementation 'junit:junit:4.13'
-    testImplementation('org.robolectric:robolectric:4.3.1') {
+    testImplementation('org.robolectric:robolectric:4.7.3') {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
+    testImplementation 'commons-io:commons-io:2.16.1'
     testImplementation 'org.robolectric:shadows-play-services:3.3.2'
     testImplementation 'org.mockito:mockito-core:1.10.19'
     testImplementation 'org.powermock:powermock-module-junit4:1.6.5'
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.5'
     testImplementation 'org.powermock:powermock-api-mockito:1.6.5'
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.5'
-    testImplementation 'org.bouncycastle:bcmail-jdk15on:1.65'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.5'
+    testImplementation 'org.bouncycastle:bcmail-jdk18on:1.71.1'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test:runner:1.2.0'
@@ -106,3 +108,24 @@ configurations {
 artifacts {
     unitTestArtifact jarTests
 }
+
+tasks.withType(Test) {
+    jvmArgs '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED',
+            '--add-opens=java.base/java.lang=ALL-UNNAMED',
+            '--add-opens=java.base/java.net=ALL-UNNAMED',
+            '--add-opens=java.base/java.util=ALL-UNNAMED',
+            '--add-opens=java.base/java.text=ALL-UNNAMED',
+            '--add-opens=java.desktop/java.awt.font=ALL-UNNAMED',
+            '--add-opens=java.base/java.security=ALL-UNNAMED',
+            '--add-opens=java.base/java.io=ALL-UNNAMED',
+            '--add-opens=java.base/sun.security.jca=ALL-UNNAMED',
+            '--add-opens=java.base/sun.security.util=ALL-UNNAMED',
+            '--add-opens=java.base/jdk.internal.util=ALL-UNNAMED',
+            '--add-opens=java.base/javax.net.ssl=ALL-UNNAMED',
+            '--add-opens=java.base/java.util.regex=ALL-UNNAMED',
+            '--add-opens=java.base/java.util.concurrent=ALL-UNNAMED',
+            '--add-opens=java.base/sun.util.calendar=ALL-UNNAMED',
+            '--add-opens=java.base/java.util.zip=ALL-UNNAMED',
+            '--add-opens=java.base/java.nio.charset=ALL-UNNAMED'
+
+}

AndroidSDKTests/src/main/res/values/colors.xml

@@ -2,10 +2,6 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
     </style>
 
 </resources>

AndroidSDKTests/src/main/res/values/styles.xml

@@ -32,7 +32,6 @@
 import com.leanplum.internal.Log;
 import com.leanplum.internal.VarCache;
 
-import org.apache.maven.artifact.ant.shaded.IOUtil;
 import org.junit.Assert;
 import org.junit.Test;
 import org.robolectric.RuntimeEnvironment;