diff --git a/packages/animations/example/android/app/build.gradle.kts b/packages/animations/example/android/app/build.gradle.kts index ffa850c091c9..b61c0123ee40 100644 --- a/packages/animations/example/android/app/build.gradle.kts +++ b/packages/animations/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.packages.animations.animations_example" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/animations/example/android/gradle.properties b/packages/animations/example/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/animations/example/android/gradle.properties +++ b/packages/animations/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/animations/example/android/settings.gradle.kts b/packages/animations/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/animations/example/android/settings.gradle.kts +++ b/packages/animations/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/camera/camera/example/android/app/build.gradle.kts b/packages/camera/camera/example/android/app/build.gradle.kts index abcd449ee17f..2cb6fb9b1bf8 100644 --- a/packages/camera/camera/example/android/app/build.gradle.kts +++ b/packages/camera/camera/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.cameraexample" minSdk = flutter.minSdkVersion @@ -39,6 +34,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/camera/camera/example/android/gradle.properties b/packages/camera/camera/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/camera/camera/example/android/gradle.properties +++ b/packages/camera/camera/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/camera/camera/example/android/settings.gradle.kts b/packages/camera/camera/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/camera/camera/example/android/settings.gradle.kts +++ b/packages/camera/camera/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/camera/camera_android/example/android/app/build.gradle.kts b/packages/camera/camera_android/example/android/app/build.gradle.kts index 5cbd95299a93..fd5045ca5472 100644 --- a/packages/camera/camera_android/example/android/app/build.gradle.kts +++ b/packages/camera/camera_android/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.cameraexample" minSdk = flutter.minSdkVersion @@ -39,6 +34,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/camera/camera_android/example/android/gradle.properties b/packages/camera/camera_android/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/camera/camera_android/example/android/gradle.properties +++ b/packages/camera/camera_android/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/camera/camera_android/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/camera/camera_android/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/camera/camera_android/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/camera/camera_android/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/camera/camera_android/example/android/settings.gradle.kts b/packages/camera/camera_android/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/camera/camera_android/example/android/settings.gradle.kts +++ b/packages/camera/camera_android/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/espresso/example/android/app/build.gradle.kts b/packages/espresso/example/android/app/build.gradle.kts index bd4a4767ae50..5e6f92a7092a 100644 --- a/packages/espresso/example/android/app/build.gradle.kts +++ b/packages/espresso/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { minSdk = flutter.minSdkVersion targetSdk = flutter.targetSdkVersion @@ -35,6 +30,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/espresso/example/android/gradle.properties b/packages/espresso/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/espresso/example/android/gradle.properties +++ b/packages/espresso/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties index c24d16c7e31b..a0f0c4305350 100644 --- a/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/espresso/example/android/settings.gradle.kts b/packages/espresso/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/espresso/example/android/settings.gradle.kts +++ b/packages/espresso/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle.kts b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle.kts index e9262e9bebd1..24f3ab05dd30 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle.kts +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.extension_google_sign_in_example" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle.kts b/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle.kts +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/file_selector/file_selector/example/android/app/build.gradle.kts b/packages/file_selector/file_selector/example/android/app/build.gradle.kts index b5738ce6f126..81b6f18f1167 100644 --- a/packages/file_selector/file_selector/example/android/app/build.gradle.kts +++ b/packages/file_selector/file_selector/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -14,10 +13,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.plugins.file_selector_example" minSdk = flutter.minSdkVersion @@ -33,6 +28,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/file_selector/file_selector/example/android/gradle.properties b/packages/file_selector/file_selector/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/file_selector/file_selector/example/android/gradle.properties +++ b/packages/file_selector/file_selector/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/file_selector/file_selector/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/file_selector/file_selector/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/file_selector/file_selector/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/file_selector/file_selector/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/file_selector/file_selector/example/android/settings.gradle.kts b/packages/file_selector/file_selector/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/file_selector/file_selector/example/android/settings.gradle.kts +++ b/packages/file_selector/file_selector/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle.kts b/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle.kts index 0ee0ce2f9fdd..7baf2803840a 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle.kts +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.flutter_plugin_android_lifecycle_example" minSdk = flutter.minSdkVersion @@ -36,6 +31,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties b/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties +++ b/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties index c24d16c7e31b..a0f0c4305350 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle.kts b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle.kts +++ b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/go_router/example/android/app/build.gradle.kts b/packages/go_router/example/android/app/build.gradle.kts index c74e3b1fbb2b..258f2dbab6cd 100644 --- a/packages/go_router/example/android/app/build.gradle.kts +++ b/packages/go_router/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.go_router_examples" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/go_router/example/android/gradle.properties b/packages/go_router/example/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/go_router/example/android/gradle.properties +++ b/packages/go_router/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/go_router/example/android/settings.gradle.kts b/packages/go_router/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/go_router/example/android/settings.gradle.kts +++ b/packages/go_router/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/google_fonts/example/android/app/build.gradle.kts b/packages/google_fonts/example/android/app/build.gradle.kts index 441c9a5fe9b0..38644abd178b 100644 --- a/packages/google_fonts/example/android/app/build.gradle.kts +++ b/packages/google_fonts/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.google_fonts_tester" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/google_fonts/example/android/gradle.properties b/packages/google_fonts/example/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/google_fonts/example/android/gradle.properties +++ b/packages/google_fonts/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/google_fonts/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_fonts/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/google_fonts/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/google_fonts/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/google_fonts/example/android/settings.gradle.kts b/packages/google_fonts/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/google_fonts/example/android/settings.gradle.kts +++ b/packages/google_fonts/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle.kts b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle.kts index 50bc6979a57f..4f064037a4dc 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle.kts +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.googlemapsexample" minSdk = flutter.minSdkVersion @@ -45,6 +40,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties index 0c68fbc1dadd..a5973494f995 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/google_maps_flutter/google_maps_flutter/example/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.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle.kts b/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle.kts +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/google_sign_in/google_sign_in/example/android/app/build.gradle.kts b/packages/google_sign_in/google_sign_in/example/android/app/build.gradle.kts index a424fcb4fafa..976c244ab7f8 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/build.gradle.kts +++ b/packages/google_sign_in/google_sign_in/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.googlesigninexample" minSdk = flutter.minSdkVersion @@ -43,6 +38,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/google_sign_in/google_sign_in/example/android/gradle.properties b/packages/google_sign_in/google_sign_in/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/google_sign_in/google_sign_in/example/android/gradle.properties +++ b/packages/google_sign_in/google_sign_in/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/google_sign_in/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_sign_in/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/google_sign_in/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/google_sign_in/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/google_sign_in/google_sign_in/example/android/settings.gradle.kts b/packages/google_sign_in/google_sign_in/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/google_sign_in/google_sign_in/example/android/settings.gradle.kts +++ b/packages/google_sign_in/google_sign_in/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/image_picker/image_picker/example/android/app/build.gradle.kts b/packages/image_picker/image_picker/example/android/app/build.gradle.kts index 6f5dfe2c2a5f..b93ad4e473b1 100644 --- a/packages/image_picker/image_picker/example/android/app/build.gradle.kts +++ b/packages/image_picker/image_picker/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.imagepicker.example" minSdk = flutter.minSdkVersion @@ -44,6 +39,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/image_picker/image_picker/example/android/gradle.properties b/packages/image_picker/image_picker/example/android/gradle.properties index da87b2c8f892..6146589810a7 100755 --- a/packages/image_picker/image_picker/example/android/gradle.properties +++ b/packages/image_picker/image_picker/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/image_picker/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/image_picker/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/image_picker/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/image_picker/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/image_picker/image_picker/example/android/settings.gradle.kts b/packages/image_picker/image_picker/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/image_picker/image_picker/example/android/settings.gradle.kts +++ b/packages/image_picker/image_picker/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle.kts b/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle.kts index 2ba1d93c7bc0..f5fafd4d1ec3 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle.kts +++ b/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle.kts @@ -2,7 +2,6 @@ import java.util.Properties plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -51,10 +50,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = appId minSdk = flutter.minSdkVersion @@ -92,6 +87,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties b/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties +++ b/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/in_app_purchase/in_app_purchase/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/in_app_purchase/in_app_purchase/example/android/gradle/wrapper/gradle-wrapper.properties index c24d16c7e31b..a0f0c4305350 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/in_app_purchase/in_app_purchase/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle.kts b/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle.kts +++ b/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/local_auth/local_auth/example/android/app/build.gradle.kts b/packages/local_auth/local_auth/example/android/app/build.gradle.kts index 520bcf8c629b..d2eb441fe283 100644 --- a/packages/local_auth/local_auth/example/android/app/build.gradle.kts +++ b/packages/local_auth/local_auth/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.localauthexample" minSdk = flutter.minSdkVersion @@ -36,6 +31,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/local_auth/local_auth/example/android/gradle.properties b/packages/local_auth/local_auth/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/local_auth/local_auth/example/android/gradle.properties +++ b/packages/local_auth/local_auth/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/local_auth/local_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/local_auth/local_auth/example/android/gradle/wrapper/gradle-wrapper.properties index e42be75d1b3d..1664b7f6f4b7 100644 --- a/packages/local_auth/local_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/local_auth/local_auth/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/local_auth/local_auth/example/android/settings.gradle.kts b/packages/local_auth/local_auth/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/local_auth/local_auth/example/android/settings.gradle.kts +++ b/packages/local_auth/local_auth/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/path_provider/path_provider/example/android/app/build.gradle.kts b/packages/path_provider/path_provider/example/android/app/build.gradle.kts index 5512cac5eec8..07a643d04e59 100644 --- a/packages/path_provider/path_provider/example/android/app/build.gradle.kts +++ b/packages/path_provider/path_provider/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.pathproviderexample" minSdk = flutter.minSdkVersion @@ -36,6 +31,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/path_provider/path_provider/example/android/gradle.properties b/packages/path_provider/path_provider/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/path_provider/path_provider/example/android/gradle.properties +++ b/packages/path_provider/path_provider/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/path_provider/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/path_provider/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/path_provider/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/path_provider/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/path_provider/path_provider/example/android/settings.gradle.kts b/packages/path_provider/path_provider/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/path_provider/path_provider/example/android/settings.gradle.kts +++ b/packages/path_provider/path_provider/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/path_provider/path_provider_android/example/android/app/build.gradle.kts b/packages/path_provider/path_provider_android/example/android/app/build.gradle.kts index 713d354ba402..38233e1b2442 100644 --- a/packages/path_provider/path_provider_android/example/android/app/build.gradle.kts +++ b/packages/path_provider/path_provider_android/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -27,6 +26,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/path_provider/path_provider_android/example/android/gradle.properties b/packages/path_provider/path_provider_android/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/path_provider/path_provider_android/example/android/gradle.properties +++ b/packages/path_provider/path_provider_android/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/path_provider/path_provider_android/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/path_provider/path_provider_android/example/android/gradle/wrapper/gradle-wrapper.properties index 02767eb1ca47..2d428bfb1672 100644 --- a/packages/path_provider/path_provider_android/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/path_provider/path_provider_android/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/path_provider/path_provider_android/example/android/settings.gradle.kts b/packages/path_provider/path_provider_android/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/path_provider/path_provider_android/example/android/settings.gradle.kts +++ b/packages/path_provider/path_provider_android/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/pigeon/example/app/android/app/build.gradle.kts b/packages/pigeon/example/app/android/app/build.gradle.kts index 2b5f00fb72c5..8de6e84fc142 100644 --- a/packages/pigeon/example/app/android/app/build.gradle.kts +++ b/packages/pigeon/example/app/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -14,10 +13,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.pigeon_example_app" minSdk = flutter.minSdkVersion @@ -33,6 +28,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/pigeon/example/app/android/gradle.properties b/packages/pigeon/example/app/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/pigeon/example/app/android/gradle.properties +++ b/packages/pigeon/example/app/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/pigeon/example/app/android/gradle/wrapper/gradle-wrapper.properties b/packages/pigeon/example/app/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/pigeon/example/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/pigeon/example/app/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/pigeon/example/app/android/settings.gradle.kts b/packages/pigeon/example/app/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/pigeon/example/app/android/settings.gradle.kts +++ b/packages/pigeon/example/app/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle.kts b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle.kts index 422bfc7419eb..7606caa391d0 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle.kts +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -14,10 +13,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "com.example.alternate_language_test_plugin_example" minSdk = flutter.minSdkVersion @@ -33,6 +28,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle.kts b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle.kts +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/quick_actions/quick_actions/example/android/app/build.gradle.kts b/packages/quick_actions/quick_actions/example/android/app/build.gradle.kts index f677fe3f420a..3dfc98af1b84 100644 --- a/packages/quick_actions/quick_actions/example/android/app/build.gradle.kts +++ b/packages/quick_actions/quick_actions/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.quickactionsexample" minSdk = flutter.minSdkVersion @@ -36,6 +31,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/quick_actions/quick_actions/example/android/gradle.properties b/packages/quick_actions/quick_actions/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/quick_actions/quick_actions/example/android/gradle.properties +++ b/packages/quick_actions/quick_actions/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/quick_actions/quick_actions/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/quick_actions/quick_actions/example/android/gradle/wrapper/gradle-wrapper.properties index 6064aebd5424..e053c52b9410 100644 --- a/packages/quick_actions/quick_actions/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/quick_actions/quick_actions/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/quick_actions/quick_actions/example/android/settings.gradle.kts b/packages/quick_actions/quick_actions/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/quick_actions/quick_actions/example/android/settings.gradle.kts +++ b/packages/quick_actions/quick_actions/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/rfw/example/hello/android/app/build.gradle.kts b/packages/rfw/example/hello/android/app/build.gradle.kts index 3bafcc3ce443..f23e63ae9a91 100644 --- a/packages/rfw/example/hello/android/app/build.gradle.kts +++ b/packages/rfw/example/hello/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.rfw.examples.hello" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/rfw/example/hello/android/gradle.properties b/packages/rfw/example/hello/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/rfw/example/hello/android/gradle.properties +++ b/packages/rfw/example/hello/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/rfw/example/hello/android/gradle/wrapper/gradle-wrapper.properties b/packages/rfw/example/hello/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/rfw/example/hello/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/rfw/example/hello/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/rfw/example/hello/android/settings.gradle.kts b/packages/rfw/example/hello/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/rfw/example/hello/android/settings.gradle.kts +++ b/packages/rfw/example/hello/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/rfw/example/local/android/app/build.gradle.kts b/packages/rfw/example/local/android/app/build.gradle.kts index 21a68220257c..16b9d086d198 100644 --- a/packages/rfw/example/local/android/app/build.gradle.kts +++ b/packages/rfw/example/local/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.rfw.examples.local" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/rfw/example/local/android/gradle.properties b/packages/rfw/example/local/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/rfw/example/local/android/gradle.properties +++ b/packages/rfw/example/local/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/rfw/example/local/android/gradle/wrapper/gradle-wrapper.properties b/packages/rfw/example/local/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/rfw/example/local/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/rfw/example/local/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/rfw/example/local/android/settings.gradle.kts b/packages/rfw/example/local/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/rfw/example/local/android/settings.gradle.kts +++ b/packages/rfw/example/local/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/rfw/example/remote/android/app/build.gradle.kts b/packages/rfw/example/remote/android/app/build.gradle.kts index a763d1201f5a..9e1ba1caf224 100644 --- a/packages/rfw/example/remote/android/app/build.gradle.kts +++ b/packages/rfw/example/remote/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.rfw.examples.remote" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/rfw/example/remote/android/gradle.properties b/packages/rfw/example/remote/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/rfw/example/remote/android/gradle.properties +++ b/packages/rfw/example/remote/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/rfw/example/remote/android/gradle/wrapper/gradle-wrapper.properties b/packages/rfw/example/remote/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/rfw/example/remote/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/rfw/example/remote/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/rfw/example/remote/android/settings.gradle.kts b/packages/rfw/example/remote/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/rfw/example/remote/android/settings.gradle.kts +++ b/packages/rfw/example/remote/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/shared_preferences/shared_preferences/example/android/app/build.gradle.kts b/packages/shared_preferences/shared_preferences/example/android/app/build.gradle.kts index bc121b47fccf..237d9be373de 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/build.gradle.kts +++ b/packages/shared_preferences/shared_preferences/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.sharedpreferencesexample" minSdk = flutter.minSdkVersion @@ -33,6 +28,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/shared_preferences/shared_preferences/example/android/gradle.properties b/packages/shared_preferences/shared_preferences/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/shared_preferences/shared_preferences/example/android/gradle.properties +++ b/packages/shared_preferences/shared_preferences/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/shared_preferences/shared_preferences/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/shared_preferences/shared_preferences/example/android/gradle/wrapper/gradle-wrapper.properties index c24d16c7e31b..a0f0c4305350 100644 --- a/packages/shared_preferences/shared_preferences/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/shared_preferences/shared_preferences/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/shared_preferences/shared_preferences/example/android/settings.gradle.kts b/packages/shared_preferences/shared_preferences/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/shared_preferences/shared_preferences/example/android/settings.gradle.kts +++ b/packages/shared_preferences/shared_preferences/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/two_dimensional_scrollables/example/android/app/build.gradle.kts b/packages/two_dimensional_scrollables/example/android/app/build.gradle.kts index b6ec45beaa66..ba5038bf93c0 100644 --- a/packages/two_dimensional_scrollables/example/android/app/build.gradle.kts +++ b/packages/two_dimensional_scrollables/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.two_dimensional_examples" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/two_dimensional_scrollables/example/android/gradle.properties b/packages/two_dimensional_scrollables/example/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/packages/two_dimensional_scrollables/example/android/gradle.properties +++ b/packages/two_dimensional_scrollables/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/two_dimensional_scrollables/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/two_dimensional_scrollables/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/packages/two_dimensional_scrollables/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/two_dimensional_scrollables/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/two_dimensional_scrollables/example/android/settings.gradle.kts b/packages/two_dimensional_scrollables/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/two_dimensional_scrollables/example/android/settings.gradle.kts +++ b/packages/two_dimensional_scrollables/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/url_launcher/url_launcher/example/android/app/build.gradle.kts b/packages/url_launcher/url_launcher/example/android/app/build.gradle.kts index 402d90a1fd67..ff59359725b6 100644 --- a/packages/url_launcher/url_launcher/example/android/app/build.gradle.kts +++ b/packages/url_launcher/url_launcher/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.urllauncherexample" minSdk = flutter.minSdkVersion @@ -36,6 +31,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/url_launcher/url_launcher/example/android/gradle.properties b/packages/url_launcher/url_launcher/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/url_launcher/url_launcher/example/android/gradle.properties +++ b/packages/url_launcher/url_launcher/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/url_launcher/url_launcher/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/url_launcher/url_launcher/example/android/gradle/wrapper/gradle-wrapper.properties index 4389a446aa9e..8f607254eb20 100644 --- a/packages/url_launcher/url_launcher/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/url_launcher/url_launcher/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/url_launcher/url_launcher/example/android/settings.gradle.kts b/packages/url_launcher/url_launcher/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/url_launcher/url_launcher/example/android/settings.gradle.kts +++ b/packages/url_launcher/url_launcher/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/video_player/video_player/example/android/app/build.gradle.kts b/packages/video_player/video_player/example/android/app/build.gradle.kts index 01996cc0ae47..313b1b88a9ee 100644 --- a/packages/video_player/video_player/example/android/app/build.gradle.kts +++ b/packages/video_player/video_player/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -13,10 +12,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.videoplayerexample" minSdk = flutter.minSdkVersion @@ -36,6 +31,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/video_player/video_player/example/android/gradle.properties b/packages/video_player/video_player/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/video_player/video_player/example/android/gradle.properties +++ b/packages/video_player/video_player/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties index c24d16c7e31b..a0f0c4305350 100644 --- a/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/video_player/video_player/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/video_player/video_player/example/android/settings.gradle.kts b/packages/video_player/video_player/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/video_player/video_player/example/android/settings.gradle.kts +++ b/packages/video_player/video_player/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/packages/webview_flutter/webview_flutter/example/android/app/build.gradle.kts b/packages/webview_flutter/webview_flutter/example/android/app/build.gradle.kts index c2f838005c64..e8015a65d86a 100644 --- a/packages/webview_flutter/webview_flutter/example/android/app/build.gradle.kts +++ b/packages/webview_flutter/webview_flutter/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") id("dev.flutter.flutter-gradle-plugin") } @@ -14,10 +13,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "io.flutter.plugins.webviewflutterexample" minSdk = flutter.minSdkVersion @@ -37,6 +32,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/packages/webview_flutter/webview_flutter/example/android/gradle.properties b/packages/webview_flutter/webview_flutter/example/android/gradle.properties index da87b2c8f892..6146589810a7 100644 --- a/packages/webview_flutter/webview_flutter/example/android/gradle.properties +++ b/packages/webview_flutter/webview_flutter/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/webview_flutter/webview_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/webview_flutter/webview_flutter/example/android/gradle/wrapper/gradle-wrapper.properties index c24d16c7e31b..a0f0c4305350 100644 --- a/packages/webview_flutter/webview_flutter/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/webview_flutter/webview_flutter/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/packages/webview_flutter/webview_flutter/example/android/settings.gradle.kts b/packages/webview_flutter/webview_flutter/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/packages/webview_flutter/webview_flutter/example/android/settings.gradle.kts +++ b/packages/webview_flutter/webview_flutter/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" } diff --git a/third_party/packages/flutter_svg/example/android/app/build.gradle.kts b/third_party/packages/flutter_svg/example/android/app/build.gradle.kts index a2fd9e651959..c20630158bde 100644 --- a/third_party/packages/flutter_svg/example/android/app/build.gradle.kts +++ b/third_party/packages/flutter_svg/example/android/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { applicationId = "dev.flutter.plugins.flutter_svg_example" minSdk = flutter.minSdkVersion @@ -34,6 +29,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + flutter { source = "../.." } diff --git a/third_party/packages/flutter_svg/example/android/gradle.properties b/third_party/packages/flutter_svg/example/android/gradle.properties index fbee1d8cdafc..191848c8dd60 100644 --- a/third_party/packages/flutter_svg/example/android/gradle.properties +++ b/third_party/packages/flutter_svg/example/android/gradle.properties @@ -1,2 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true + +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/third_party/packages/flutter_svg/example/android/gradle/wrapper/gradle-wrapper.properties b/third_party/packages/flutter_svg/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..2d428bfb1672 100644 --- a/third_party/packages/flutter_svg/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/third_party/packages/flutter_svg/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip diff --git a/third_party/packages/flutter_svg/example/android/settings.gradle.kts b/third_party/packages/flutter_svg/example/android/settings.gradle.kts index a0118892641d..eac6896b474d 100644 --- a/third_party/packages/flutter_svg/example/android/settings.gradle.kts +++ b/third_party/packages/flutter_svg/example/android/settings.gradle.kts @@ -20,8 +20,8 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.1" }