Update AGP to Version 8.7.1 (#280)

* Upgrade AGP to version 8.7.1 using migration assistant and update Kotlin version to fix build errors. * Explicitly declare java toolchain version for Java 17. * Add to CHANGELOG.
paypal · Oct 31, 2024 · 3407956 · 3407956
1 parent f152ce3
commit 3407956
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # PayPal Android SDK Release Notes
 
+# unreleased
+* Gradle
+  * Update Kotlin version to `1.9.24`
+  * Update Android Gradle Plugin (AGP) to version `8.7.1`
+  * Explicitly declare Java 17 version as the target JVM toolchain
+
 ## 1.7.1 (2024-10-29)
 * Gradle
   * Update Android Gradle Plugin (AGP) to version `8.5.2`

diff --git a/CardPayments/build.gradle b/CardPayments/build.gradle
@@ -6,6 +6,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.cardpayments'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         compileSdk modules.androidCompileSdk

diff --git a/CorePayments/build.gradle b/CorePayments/build.gradle
@@ -6,6 +6,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.corepayments'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         compileSdk modules.androidCompileSdk

diff --git a/Demo/build.gradle b/Demo/build.gradle
@@ -11,6 +11,11 @@ def paypalProperties = loadPropertiesFromFile("paypal.properties")
 
 android {
     namespace 'com.paypal.android'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         applicationId "com.paypal.android"
@@ -32,7 +37,7 @@ android {
 
     composeOptions {
         // Ref: https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.14"
     }
 
     buildTypes {

diff --git a/FraudProtection/build.gradle b/FraudProtection/build.gradle
@@ -5,6 +5,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.fraudprotection'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         compileSdk modules.androidCompileSdk

diff --git a/PayPalNativePayments/build.gradle b/PayPalNativePayments/build.gradle
@@ -5,6 +5,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.paypalnativepayments'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         // TODO: revert once Native XO supports minSdk 21

diff --git a/PayPalWebPayments/build.gradle b/PayPalWebPayments/build.gradle
@@ -5,6 +5,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.paypalwebpayments'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         compileSdk modules.androidCompileSdk

diff --git a/PaymentButtons/build.gradle b/PaymentButtons/build.gradle
@@ -5,6 +5,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.ui'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         compileSdk modules.androidCompileSdk

diff --git a/Venmo/build.gradle b/Venmo/build.gradle
@@ -5,6 +5,11 @@ plugins {
 
 android {
     namespace 'com.paypal.android.venmo'
+    java {
+        toolchain {
+            languageVersion = modules.kotlinToolchainLanguageVersion
+        }
+    }
 
     defaultConfig {
         compileSdk modules.androidCompileSdk

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,8 @@ buildscript {
             "androidCompileSdk": 35,
             "sourceCompatibility": JavaVersion.VERSION_1_8,
             "targetCompatibility": JavaVersion.VERSION_1_8,
-            "kotlinJvmTarget": JavaVersion.VERSION_1_8.toString()
+            "kotlinJvmTarget": JavaVersion.VERSION_1_8.toString(),
+            "kotlinToolchainLanguageVersion": JavaLanguageVersion.of(17)
     ]
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.5.2"
+androidGradlePlugin = "8.7.1"
 androidxAppcompat = "1.3.1"
 androidxComposeBom = "2023.05.01"
 androidxCoreKtx = "1.6.0"
@@ -25,7 +25,7 @@ hiltVersion = "2.51.1"
 json = "20220320"
 jsonAssert = "1.4.0"
 junit = "4.13.2"
-kotlinVersion = "1.8.21"
+kotlinVersion = "1.9.24"
 kotlinxAndroidCoroutinesTest = "1.6.1"
 kotlinxCoroutinesAndroid = "1.6.1"
 lifecycleRuntimeCompose = "2.6.1"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 21 09:49:22 CDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists