From fe4801097bc808742b76025f44d87c5c7888c0c4 Mon Sep 17 00:00:00 2001 From: driezy Date: Sun, 10 May 2026 12:41:01 +0800 Subject: [PATCH 1/2] Support AGP 9 built-in Kotlin --- .../battery_plus/battery_plus/android/build.gradle | 10 ++++++---- .../network_info_plus/android/build.gradle | 10 ++++++---- .../package_info_plus/android/build.gradle | 10 ++++++---- .../sensors_plus/sensors_plus/android/build.gradle | 10 ++++++---- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packages/battery_plus/battery_plus/android/build.gradle b/packages/battery_plus/battery_plus/android/build.gradle index c56bd2ea33..6ded7f439d 100644 --- a/packages/battery_plus/battery_plus/android/build.gradle +++ b/packages/battery_plus/battery_plus/android/build.gradle @@ -21,7 +21,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.battery' @@ -32,9 +31,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } defaultConfig { minSdk 21 @@ -46,6 +42,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "androidx.core:core-ktx:1.16.0" diff --git a/packages/network_info_plus/network_info_plus/android/build.gradle b/packages/network_info_plus/network_info_plus/android/build.gradle index 3158a6c6ab..1454ae6694 100644 --- a/packages/network_info_plus/network_info_plus/android/build.gradle +++ b/packages/network_info_plus/network_info_plus/android/build.gradle @@ -22,7 +22,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.network_info' @@ -33,9 +32,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } defaultConfig { minSdk 19 @@ -50,3 +46,9 @@ android { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle index f03c20d32f..240f0e9e9a 100644 --- a/packages/package_info_plus/package_info_plus/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/android/build.gradle @@ -23,7 +23,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.packageinfo' @@ -34,9 +33,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } defaultConfig { minSdk 19 @@ -51,3 +47,9 @@ android { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index 64eb5f8fa4..ca49bda67a 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -22,7 +22,6 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.sensors' @@ -33,9 +32,6 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = 17 - } defaultConfig { minSdk 19 @@ -49,3 +45,9 @@ android { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} From 6e57b3980b66f59bb5ac68c8b154c74587cb99d6 Mon Sep 17 00:00:00 2001 From: driezy Date: Sun, 10 May 2026 14:10:47 +0800 Subject: [PATCH 2/2] build(android): keep Kotlin plugin for compatibility --- packages/battery_plus/battery_plus/android/build.gradle | 2 ++ .../network_info_plus/network_info_plus/android/build.gradle | 1 + .../package_info_plus/package_info_plus/android/build.gradle | 1 + packages/sensors_plus/sensors_plus/android/build.gradle | 1 + 4 files changed, 5 insertions(+) diff --git a/packages/battery_plus/battery_plus/android/build.gradle b/packages/battery_plus/battery_plus/android/build.gradle index 6ded7f439d..286ddd67ab 100644 --- a/packages/battery_plus/battery_plus/android/build.gradle +++ b/packages/battery_plus/battery_plus/android/build.gradle @@ -10,6 +10,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.12.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,6 +22,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.battery' diff --git a/packages/network_info_plus/network_info_plus/android/build.gradle b/packages/network_info_plus/network_info_plus/android/build.gradle index 1454ae6694..8b618fc4c0 100644 --- a/packages/network_info_plus/network_info_plus/android/build.gradle +++ b/packages/network_info_plus/network_info_plus/android/build.gradle @@ -22,6 +22,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.network_info' diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle index 240f0e9e9a..e4abc162c4 100644 --- a/packages/package_info_plus/package_info_plus/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/android/build.gradle @@ -23,6 +23,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.packageinfo' diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index ca49bda67a..b31f04603e 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -22,6 +22,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { namespace 'dev.fluttercommunity.plus.sensors'