Upgrade AGP to 8.5.2 and Bump Compile Version to API 35 (#278)

* Update compile sdk to version 35. * Update build version. * Remove Jacoco for now. * Update CHANGELOG. * Bump GitHub Actions Java Version to 17 to match Android Studio Default JDK Version. * Remove test_coverage workflow for now until we migrate to Kover. * Fix Android lint errors. * Update build versions. * Ignore Android Gradle Plugin Versions for now. * Remove explicit toolchain target. * Make Demo app use same source and target compatability versions as all modules. * Revert Java 17 Demo app settings.
paypal · Oct 28, 2024 · a0c65d0 · a0c65d0
1 parent dcc46f9
commit a0c65d0
Show file tree

Hide file tree

Showing 33 changed files with 103 additions and 137 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
             #After decoding the secret key, place the file in ~ /. Gradle/ secring.gpg
       - name: Decode Signing Key

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
           #After decoding the secret key, place the file in ~ /. Gradle/ secring.gpg
       - name: Decode Signing Key
@@ -43,7 +43,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -59,7 +59,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -74,7 +74,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -89,7 +89,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -104,7 +104,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -130,7 +130,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Decode Signing Key
         uses: ./.github/actions/decode_signing_key_action

diff --git a/.github/workflows/release_demo.yml b/.github/workflows/release_demo.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Decode Demo Keystore
         run: |

diff --git a/.github/workflows/release_snapshot.yml b/.github/workflows/release_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
           #After decoding the secret key, place the file in ~ /. Gradle/ secring.gpg
       - name: Decode Signing Key
@@ -46,7 +46,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -62,7 +62,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -77,7 +77,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -92,7 +92,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -107,7 +107,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         uses: ./.github/actions/unit_test_module
@@ -133,7 +133,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Decode Signing Key
         uses: ./.github/actions/decode_signing_key_action

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Detekt
         run: ./gradlew detekt
@@ -27,7 +27,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Lint
         run: ./gradlew lint
@@ -40,7 +40,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
 
       # Assemble artifacts from main branch
@@ -88,7 +88,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'microsoft'
-          java-version: '11'
+          java-version: '17'
 
       # Run Diffuse analysis
       - name: Run Diffuse Analysis - CardPayments

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'microsoft'
       - name: Run Unit Tests
         run: ./gradlew --stacktrace testDebug
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,15 @@
 # PayPal Android SDK Release Notes
 
-## 1.6.0 (2024-10-24)
+## unreleased
+* Gradle
+  * Update Android Gradle Plugin (AGP) to version `8.5.2`
+  * Remove jacoco code coverage integration that was causing build failures after upgrading to latest AGP version
+  * Remove hardcoded compileSdk version from each module's `build.gradle` file
+  * Update Demo app to use Java 17 to fix kapt build errors
+* GitHub Actions
+  * Bump Java Version to 17 for all build actions
 
+## 1.6.0 (2024-10-24)
 * All Modules
   * Upgrade compileSdkVersion and targetSdkVersion to API 35
 * CardPayments

diff --git a/CardPayments/build.gradle b/CardPayments/build.gradle
@@ -1,14 +1,14 @@
 plugins {
     alias libs.plugins.android.library
     alias libs.plugins.kotlinAndroid
-    alias libs.plugins.jacocoAndroid
     alias libs.plugins.kotlinParcelize
 }
 
 android {
-    compileSdkVersion 31
+    namespace 'com.paypal.android.cardpayments'
 
     defaultConfig {
+        compileSdk modules.androidCompileSdk
         minSdkVersion modules.androidMinSdkVersion
         targetSdkVersion modules.androidTargetVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -23,11 +23,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility modules.sourceCompatibility
+        targetCompatibility modules.targetCompatibility
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = modules.kotlinJvmTarget
     }
 
     lintOptions {

diff --git a/CardPayments/src/main/AndroidManifest.xml b/CardPayments/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.paypal.android.cardpayments">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/CorePayments/build.gradle b/CorePayments/build.gradle
@@ -1,14 +1,14 @@
 plugins {
     alias libs.plugins.android.library
     alias libs.plugins.kotlinAndroid
-    alias libs.plugins.jacocoAndroid
     alias libs.plugins.kotlinParcelize
 }
 
 android {
-    compileSdkVersion 31
+    namespace 'com.paypal.android.corepayments'
 
     defaultConfig {
+        compileSdk modules.androidCompileSdk
         minSdkVersion modules.androidMinSdkVersion
         targetSdkVersion modules.androidTargetVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -24,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility modules.sourceCompatibility
+        targetCompatibility modules.targetCompatibility
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = modules.kotlinJvmTarget
     }
     lintOptions {
         lintConfig file('../lint.xml')
@@ -53,7 +53,6 @@ android {
             }
         }
     }
-
 }
 
 dependencies {

diff --git a/CorePayments/src/main/AndroidManifest.xml b/CorePayments/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.paypal.android.corepayments">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/CorePayments/src/main/java/com/paypal/android/corepayments/PaymentsJSON.kt b/CorePayments/src/main/java/com/paypal/android/corepayments/PaymentsJSON.kt
@@ -27,7 +27,7 @@ class PaymentsJSON(val json: JSONObject) {
         var node: JSONObject? = json
         while (keys.size > 1) {
             node = node?.optJSONObject(keys[0])
-            keys.removeFirst()
+            keys.removeAt(0)
         }
 
         return node?.optString(keys[0])
@@ -39,7 +39,7 @@ class PaymentsJSON(val json: JSONObject) {
         var node: JSONObject? = json
         while (keys.size > 0) {
             node = node?.optJSONObject(keys[0])
-            keys.removeFirst()
+            keys.removeAt(0)
         }
         return node?.let { PaymentsJSON(it) }
     }
@@ -50,7 +50,7 @@ class PaymentsJSON(val json: JSONObject) {
         val keys = keyPath.split(".").toMutableList()
         while (keys.size > 1) {
             node = node.getJSONObject(keys[0])
-            keys.removeFirst()
+            keys.removeAt(0)
         }
         return NodeResult(node, keys)
     }
@@ -69,7 +69,7 @@ class PaymentsJSON(val json: JSONObject) {
         var node: JSONObject? = json
         while (keys.size > 1) {
             node = node?.optJSONObject(keys[0])
-            keys.removeFirst()
+            keys.removeAt(0)
         }
 
         return node?.optJSONArray(keys[0])

diff --git a/CorePayments/src/main/java/com/paypal/android/corepayments/analytics/DeviceInspector.kt b/CorePayments/src/main/java/com/paypal/android/corepayments/analytics/DeviceInspector.kt
@@ -61,7 +61,7 @@ internal class DeviceInspector @VisibleForTesting constructor(
             deviceManufacturer = deviceManufacturer,
             deviceModel = deviceModel,
             isSimulator = isSimulator,
-            merchantAppVersion = merchantAppVersion,
+            merchantAppVersion = merchantAppVersion ?: "",
         )
     }
 }