From a7d96b0e4366dacac7856c89ac8940aff261a733 Mon Sep 17 00:00:00 2001 From: Mostafa Monir Date: Sat, 5 Sep 2026 15:55:35 +0300 Subject: [PATCH 1/4] Apply Kotlin Gradle Plugin only when AGP built-in Kotlin is inactive --- pay/pubspec.yaml | 2 +- pay_android/CHANGELOG.md | 4 +++ pay_android/android/build.gradle | 29 ++++++++++++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- pay_android/pubspec.yaml | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/pay/pubspec.yaml b/pay/pubspec.yaml index bf7f7d7..abd7dd4 100644 --- a/pay/pubspec.yaml +++ b/pay/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - pay_android: ^3.2.0 + pay_android: ^3.3.0 pay_ios: ^1.1.0 pay_platform_interface: ^2.0.0 meta: ^1.10.0 diff --git a/pay_android/CHANGELOG.md b/pay_android/CHANGELOG.md index a1dbe36..10a3cf8 100644 --- a/pay_android/CHANGELOG.md +++ b/pay_android/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.3.0 (2026-09-05) + +* Apply Kotlin Gradle Plugin only when AGP built-in Kotlin is inactive. + ## 3.2.0 (2025-11-21) * Add `pix` to the `GooglePayButtonType` enum. This enables the PIX button type on the Google Pay button for Pix integrations. diff --git a/pay_android/android/build.gradle b/pay_android/android/build.gradle index 3c28d14..8ce8ba1 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.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -38,18 +38,20 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' + +def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int +def builtInKotlin = agpMajor >= 9 && + project.findProperty('android.builtInKotlin')?.toString() != 'false' +if (!builtInKotlin) { + 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 - - kotlinOptions { - jvmTarget = '1.8' - } + compileSdk 36 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -64,6 +66,17 @@ android { lintOptions { disable 'InvalidPackage' } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + } } dependencies { diff --git a/pay_android/android/gradle/wrapper/gradle-wrapper.properties b/pay_android/android/gradle/wrapper/gradle-wrapper.properties index 1af9e09..be2dc79 100644 --- a/pay_android/android/gradle/wrapper/gradle-wrapper.properties +++ b/pay_android/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/pay_android/pubspec.yaml b/pay_android/pubspec.yaml index 5941a69..12b05fa 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.2.0 +version: 3.3.0 homepage: https://github.com/google-pay/flutter-plugin environment: From ae2fb39d3931a7aa91ea0c5cc527310a44075e4d Mon Sep 17 00:00:00 2001 From: Mostafa Monir Date: Sat, 5 Sep 2026 16:16:34 +0300 Subject: [PATCH 2/4] revert bump pay_android in pay --- pay/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay/pubspec.yaml b/pay/pubspec.yaml index abd7dd4..bf7f7d7 100644 --- a/pay/pubspec.yaml +++ b/pay/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - pay_android: ^3.3.0 + pay_android: ^3.2.0 pay_ios: ^1.1.0 pay_platform_interface: ^2.0.0 meta: ^1.10.0 From 3fa6f24e6e43b0fc505a5544249a1f21b08c45d5 Mon Sep 17 00:00:00 2001 From: Mostafa Monir Date: Sat, 5 Sep 2026 16:36:17 +0300 Subject: [PATCH 3/4] 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 12b05fa..addb00c 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.3.0 +version: 3.2.1 homepage: https://github.com/google-pay/flutter-plugin environment: From 85796f08b2372563f827354dd3832020ddb12fb3 Mon Sep 17 00:00:00 2001 From: Mostafa Monir Date: Sat, 5 Sep 2026 16:44:44 +0300 Subject: [PATCH 4/4] update changelog --- pay_android/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay_android/CHANGELOG.md b/pay_android/CHANGELOG.md index 10a3cf8..8097f1c 100644 --- a/pay_android/CHANGELOG.md +++ b/pay_android/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 3.3.0 (2026-09-05) +## 3.2.1 (2026-09-05) * Apply Kotlin Gradle Plugin only when AGP built-in Kotlin is inactive.