From 596f50c8a7af757a1c8faead824771fcf5efbcc9 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Fri, 10 Oct 2025 16:32:00 +0300 Subject: [PATCH 01/12] use jvmTarget 11 --- pay_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index 082cddc..bc5acb1 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -48,7 +48,7 @@ android { compileSdk 34 kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '11' } sourceSets { From 39f3332417974f340ed79984264f019cc6e334b9 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 12 Nov 2025 22:21:22 +0200 Subject: [PATCH 02/12] update pay_android version --- pay_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay_android/pubspec.yaml b/pay_android/pubspec.yaml index e03d999..6637763 100644 --- a/pay_android/pubspec.yaml +++ b/pay_android/pubspec.yaml @@ -14,7 +14,7 @@ name: pay_android description: A plug-in to add support for payments on the Android side of Flutter applications. -version: 3.1.1 +version: 3.1.2 homepage: https://github.com/google-pay/flutter-plugin environment: From 7296c679b3521dc4953e563660e05e52395bcebe Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 12 Nov 2025 22:21:57 +0200 Subject: [PATCH 03/12] Update CHANGELOG.md --- pay_android/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pay_android/CHANGELOG.md b/pay_android/CHANGELOG.md index c20b7d2..8403e93 100644 --- a/pay_android/CHANGELOG.md +++ b/pay_android/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.1.2 (2025-11-12) + +* Update JVM target to 11. + ## 3.1.1 (2024-03-28) * Remove inexisting version of the `androidx.test:rules` dependency. From 00c52f95a3a9f31f079ccb657b36bc8c99724f4b Mon Sep 17 00:00:00 2001 From: asaarnak Date: Tue, 18 Nov 2025 23:53:44 +0200 Subject: [PATCH 04/12] Update build.gradle kotlin and jvm --- pay_android/android/build.gradle | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index bc5acb1..211825b 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -18,14 +18,14 @@ group 'io.flutter.plugins.pay_android' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.8.21' + ext.kotlin_version = '2.2.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.12.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -41,14 +41,14 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - // Conditional for compatibility with AGP <4.2. - if (project.android.hasProperty("namespace")) { - namespace 'io.flutter.plugins.pay_android' - } - compileSdk 34 + namespace = 'io.flutter.plugins.pay_android' + compileSdk = flutter.compileSdkVersion + defaultConfig { + minSdkVersion 21 + } kotlinOptions { - jvmTarget = '11' + jvmTarget = JavaVersion.VERSION_17.toString() } sourceSets { @@ -57,10 +57,6 @@ android { androidTest.java.srcDirs += 'src/androidTest/kotlin' } - defaultConfig { - minSdkVersion 21 - } - lintOptions { disable 'InvalidPackage' } From b354134e5201352788e11d4c359558b6313dbb38 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Tue, 18 Nov 2025 23:54:08 +0200 Subject: [PATCH 05/12] Update CHANGELOG.md --- pay_android/CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pay_android/CHANGELOG.md b/pay_android/CHANGELOG.md index 8403e93..c20b7d2 100644 --- a/pay_android/CHANGELOG.md +++ b/pay_android/CHANGELOG.md @@ -1,9 +1,5 @@ # Changelog -## 3.1.2 (2025-11-12) - -* Update JVM target to 11. - ## 3.1.1 (2024-03-28) * Remove inexisting version of the `androidx.test:rules` dependency. From f8b47d8367d1a955ea6489fdd365e4db0ba928f9 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Tue, 18 Nov 2025 23:54:36 +0200 Subject: [PATCH 06/12] revert plugin version --- pay_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay_android/pubspec.yaml b/pay_android/pubspec.yaml index 6637763..e03d999 100644 --- a/pay_android/pubspec.yaml +++ b/pay_android/pubspec.yaml @@ -14,7 +14,7 @@ name: pay_android description: A plug-in to add support for payments on the Android side of Flutter applications. -version: 3.1.2 +version: 3.1.1 homepage: https://github.com/google-pay/flutter-plugin environment: From 9078e822c046f740c8877759b039be631e903824 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 19 Nov 2025 00:03:01 +0200 Subject: [PATCH 07/12] compileOptions --- pay_android/android/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index 211825b..7e7d837 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -47,6 +47,12 @@ android { defaultConfig { minSdkVersion 21 } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() } From c43a1f7cd2cf65559734d7db06944f0a53984ca2 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 19 Nov 2025 00:05:09 +0200 Subject: [PATCH 08/12] Update build.gradle --- pay_android/android/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index 7e7d837..ed9e2ec 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -44,10 +44,6 @@ android { namespace = 'io.flutter.plugins.pay_android' compileSdk = flutter.compileSdkVersion - defaultConfig { - minSdkVersion 21 - } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -63,6 +59,10 @@ android { androidTest.java.srcDirs += 'src/androidTest/kotlin' } + defaultConfig { + minSdkVersion 21 + } + lintOptions { disable 'InvalidPackage' } From 6a5a28d976c0d3e70b6030fbe814e5c10006db91 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 19 Nov 2025 00:10:01 +0200 Subject: [PATCH 09/12] migrate away from deprecated kotlinOptions --- pay_android/android/build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index ed9e2ec..b5c2cf4 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -40,6 +40,12 @@ rootProject.allprojects { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +kotlin { + compilerOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } +} + android { namespace = 'io.flutter.plugins.pay_android' compileSdk = flutter.compileSdkVersion @@ -48,10 +54,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } sourceSets { main.java.srcDirs += 'src/main/kotlin' From 720e4a2bde689d4e28700627b499b94a21a5d75d Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 19 Nov 2025 00:11:35 +0200 Subject: [PATCH 10/12] migrate away from deprecated kotlinOptions --- pay_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index b5c2cf4..319f00e 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -42,7 +42,7 @@ apply plugin: 'kotlin-android' kotlin { compilerOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JvmTarget.fromTarget("17") } } From dc0531f8a80b9b3db18d572027a9ff048dffaee3 Mon Sep 17 00:00:00 2001 From: asaarnak Date: Wed, 19 Nov 2025 00:13:52 +0200 Subject: [PATCH 11/12] add missing import --- pay_android/android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index 319f00e..c6705d5 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget group 'io.flutter.plugins.pay_android' version '1.0-SNAPSHOT' From 7b2f4cf91ea4c8a93f48b91e08b993b01e4a212b Mon Sep 17 00:00:00 2001 From: asaarnak Date: Mon, 24 Nov 2025 21:14:07 +0200 Subject: [PATCH 12/12] bump gradle plugin --- pay_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index c6705d5..9508e49 100644 --- a/pay_android/android/build.gradle +++ b/pay_android/android/build.gradle @@ -26,7 +26,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' + classpath 'com.android.tools.build:gradle:8.13.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }