From a9f22ea04862111e7e5f4e1e82557ae8c8fa9c52 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 26 Feb 2026 16:08:59 -0500 Subject: [PATCH 01/24] Convert plugin build to Kotlin --- .../{build.gradle => build.gradle.kts} | 45 ++++++++++++------- .../android/settings.gradle | 1 - .../android/settings.gradle.kts | 1 + 3 files changed, 30 insertions(+), 17 deletions(-) rename packages/local_auth/local_auth_android/android/{build.gradle => build.gradle.kts} (52%) delete mode 100644 packages/local_auth/local_auth_android/android/settings.gradle create mode 100644 packages/local_auth/local_auth_android/android/settings.gradle.kts diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle.kts similarity index 52% rename from packages/local_auth/local_auth_android/android/build.gradle rename to packages/local_auth/local_auth_android/android/build.gradle.kts index 02f2f41c7dfb..ce02b5d9357a 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle +++ b/packages/local_auth/local_auth_android/android/build.gradle.kts @@ -1,14 +1,16 @@ -group = 'io.flutter.plugins.localauth' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.localauth" +version = "1.0-SNAPSHOT" buildscript { + val kotlinVersion = "2.2.20" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } @@ -19,15 +21,18 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "io.flutter.plugins.localauth" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk = 24 + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -35,21 +40,29 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - lintOptions { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } - testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + + it.outputs.upToDateWhen { false } + + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/local_auth/local_auth_android/android/settings.gradle b/packages/local_auth/local_auth_android/android/settings.gradle deleted file mode 100644 index dca8c623fdf6..000000000000 --- a/packages/local_auth/local_auth_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'local_auth' diff --git a/packages/local_auth/local_auth_android/android/settings.gradle.kts b/packages/local_auth/local_auth_android/android/settings.gradle.kts new file mode 100644 index 000000000000..3d731a10b076 --- /dev/null +++ b/packages/local_auth/local_auth_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "local_auth" From f72f9dd5d648ba31129bbdd9ec22a295bd6d6501 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 26 Feb 2026 16:30:46 -0500 Subject: [PATCH 02/24] Update tool tests --- .../tool/test/gradle_check_command_test.dart | 168 +++++++++++++++++- 1 file changed, 164 insertions(+), 4 deletions(-) diff --git a/script/tool/test/gradle_check_command_test.dart b/script/tool/test/gradle_check_command_test.dart index 7821995c0519..8ee651977ce8 100644 --- a/script/tool/test/gradle_check_command_test.dart +++ b/script/tool/test/gradle_check_command_test.dart @@ -19,6 +19,8 @@ void main() { late Directory packagesDir; const groovyJavaIncompatabilityIndicator = 'build.gradle must set an explicit Java compatibility version.'; + const kotlinJavaIncompatabilityIndicator = + 'build.gradle.kts must set an explicit Java compatibility version.'; setUp(() { final GitDir gitDir; @@ -128,6 +130,101 @@ dependencies { '''); } + /// Writes a fake android/build.gradle.kts file for plugin [package] with the + /// given options. + void writeFakeKotlinPluginBuildGradle( + RepositoryPackage package, { + bool includeLanguageVersion = false, + bool includeSourceCompat = false, + bool includeTargetCompat = false, + bool commentSourceLanguage = false, + bool includeNamespace = true, + bool commentNamespace = false, + bool warningsConfigured = true, + String compileSdk = '36', + bool includeKotlinOptions = true, + bool commentKotlinOptions = false, + bool useDeprecatedJvmTargetStyle = false, + int jvmTargetValue = 17, + int kotlinJvmValue = 17, + }) { + final File buildGradle = package + .platformDirectory(FlutterPlatform.android) + .childFile('build.gradle.kts'); + buildGradle.createSync(recursive: true); + + const warningConfig = ''' + lint { + checkAllWarnings = true + warningsAsErrors = true + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + baseline = file("lint-baseline.xml") + } +'''; + final javaSection = + ''' +java { + toolchain { + ${commentSourceLanguage ? '// ' : ''}languageVersion = JavaLanguageVersion.of(8) + } +} + +'''; + final sourceCompat = + '${commentSourceLanguage ? '// ' : ''}sourceCompatibility = JavaVersion.VERSION_$jvmTargetValue'; + final targetCompat = + '${commentSourceLanguage ? '// ' : ''}targetCompatibility = JavaVersion.VERSION_$jvmTargetValue'; + final namespace = + ' ${commentNamespace ? '// ' : ''}namespace = "$_defaultFakeNamespace"'; + final kotlinJvmTarget = useDeprecatedJvmTargetStyle + ? '$jvmTargetValue' + : 'JavaVersion.VERSION_$kotlinJvmValue.toString()'; + final kotlinConfig = + ''' + ${commentKotlinOptions ? '//' : ''}kotlinOptions { + ${commentKotlinOptions ? '//' : ''}jvmTarget = $kotlinJvmTarget + ${commentKotlinOptions ? '//' : ''}}'''; + + buildGradle.writeAsStringSync(''' +group = "dev.flutter.plugins.fake" +version = "1.0-SNAPSHOT" + +buildscript { + repositories { + google() + mavenCentral() + } +} + +apply plugin: 'com.android.library' + +${includeLanguageVersion ? javaSection : ''} +android { +${includeNamespace ? namespace : ''} + compileSdk = $compileSdk + + defaultConfig { + minSdk = 30 + } +${warningsConfigured ? warningConfig : ''} + compileOptions { + ${includeSourceCompat ? sourceCompat : ''} + ${includeTargetCompat ? targetCompat : ''} + } + ${includeKotlinOptions ? kotlinConfig : ''} + testOptions { + unitTests { + isIncludeAndroidResources = true + } + } +} + +dependencies { + implementation("fake.package:fake:1.0.0") +} +'''); + } + /// Writes a fake android/build.gradle file for an example [package] with the /// given options. // TODO(stuartmorgan): Once all packages are migrated to Kotlin, remove all @@ -542,7 +639,9 @@ flutter { ); }); - test('fails when build.gradle has no java compatibility version', () async { + test( + 'fails when build.gradle has no java compatibility version - groovy', + () async { final RepositoryPackage package = createFakePlugin( 'a_plugin', packagesDir, @@ -569,6 +668,36 @@ flutter { ); }); + test( + 'fails when build.gradle has no java compatibility version - kotlin', + () async { + final RepositoryPackage package = createFakePlugin( + 'a_plugin', + packagesDir, + examples: [], + ); + writeFakeKotlinPluginBuildGradle(package); + writeFakeManifest(package); + + Error? commandError; + final List output = await runCapturingPrint( + runner, + ['gradle-check'], + errorHandler: (Error e) { + commandError = e; + }, + ); + + expect(commandError, isA()); + expect( + output, + containsAllInOrder([ + contains(kotlinJavaIncompatabilityIndicator), + ]), + ); + }, + ); + test( 'fails when sourceCompatibility is provided with out targetCompatibility', () async { @@ -774,7 +903,7 @@ flutter { test('does not require java version in examples - kotlin', () async { const pluginName = 'a_plugin'; final RepositoryPackage package = createFakePlugin(pluginName, packagesDir); - writeFakeGroovyPluginBuildGradle(package, includeLanguageVersion: true); + writeFakeKotlinPluginBuildGradle(package, includeLanguageVersion: true); writeFakeManifest(package); final RepositoryPackage example = package.getExamples().first; writeFakeKotlinExampleBuildGradles(example, pluginName: pluginName); @@ -888,7 +1017,7 @@ flutter { }, ); - test('fails when namespace is missing', () async { + test('fails when namespace is missing - groovy', () async { final RepositoryPackage package = createFakePlugin( 'a_plugin', packagesDir, @@ -919,6 +1048,37 @@ flutter { ); }); + test('fails when namespace is missing - kotlin', () async { + final RepositoryPackage package = createFakePlugin( + 'a_plugin', + packagesDir, + examples: [], + ); + writeFakeKotlinPluginBuildGradle( + package, + includeLanguageVersion: true, + includeNamespace: false, + ); + writeFakeManifest(package); + + Error? commandError; + final List output = await runCapturingPrint( + runner, + ['gradle-check'], + errorHandler: (Error e) { + commandError = e; + }, + ); + + expect(commandError, isA()); + expect( + output, + containsAllInOrder([ + contains('build.gradle.kts must set a "namespace"'), + ]), + ); + }); + test('fails when namespace is missing from example - groovy', () async { const pluginName = 'a_plugin'; final RepositoryPackage package = createFakePlugin(pluginName, packagesDir); @@ -953,7 +1113,7 @@ flutter { test('fails when namespace is missing from example - kotlin', () async { const pluginName = 'a_plugin'; final RepositoryPackage package = createFakePlugin(pluginName, packagesDir); - writeFakeGroovyPluginBuildGradle(package, includeLanguageVersion: true); + writeFakeKotlinPluginBuildGradle(package, includeLanguageVersion: true); writeFakeManifest(package); final RepositoryPackage example = package.getExamples().first; writeFakeKotlinExampleBuildGradles( From 8b6ee1ebe3c27b9cc0dea85084ad6dff435bcd46 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 13:56:14 -0500 Subject: [PATCH 03/24] More fixes --- .../local_auth_android/android/build.gradle.kts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/local_auth/local_auth_android/android/build.gradle.kts b/packages/local_auth/local_auth_android/android/build.gradle.kts index ce02b5d9357a..b427f936673b 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle.kts +++ b/packages/local_auth/local_auth_android/android/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + group = "io.flutter.plugins.localauth" version = "1.0-SNAPSHOT" @@ -26,6 +28,12 @@ plugins { id("kotlin-android") } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_17.toString()) + } +} + android { namespace = "io.flutter.plugins.localauth" compileSdk = flutter.compileSdkVersion @@ -40,14 +48,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } testOptions { @@ -56,9 +60,7 @@ android { isReturnDefaultValues = true all { it.useJUnitPlatform() - it.outputs.upToDateWhen { false } - it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") showStandardStreams = true From 1c6fbb0cf3ca360a5ddd1818240553b27f073c83 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 13:57:04 -0500 Subject: [PATCH 04/24] Remove Kotlin bits --- .../local_auth_android/android/build.gradle.kts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packages/local_auth/local_auth_android/android/build.gradle.kts b/packages/local_auth/local_auth_android/android/build.gradle.kts index b427f936673b..70fe2204f3ff 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle.kts +++ b/packages/local_auth/local_auth_android/android/build.gradle.kts @@ -1,10 +1,7 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - group = "io.flutter.plugins.localauth" version = "1.0-SNAPSHOT" buildscript { - val kotlinVersion = "2.2.20" repositories { google() mavenCentral() @@ -12,7 +9,6 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } @@ -25,13 +21,6 @@ rootProject.allprojects { plugins { id("com.android.library") - id("kotlin-android") -} - -kotlin { - compilerOptions { - jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_17.toString()) - } } android { From 1d9a09b9e70fe19810e860663358b099597456a9 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Mar 2026 11:46:40 -0500 Subject: [PATCH 05/24] Update test file creation --- script/tool/test/gradle_check_command_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/tool/test/gradle_check_command_test.dart b/script/tool/test/gradle_check_command_test.dart index 8ee651977ce8..9ab207b07601 100644 --- a/script/tool/test/gradle_check_command_test.dart +++ b/script/tool/test/gradle_check_command_test.dart @@ -157,7 +157,7 @@ dependencies { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } '''; From 3a34e124354a39f809435412e3ddb735d186a031 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Mar 2026 12:45:25 -0500 Subject: [PATCH 06/24] Version bump --- packages/local_auth/local_auth_android/CHANGELOG.md | 4 ++++ packages/local_auth/local_auth_android/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/local_auth/local_auth_android/CHANGELOG.md b/packages/local_auth/local_auth_android/CHANGELOG.md index f0c6a100b30d..52793992ce10 100644 --- a/packages/local_auth/local_auth_android/CHANGELOG.md +++ b/packages/local_auth/local_auth_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.6 + +* Updates build files from Groovy to Kotlin. + ## 2.0.5 * Adds platform-specific setup instructions to README. diff --git a/packages/local_auth/local_auth_android/pubspec.yaml b/packages/local_auth/local_auth_android/pubspec.yaml index 627e6ed396fb..a9f3e4c08b43 100644 --- a/packages/local_auth/local_auth_android/pubspec.yaml +++ b/packages/local_auth/local_auth_android/pubspec.yaml @@ -2,7 +2,7 @@ name: local_auth_android description: Android implementation of the local_auth plugin. repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22 -version: 2.0.5 +version: 2.0.6 environment: sdk: ^3.9.0 From 7bfc8ad28c6713818e29fbc1009534fa0c0311a5 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Mar 2026 12:53:54 -0500 Subject: [PATCH 07/24] Undo useJUnitPlatform addition --- packages/local_auth/local_auth_android/android/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/local_auth/local_auth_android/android/build.gradle.kts b/packages/local_auth/local_auth_android/android/build.gradle.kts index 70fe2204f3ff..cc55f268cb73 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle.kts +++ b/packages/local_auth/local_auth_android/android/build.gradle.kts @@ -48,7 +48,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") From bec135d83893e1053fc654e8166ce0925ff894a9 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 09:35:05 -0500 Subject: [PATCH 08/24] Convert all remaining pluign settings.gradle files --- packages/camera/camera_android/android/settings.gradle | 1 - packages/camera/camera_android/android/settings.gradle.kts | 1 + packages/camera/camera_android_camerax/android/settings.gradle | 1 - .../camera/camera_android_camerax/android/settings.gradle.kts | 1 + packages/espresso/android/settings.gradle | 1 - packages/espresso/android/settings.gradle.kts | 1 + .../file_selector/file_selector_android/android/settings.gradle | 1 - .../file_selector_android/android/settings.gradle.kts | 1 + .../flutter_plugin_android_lifecycle/android/settings.gradle | 1 - .../flutter_plugin_android_lifecycle/android/settings.gradle.kts | 1 + .../google_maps_flutter_android/android/settings.gradle | 1 - .../google_maps_flutter_android/android/settings.gradle.kts | 1 + .../google_sign_in_android/android/settings.gradle | 1 - .../google_sign_in_android/android/settings.gradle.kts | 1 + .../image_picker/image_picker_android/android/settings.gradle | 1 - .../image_picker_android/android/settings.gradle.kts | 1 + .../in_app_purchase_android/android/settings.gradle | 1 - .../in_app_purchase_android/android/settings.gradle.kts | 1 + packages/interactive_media_ads/android/settings.gradle | 1 - packages/interactive_media_ads/android/settings.gradle.kts | 1 + .../path_provider/path_provider_android/android/settings.gradle | 1 - .../path_provider_android/android/settings.gradle.kts | 1 + .../alternate_language_test_plugin/android/settings.gradle | 1 - .../alternate_language_test_plugin/android/settings.gradle.kts | 1 + .../pigeon/platform_tests/test_plugin/android/settings.gradle | 1 - .../platform_tests/test_plugin/android/settings.gradle.kts | 1 + .../quick_actions/quick_actions_android/android/settings.gradle | 1 - .../quick_actions_android/android/settings.gradle.kts | 1 + .../shared_preferences_android/android/settings.gradle | 1 - .../shared_preferences_android/android/settings.gradle.kts | 1 + .../url_launcher/url_launcher_android/android/settings.gradle | 1 - .../url_launcher_android/android/settings.gradle.kts | 1 + .../video_player/video_player_android/android/settings.gradle | 1 - .../video_player_android/android/settings.gradle.kts | 1 + .../webview_flutter_android/android/settings.gradle | 1 - .../webview_flutter_android/android/settings.gradle.kts | 1 + 36 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 packages/camera/camera_android/android/settings.gradle create mode 100644 packages/camera/camera_android/android/settings.gradle.kts delete mode 100644 packages/camera/camera_android_camerax/android/settings.gradle create mode 100644 packages/camera/camera_android_camerax/android/settings.gradle.kts delete mode 100644 packages/espresso/android/settings.gradle create mode 100644 packages/espresso/android/settings.gradle.kts delete mode 100644 packages/file_selector/file_selector_android/android/settings.gradle create mode 100644 packages/file_selector/file_selector_android/android/settings.gradle.kts delete mode 100644 packages/flutter_plugin_android_lifecycle/android/settings.gradle create mode 100644 packages/flutter_plugin_android_lifecycle/android/settings.gradle.kts delete mode 100644 packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle create mode 100644 packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle.kts delete mode 100644 packages/google_sign_in/google_sign_in_android/android/settings.gradle create mode 100644 packages/google_sign_in/google_sign_in_android/android/settings.gradle.kts delete mode 100755 packages/image_picker/image_picker_android/android/settings.gradle create mode 100755 packages/image_picker/image_picker_android/android/settings.gradle.kts delete mode 100644 packages/in_app_purchase/in_app_purchase_android/android/settings.gradle create mode 100644 packages/in_app_purchase/in_app_purchase_android/android/settings.gradle.kts delete mode 100644 packages/interactive_media_ads/android/settings.gradle create mode 100644 packages/interactive_media_ads/android/settings.gradle.kts delete mode 100644 packages/path_provider/path_provider_android/android/settings.gradle create mode 100644 packages/path_provider/path_provider_android/android/settings.gradle.kts delete mode 100644 packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle create mode 100644 packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle.kts delete mode 100644 packages/pigeon/platform_tests/test_plugin/android/settings.gradle create mode 100644 packages/pigeon/platform_tests/test_plugin/android/settings.gradle.kts delete mode 100644 packages/quick_actions/quick_actions_android/android/settings.gradle create mode 100644 packages/quick_actions/quick_actions_android/android/settings.gradle.kts delete mode 100644 packages/shared_preferences/shared_preferences_android/android/settings.gradle create mode 100644 packages/shared_preferences/shared_preferences_android/android/settings.gradle.kts delete mode 100644 packages/url_launcher/url_launcher_android/android/settings.gradle create mode 100644 packages/url_launcher/url_launcher_android/android/settings.gradle.kts delete mode 100644 packages/video_player/video_player_android/android/settings.gradle create mode 100644 packages/video_player/video_player_android/android/settings.gradle.kts delete mode 100644 packages/webview_flutter/webview_flutter_android/android/settings.gradle create mode 100644 packages/webview_flutter/webview_flutter_android/android/settings.gradle.kts diff --git a/packages/camera/camera_android/android/settings.gradle b/packages/camera/camera_android/android/settings.gradle deleted file mode 100644 index 94a1bae9d6cd..000000000000 --- a/packages/camera/camera_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'camera_android' diff --git a/packages/camera/camera_android/android/settings.gradle.kts b/packages/camera/camera_android/android/settings.gradle.kts new file mode 100644 index 000000000000..0006625daf4e --- /dev/null +++ b/packages/camera/camera_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "camera_android" diff --git a/packages/camera/camera_android_camerax/android/settings.gradle b/packages/camera/camera_android_camerax/android/settings.gradle deleted file mode 100644 index 613f994165a0..000000000000 --- a/packages/camera/camera_android_camerax/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'camera_android_camerax' diff --git a/packages/camera/camera_android_camerax/android/settings.gradle.kts b/packages/camera/camera_android_camerax/android/settings.gradle.kts new file mode 100644 index 000000000000..9d4ef5bade6a --- /dev/null +++ b/packages/camera/camera_android_camerax/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "camera_android_camerax" diff --git a/packages/espresso/android/settings.gradle b/packages/espresso/android/settings.gradle deleted file mode 100644 index 46643c1c5e02..000000000000 --- a/packages/espresso/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'espresso' diff --git a/packages/espresso/android/settings.gradle.kts b/packages/espresso/android/settings.gradle.kts new file mode 100644 index 000000000000..ecf97c03a52c --- /dev/null +++ b/packages/espresso/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "espresso" diff --git a/packages/file_selector/file_selector_android/android/settings.gradle b/packages/file_selector/file_selector_android/android/settings.gradle deleted file mode 100644 index 679b28be66a4..000000000000 --- a/packages/file_selector/file_selector_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'file_selector_android' diff --git a/packages/file_selector/file_selector_android/android/settings.gradle.kts b/packages/file_selector/file_selector_android/android/settings.gradle.kts new file mode 100644 index 000000000000..49fb054f3458 --- /dev/null +++ b/packages/file_selector/file_selector_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "file_selector_android" diff --git a/packages/flutter_plugin_android_lifecycle/android/settings.gradle b/packages/flutter_plugin_android_lifecycle/android/settings.gradle deleted file mode 100644 index 70836e6e7200..000000000000 --- a/packages/flutter_plugin_android_lifecycle/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'flutter_plugin_android_lifecycle' diff --git a/packages/flutter_plugin_android_lifecycle/android/settings.gradle.kts b/packages/flutter_plugin_android_lifecycle/android/settings.gradle.kts new file mode 100644 index 000000000000..5c21302de099 --- /dev/null +++ b/packages/flutter_plugin_android_lifecycle/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "flutter_plugin_android_lifecycle" diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle deleted file mode 100644 index d873c7abe92c..000000000000 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'google_maps_flutter_android' diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle.kts b/packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle.kts new file mode 100644 index 000000000000..8a4acb4d1530 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "google_maps_flutter_android" diff --git a/packages/google_sign_in/google_sign_in_android/android/settings.gradle b/packages/google_sign_in/google_sign_in_android/android/settings.gradle deleted file mode 100644 index 35ebd0e2428a..000000000000 --- a/packages/google_sign_in/google_sign_in_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'google_sign_in_android' diff --git a/packages/google_sign_in/google_sign_in_android/android/settings.gradle.kts b/packages/google_sign_in/google_sign_in_android/android/settings.gradle.kts new file mode 100644 index 000000000000..88f95d9cc61f --- /dev/null +++ b/packages/google_sign_in/google_sign_in_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "google_sign_in_android" diff --git a/packages/image_picker/image_picker_android/android/settings.gradle b/packages/image_picker/image_picker_android/android/settings.gradle deleted file mode 100755 index 3c673efcd542..000000000000 --- a/packages/image_picker/image_picker_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'image_picker_android' diff --git a/packages/image_picker/image_picker_android/android/settings.gradle.kts b/packages/image_picker/image_picker_android/android/settings.gradle.kts new file mode 100755 index 000000000000..efd9fe9f7500 --- /dev/null +++ b/packages/image_picker/image_picker_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "image_picker_android" diff --git a/packages/in_app_purchase/in_app_purchase_android/android/settings.gradle b/packages/in_app_purchase/in_app_purchase_android/android/settings.gradle deleted file mode 100644 index 58efd2e9323e..000000000000 --- a/packages/in_app_purchase/in_app_purchase_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'in_app_purchase' diff --git a/packages/in_app_purchase/in_app_purchase_android/android/settings.gradle.kts b/packages/in_app_purchase/in_app_purchase_android/android/settings.gradle.kts new file mode 100644 index 000000000000..9d77dc602791 --- /dev/null +++ b/packages/in_app_purchase/in_app_purchase_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "in_app_purchase" diff --git a/packages/interactive_media_ads/android/settings.gradle b/packages/interactive_media_ads/android/settings.gradle deleted file mode 100644 index 388e84d5a359..000000000000 --- a/packages/interactive_media_ads/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'interactive_media_ads' diff --git a/packages/interactive_media_ads/android/settings.gradle.kts b/packages/interactive_media_ads/android/settings.gradle.kts new file mode 100644 index 000000000000..3e483db7158d --- /dev/null +++ b/packages/interactive_media_ads/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "interactive_media_ads" diff --git a/packages/path_provider/path_provider_android/android/settings.gradle b/packages/path_provider/path_provider_android/android/settings.gradle deleted file mode 100644 index 359a57ff9540..000000000000 --- a/packages/path_provider/path_provider_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'path_provider_android' diff --git a/packages/path_provider/path_provider_android/android/settings.gradle.kts b/packages/path_provider/path_provider_android/android/settings.gradle.kts new file mode 100644 index 000000000000..4fc5bb16d8aa --- /dev/null +++ b/packages/path_provider/path_provider_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "path_provider_android" diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle deleted file mode 100644 index 0f10659c4e4e..000000000000 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'alternate_language_test_plugin' diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle.kts b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle.kts new file mode 100644 index 000000000000..e6c1cb2b5f2e --- /dev/null +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "alternate_language_test_plugin" diff --git a/packages/pigeon/platform_tests/test_plugin/android/settings.gradle b/packages/pigeon/platform_tests/test_plugin/android/settings.gradle deleted file mode 100644 index e9328f28412e..000000000000 --- a/packages/pigeon/platform_tests/test_plugin/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'test_plugin' diff --git a/packages/pigeon/platform_tests/test_plugin/android/settings.gradle.kts b/packages/pigeon/platform_tests/test_plugin/android/settings.gradle.kts new file mode 100644 index 000000000000..2e32f8d43572 --- /dev/null +++ b/packages/pigeon/platform_tests/test_plugin/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "test_plugin" diff --git a/packages/quick_actions/quick_actions_android/android/settings.gradle b/packages/quick_actions/quick_actions_android/android/settings.gradle deleted file mode 100644 index 75248241ec35..000000000000 --- a/packages/quick_actions/quick_actions_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'quick_actions' diff --git a/packages/quick_actions/quick_actions_android/android/settings.gradle.kts b/packages/quick_actions/quick_actions_android/android/settings.gradle.kts new file mode 100644 index 000000000000..300d89d29631 --- /dev/null +++ b/packages/quick_actions/quick_actions_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "quick_actions" diff --git a/packages/shared_preferences/shared_preferences_android/android/settings.gradle b/packages/shared_preferences/shared_preferences_android/android/settings.gradle deleted file mode 100644 index 033d5be261a7..000000000000 --- a/packages/shared_preferences/shared_preferences_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'shared_preferences_android' diff --git a/packages/shared_preferences/shared_preferences_android/android/settings.gradle.kts b/packages/shared_preferences/shared_preferences_android/android/settings.gradle.kts new file mode 100644 index 000000000000..e526d4c93d44 --- /dev/null +++ b/packages/shared_preferences/shared_preferences_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "shared_preferences_android" diff --git a/packages/url_launcher/url_launcher_android/android/settings.gradle b/packages/url_launcher/url_launcher_android/android/settings.gradle deleted file mode 100644 index d8b7cc47172c..000000000000 --- a/packages/url_launcher/url_launcher_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'url_launcher_android' diff --git a/packages/url_launcher/url_launcher_android/android/settings.gradle.kts b/packages/url_launcher/url_launcher_android/android/settings.gradle.kts new file mode 100644 index 000000000000..22c54c2e0d72 --- /dev/null +++ b/packages/url_launcher/url_launcher_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "url_launcher_android" diff --git a/packages/video_player/video_player_android/android/settings.gradle b/packages/video_player/video_player_android/android/settings.gradle deleted file mode 100644 index 00681714f7d8..000000000000 --- a/packages/video_player/video_player_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'video_player_android' diff --git a/packages/video_player/video_player_android/android/settings.gradle.kts b/packages/video_player/video_player_android/android/settings.gradle.kts new file mode 100644 index 000000000000..e3289a056828 --- /dev/null +++ b/packages/video_player/video_player_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "video_player_android" diff --git a/packages/webview_flutter/webview_flutter_android/android/settings.gradle b/packages/webview_flutter/webview_flutter_android/android/settings.gradle deleted file mode 100644 index 5be7a4b4c692..000000000000 --- a/packages/webview_flutter/webview_flutter_android/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'webview_flutter' diff --git a/packages/webview_flutter/webview_flutter_android/android/settings.gradle.kts b/packages/webview_flutter/webview_flutter_android/android/settings.gradle.kts new file mode 100644 index 000000000000..009a3e185c9a --- /dev/null +++ b/packages/webview_flutter/webview_flutter_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "webview_flutter" From a9c8061960f1dd1ad1ffab7221722e5961d75571 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 09:54:23 -0500 Subject: [PATCH 09/24] Simple bulk transformations --- .../camera_android/android/build.gradle | 14 ++++++----- .../android/build.gradle | 16 ++++++------ packages/espresso/android/build.gradle | 25 ++++++++++--------- .../android/build.gradle | 14 ++++++----- .../android/build.gradle | 16 ++++++------ .../android/build.gradle | 14 ++++++----- .../android/build.gradle | 20 ++++++++------- .../image_picker_android/android/build.gradle | 14 ++++++----- .../android/build.gradle | 12 +++++---- .../android/build.gradle | 22 ++++++++-------- .../android/build.gradle | 14 ++++++----- .../android/build.gradle | 14 ++++++----- .../test_plugin/android/build.gradle | 20 ++++++++------- .../android/build.gradle | 14 ++++++----- .../android/build.gradle | 20 ++++++++------- .../url_launcher_android/android/build.gradle | 15 +++++------ .../video_player_android/android/build.gradle | 20 ++++++++------- .../android/build.gradle | 18 +++++++------ 18 files changed, 168 insertions(+), 134 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 609ffa80fcbb..a5fab718f2c1 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.camera' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.camera" +version = "1.0-SNAPSHOT" def args = ["-Xlint:deprecation","-Xlint:unchecked"] buildscript { @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -24,7 +24,9 @@ project.getTasks().withType(JavaCompile){ options.compilerArgs.addAll(args) } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { buildFeatures { @@ -34,13 +36,13 @@ buildFeatures { compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 8d7553028e1b..ed8ba624e93d 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -1,15 +1,15 @@ -group = 'io.flutter.plugins.camerax' -version = '1.0' +group = "io.flutter.plugins.camerax" +version = "1.0" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath "com.android.tools.build:gradle:8.13.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,8 +21,10 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "io.flutter.plugins.camerax" @@ -65,7 +67,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'GradleDependency', 'InvalidPackage', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "GradleDependency", "InvalidPackage", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } } diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle index d545cfc1b277..77c27a261503 100644 --- a/packages/espresso/android/build.gradle +++ b/packages/espresso/android/build.gradle @@ -1,5 +1,5 @@ -group = 'com.example.espresso' -version = '1.0' +group = "com.example.espresso" +version = "1.0" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,14 +19,16 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "com.example.espresso" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -38,11 +40,10 @@ android { lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline file("lint-baseline.xml") } - testOptions { unitTests.includeAndroidResources = true unitTests.returnDefaultValues = true @@ -57,10 +58,10 @@ android { } dependencies { - implementation 'com.google.guava:guava:33.5.0-android' - implementation 'com.squareup.okhttp3:okhttp:5.3.2' - implementation 'com.google.code.gson:gson:2.13.2' - androidTestImplementation 'org.hamcrest:hamcrest:3.0' + implementation("com.google.guava:guava:33.5.0-android") + implementation("com.squareup.okhttp3:okhttp:5.3.2") + implementation("com.google.code.gson:gson:2.13.2") + androidTestImplementation("org.hamcrest:hamcrest:3.0") testImplementation("junit:junit:4.13.2") testImplementation("com.google.truth:truth:1.4.5") @@ -88,7 +89,7 @@ dependencies { // The following Espresso dependency can be either "implementation" // or "androidTestImplementation", depending on whether you want the - // dependency to appear on your APK's compile classpath or the test APK + // dependency to appear on your APK"s compile classpath or the test APK // classpath. api("androidx.test.espresso:espresso-idling-resource:3.7.0") } diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle index aaae0b684ceb..34a8c7364dbb 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle +++ b/packages/file_selector/file_selector_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'dev.flutter.packages.file_selector_android' -version = '1.0' +group = "dev.flutter.packages.file_selector_android" +version = "1.0" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,7 +19,9 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "dev.flutter.packages.file_selector_android" @@ -31,7 +33,7 @@ android { } defaultConfig { - minSdkVersion 24 + minSdk = 24 } dependencies { @@ -45,7 +47,7 @@ android { lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } testOptions { diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index 1868b38dafe3..9a84b0b217c9 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.flutter_plugin_android_lifecycle' -version = '1.0' +group = "io.flutter.plugins.flutter_plugin_android_lifecycle" +version = "1.0" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,16 +19,18 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "io.flutter.plugins.flutter_plugin_android_lifecycle" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'proguard.txt' + consumerProguardFiles "proguard.txt" } compileOptions { @@ -39,7 +41,7 @@ android { lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } dependencies { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index 46b92902aeed..b633fd24b6a9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.googlemaps' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.googlemaps" +version = "1.0-SNAPSHOT" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,20 +19,22 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "io.flutter.plugins.googlemaps" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } dependencies { diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 1c87580418ee..804f274e26e0 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -1,15 +1,15 @@ -group = 'io.flutter.plugins.googlesignin' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.googlesignin" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,15 +21,17 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "io.flutter.plugins.googlesignin" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -43,13 +45,13 @@ android { } sourceSets { - main.java.srcDirs += 'src/main/kotlin' + main.java.srcDirs += "src/main/kotlin" } lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index 6e1aa71e2d64..6fd542b4dc02 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.imagepicker' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.imagepicker" +version = "1.0-SNAPSHOT" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,20 +19,22 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "io.flutter.plugins.imagepicker" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } dependencies { implementation("androidx.core:core:1.17.0") diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index efe9bb1ae4d9..2e7e504037c0 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.inapppurchase' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.inapppurchase" +version = "1.0-SNAPSHOT" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,7 +19,9 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { buildFeatures { @@ -37,7 +39,7 @@ android { lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle index acf02e97af25..a1d45e042f89 100644 --- a/packages/interactive_media_ads/android/build.gradle +++ b/packages/interactive_media_ads/android/build.gradle @@ -1,15 +1,15 @@ -group = 'dev.flutter.packages.interactive_media_ads' -version = '1.0-SNAPSHOT' +group = "dev.flutter.packages.interactive_media_ads" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,8 +21,10 @@ allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "dev.flutter.packages.interactive_media_ads" @@ -39,12 +41,12 @@ android { } sourceSets { - main.java.srcDirs += 'src/main/kotlin' - test.java.srcDirs += 'src/test/kotlin' + main.java.srcDirs += "src/main/kotlin" + test.java.srcDirs += "src/test/kotlin" } defaultConfig { - minSdkVersion 24 + minSdk = 24 } dependencies { @@ -61,7 +63,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index 163ca2de6e0f..aa7ad9c33565 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.pathprovider' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.pathprovider" +version = "1.0-SNAPSHOT" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,20 +19,22 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "io.flutter.plugins.pathprovider" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle index 181ac05f5ca3..7e7d83773075 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle @@ -1,5 +1,5 @@ -group = 'com.example.alternate_language_test_plugin' -version = '1.0' +group = "com.example.alternate_language_test_plugin" +version = "1.0" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,7 +19,9 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "com.example.alternate_language_test_plugin" @@ -31,7 +33,7 @@ android { } defaultConfig { - minSdkVersion 24 + minSdk = 24 } testOptions { @@ -49,7 +51,7 @@ android { lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } dependencies { diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 5f0b03c47864..ac224559eae1 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -1,15 +1,15 @@ -group = 'com.example.test_plugin' -version = '1.0-SNAPSHOT' +group = "com.example.test_plugin" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,8 +21,10 @@ allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "com.example.test_plugin" @@ -39,11 +41,11 @@ android { } sourceSets { - main.java.srcDirs += 'src/main/kotlin' + main.java.srcDirs += "src/main/kotlin" } defaultConfig { - minSdkVersion 24 + minSdk = 24 } testOptions { @@ -61,7 +63,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index 5895a7336317..452e71f6f1c3 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.quickactions' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.quickactions" +version = "1.0-SNAPSHOT" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,20 +19,22 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { namespace = "io.flutter.plugins.quickactions" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } dependencies { diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index c855fe40328e..7663426cf328 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -1,15 +1,15 @@ -group = 'io.flutter.plugins.sharedpreferences' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.sharedpreferences" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -29,8 +29,10 @@ allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "io.flutter.plugins.sharedpreferences" @@ -46,17 +48,17 @@ android { } sourceSets { - main.java.srcDirs += 'src/main/kotlin' + main.java.srcDirs += "src/main/kotlin" } defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } dependencies { diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index 3d3470587705..c2242dce67c7 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -1,5 +1,5 @@ -group = 'io.flutter.plugins.urllauncher' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.urllauncher" +version = "1.0-SNAPSHOT" buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") } } @@ -19,7 +19,9 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' +plugins { + id("com.android.library") +} android { buildFeatures { @@ -29,7 +31,7 @@ android { compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -41,7 +43,7 @@ android { lintOptions { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" } @@ -59,7 +61,6 @@ android { } dependencies { - // Java language implementation implementation("androidx.core:core:1.17.0") implementation("androidx.annotation:annotation:1.9.1") diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 173cb32a30d7..1635229c2d74 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -1,15 +1,15 @@ -group = 'io.flutter.plugins.videoplayer' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.videoplayer" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,21 +21,23 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "io.flutter.plugins.videoplayer" compileSdk = flutter.compileSdkVersion defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } compileOptions { @@ -47,7 +49,7 @@ android { } sourceSets { - main.java.srcDirs += 'src/main/kotlin' + main.java.srcDirs += "src/main/kotlin" } dependencies { diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index fb026cb7a778..11a2e5c6ccf3 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -1,15 +1,15 @@ -group = 'io.flutter.plugins.webviewflutter' -version = '1.0-SNAPSHOT' +group = "io.flutter.plugins.webviewflutter" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '2.3.0' + ext.kotlin_version = "2.3.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.1' + classpath("com.android.tools.build:gradle:8.13.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,8 +21,10 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id("com.android.library") + id("kotlin-android") +} android { namespace = "io.flutter.plugins.webviewflutter" @@ -38,14 +40,14 @@ android { } defaultConfig { - minSdkVersion 24 + minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lint { checkAllWarnings = true warningsAsErrors = true - disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' + disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" baseline = file("lint-baseline.xml") } From 41622f2e999451dcace27beb17db4282750fed2d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 09:58:58 -0500 Subject: [PATCH 10/24] Update lint options --- packages/camera/camera_android/android/build.gradle | 4 ++-- packages/camera/camera_android_camerax/android/build.gradle | 2 +- packages/espresso/android/build.gradle | 4 ++-- .../file_selector/file_selector_android/android/build.gradle | 4 ++-- .../flutter_plugin_android_lifecycle/android/build.gradle | 4 ++-- .../google_maps_flutter_android/android/build.gradle | 4 ++-- .../google_sign_in_android/android/build.gradle | 2 +- .../image_picker/image_picker_android/android/build.gradle | 4 ++-- .../in_app_purchase_android/android/build.gradle | 4 ++-- packages/interactive_media_ads/android/build.gradle | 2 +- .../path_provider/path_provider_android/android/build.gradle | 4 ++-- .../alternate_language_test_plugin/android/build.gradle | 4 ++-- .../pigeon/platform_tests/test_plugin/android/build.gradle | 2 +- .../quick_actions/quick_actions_android/android/build.gradle | 4 ++-- .../shared_preferences_android/android/build.gradle | 2 +- .../url_launcher/url_launcher_android/android/build.gradle | 4 ++-- .../video_player/video_player_android/android/build.gradle | 2 +- .../webview_flutter_android/android/build.gradle | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index a5fab718f2c1..5e859cb4df6e 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -39,10 +39,10 @@ buildFeatures { minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index ed8ba624e93d..aeea42939658 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -67,7 +67,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "GradleDependency", "InvalidPackage", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "GradleDependency" + "InvalidPackage" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } } diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle index 77c27a261503..8f25c2116f41 100644 --- a/packages/espresso/android/build.gradle +++ b/packages/espresso/android/build.gradle @@ -37,10 +37,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline file("lint-baseline.xml") } diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle index 34a8c7364dbb..ccec9aa37933 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle +++ b/packages/file_selector/file_selector_android/android/build.gradle @@ -44,10 +44,10 @@ android { testImplementation("org.robolectric:robolectric:4.16") } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } testOptions { diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index 9a84b0b217c9..d753e415e4c1 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -38,10 +38,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } dependencies { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index b633fd24b6a9..2498b15b9b88 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -31,10 +31,10 @@ android { minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } dependencies { diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 804f274e26e0..b2dabd6955ce 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -51,7 +51,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index 6fd542b4dc02..323f26be1ba0 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -31,10 +31,10 @@ android { minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } dependencies { implementation("androidx.core:core:1.17.0") diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index 2e7e504037c0..9c4522b1a034 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -36,10 +36,10 @@ android { minSdk = 21 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle index a1d45e042f89..22a85d710dca 100644 --- a/packages/interactive_media_ads/android/build.gradle +++ b/packages/interactive_media_ads/android/build.gradle @@ -63,7 +63,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index aa7ad9c33565..b6da003c681f 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -31,10 +31,10 @@ android { minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle index 7e7d83773075..559a4f01b872 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle @@ -48,10 +48,10 @@ android { } } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } dependencies { diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index ac224559eae1..84c1a4aa827e 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -63,7 +63,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index 452e71f6f1c3..f826d44ab734 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -31,10 +31,10 @@ android { minSdk = 24 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } dependencies { diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 7663426cf328..06c85e2565ed 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -58,7 +58,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } dependencies { diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index c2242dce67c7..66ceb5f6e9db 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -40,10 +40,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - lintOptions { + lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 1635229c2d74..2ab94367a7ba 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -37,7 +37,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } compileOptions { diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 11a2e5c6ccf3..725799a83db4 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -47,7 +47,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable "AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable" + disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } From c6a8cb2cd8793e039c4d862b769317b576f5c43d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:33:49 -0500 Subject: [PATCH 11/24] Standardize testOptions --- .../camera_android/android/build.gradle | 27 ++++++++++--------- .../android/build.gradle | 27 ++++++++++--------- packages/espresso/android/build.gradle | 17 +++++++----- .../android/build.gradle | 17 +++++++----- .../android/build.gradle | 17 +++++++----- .../android/build.gradle | 27 ++++++++++--------- .../android/build.gradle | 17 +++++++----- .../image_picker_android/android/build.gradle | 17 +++++++----- .../android/build.gradle | 17 +++++++----- .../android/build.gradle | 18 +++++++------ .../android/build.gradle | 17 +++++++----- .../android/build.gradle | 17 +++++++----- .../test_plugin/android/build.gradle | 17 +++++++----- .../android/build.gradle | 17 +++++++----- .../android/build.gradle | 17 +++++++----- .../url_launcher_android/android/build.gradle | 17 +++++++----- .../video_player_android/android/build.gradle | 27 ++++++++++--------- .../android/build.gradle | 17 +++++++----- 18 files changed, 200 insertions(+), 147 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 5e859cb4df6e..3d7920fc472f 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -50,18 +50,21 @@ buildFeatures { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - // The org.gradle.jvmargs property that may be set in gradle.properties does not impact - // the Java heap size when running the Android unit tests. The following property here - // sets the heap size to a size large enough to run the robolectric tests across - // multiple SDK levels. - jvmArgs "-Xmx4G" - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } + // The org.gradle.jvmargs property that may be set in gradle.properties does not impact + // the Java heap size when running the Android unit tests. The following property here + // sets the heap size to a size large enough to run the robolectric tests across + // multiple SDK levels. + it.jvmArgs("-Xmx4G") } } } diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index aeea42939658..2687941056dd 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -48,18 +48,21 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - // The org.gradle.jvmargs property that may be set in gradle.properties does not impact - // the Java heap size when running the Android unit tests. The following property here - // sets the heap size to a size large enough to run the robolectric tests across - // multiple SDK levels. - jvmArgs "-Xmx1G" - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } + // The org.gradle.jvmargs property that may be set in gradle.properties does not impact + // the Java heap size when running the Android unit tests. The following property here + // sets the heap size to a size large enough to run the robolectric tests across + // multiple SDK levels. + it.jvmArgs("-Xmx1G") } } } diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle index 8f25c2116f41..232197c3f787 100644 --- a/packages/espresso/android/build.gradle +++ b/packages/espresso/android/build.gradle @@ -45,13 +45,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle index ccec9aa37933..c4367f4710f4 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle +++ b/packages/file_selector/file_selector_android/android/build.gradle @@ -51,13 +51,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index d753e415e4c1..2b6cfb821f50 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -50,13 +50,16 @@ android { testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index 2498b15b9b88..9da44f962d3e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -56,19 +56,22 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } + // The org.gradle.jvmargs property that may be set in gradle.properties does not impact + // the Java heap size when running the Android unit tests. The following property here + // sets the heap size to a size large enough to run the robolectric tests across + // multiple SDK levels. + it.jvmArgs("-Xmx4G") } - // The org.gradle.jvmargs property that may be set in gradle.properties does not impact - // the Java heap size when running the Android unit tests. The following property here - // sets the heap size to a size large enough to run the robolectric tests across - // multiple SDK levels. - jvmArgs "-Xmx4G" } } } diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index b2dabd6955ce..3dca23901206 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -57,13 +57,16 @@ android { testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index 323f26be1ba0..b10eba0dbd1f 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -54,13 +54,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index 9c4522b1a034..e2b54e769f8f 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -48,13 +48,16 @@ android { testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle index 22a85d710dca..6b11379b8943 100644 --- a/packages/interactive_media_ads/android/build.gradle +++ b/packages/interactive_media_ads/android/build.gradle @@ -68,14 +68,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - useJUnitPlatform() - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index b6da003c681f..bacb7fce9757 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -43,13 +43,16 @@ android { testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle index 559a4f01b872..d22d7df6a11d 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle @@ -37,13 +37,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 84c1a4aa827e..79851fe4609a 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -49,13 +49,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index f826d44ab734..7ea7eda0b86c 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -49,13 +49,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 06c85e2565ed..ff177431102d 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -75,13 +75,16 @@ android { testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index 66ceb5f6e9db..8174b8be34f6 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -48,13 +48,16 @@ android { testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 2ab94367a7ba..c4d62f6f09b4 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -67,18 +67,21 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - // The org.gradle.jvmargs property that may be set in gradle.properties does not impact - // the Java heap size when running the Android unit tests. The following property here - // sets the heap size to a size large enough to run the robolectric tests across - // multiple SDK levels. - jvmArgs "-Xmx4G" - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } + // The org.gradle.jvmargs property that may be set in gradle.properties does not impact + // the Java heap size when running the Android unit tests. The following property here + // sets the heap size to a size large enough to run the robolectric tests across + // multiple SDK levels. + it.jvmArgs("-Xmx4G") } } } diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 725799a83db4..021a477ea46f 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -61,13 +61,16 @@ android { } testOptions { - unitTests.includeAndroidResources = true - unitTests.returnDefaultValues = true - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { + it.useJUnitPlatform() + it.outputs.upToDateWhen { false } + it.testLogging { + events("passed", "skipped", "failed", "standardOut", "standardError") + showStandardStreams = true + } } } } From 11e903c5249e7c180c5a0dbd6130744e544c8a2e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:37:39 -0500 Subject: [PATCH 12/24] Config adjustment --- packages/camera/camera_android/android/build.gradle | 6 ++++-- packages/camera/camera_android_camerax/android/build.gradle | 2 +- packages/espresso/android/build.gradle | 2 +- .../flutter_plugin_android_lifecycle/android/build.gradle | 4 ++-- .../google_maps_flutter_android/android/build.gradle | 3 ++- .../google_sign_in_android/android/build.gradle | 2 +- .../image_picker/image_picker_android/android/build.gradle | 4 +++- .../in_app_purchase_android/android/build.gradle | 4 +++- .../path_provider_android/android/build.gradle | 2 +- .../quick_actions_android/android/build.gradle | 3 ++- .../shared_preferences_android/android/build.gradle | 4 +++- .../url_launcher/url_launcher_android/android/build.gradle | 2 +- .../video_player/video_player_android/android/build.gradle | 2 +- .../webview_flutter_android/android/build.gradle | 2 +- 14 files changed, 26 insertions(+), 16 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 3d7920fc472f..93a8d7b8826f 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -29,7 +29,7 @@ plugins { } android { -buildFeatures { + buildFeatures { buildConfig = true } namespace = "io.flutter.plugins.camera" @@ -37,13 +37,15 @@ buildFeatures { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 2687941056dd..74ea3eba502c 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -44,7 +44,7 @@ android { defaultConfig { // CameraX APIs require API 23 or later. minSdk = 23 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } testOptions { diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle index 232197c3f787..445c8ead0b7b 100644 --- a/packages/espresso/android/build.gradle +++ b/packages/espresso/android/build.gradle @@ -29,7 +29,7 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index 2b6cfb821f50..117051b07074 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "proguard.txt" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("proguard.txt") } compileOptions { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index 9da44f962d3e..0168139b7eba 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -29,8 +29,9 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 3dca23901206..c070125469e3 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -32,7 +32,7 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index b10eba0dbd1f..4dbf320ebc0d 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -29,13 +29,15 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } + dependencies { implementation("androidx.core:core:1.17.0") implementation("androidx.annotation:annotation:1.9.1") diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index e2b54e769f8f..451a68750cf3 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -34,13 +34,15 @@ android { defaultConfig { minSdk = 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index bacb7fce9757..107542d98cf3 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -29,7 +29,7 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } lint { checkAllWarnings = true diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index 7ea7eda0b86c..f021bd407938 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -29,8 +29,9 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index ff177431102d..5370ddecfcd3 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -53,14 +53,16 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } + dependencies { implementation("androidx.datastore:datastore:1.1.7") implementation("androidx.datastore:datastore-preferences:1.1.7") diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index 8174b8be34f6..daf842922a5b 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -32,7 +32,7 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index c4d62f6f09b4..945f9799ea77 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -32,7 +32,7 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } lint { checkAllWarnings = true diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 021a477ea46f..f8c897fe07e3 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -41,7 +41,7 @@ android { defaultConfig { minSdk = 24 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } lint { From 5b0c67a7046081febaf5372a6c78a6873f0e4aa6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:39:38 -0500 Subject: [PATCH 13/24] Kotlin version syntax update --- packages/camera/camera_android_camerax/android/build.gradle | 4 ++-- .../google_sign_in_android/android/build.gradle | 4 ++-- packages/interactive_media_ads/android/build.gradle | 4 ++-- .../pigeon/platform_tests/test_plugin/android/build.gradle | 4 ++-- .../shared_preferences_android/android/build.gradle | 4 ++-- .../video_player/video_player_android/android/build.gradle | 4 ++-- .../webview_flutter_android/android/build.gradle | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 74ea3eba502c..961ed5d6aa90 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -2,7 +2,7 @@ group = "io.flutter.plugins.camerax" version = "1.0" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.13.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index c070125469e3..8b2089e3f570 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -2,7 +2,7 @@ group = "io.flutter.plugins.googlesignin" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle index 6b11379b8943..0b929054219b 100644 --- a/packages/interactive_media_ads/android/build.gradle +++ b/packages/interactive_media_ads/android/build.gradle @@ -2,7 +2,7 @@ group = "dev.flutter.packages.interactive_media_ads" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 79851fe4609a..85ef1be9d089 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -2,7 +2,7 @@ group = "com.example.test_plugin" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 5370ddecfcd3..0190634c2034 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -2,7 +2,7 @@ group = "io.flutter.plugins.sharedpreferences" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 945f9799ea77..59950e9980af 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -2,7 +2,7 @@ group = "io.flutter.plugins.videoplayer" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index f8c897fe07e3..141725f6070c 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -2,7 +2,7 @@ group = "io.flutter.plugins.webviewflutter" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.3.0" + val kotlinVersion = "2.3.0" repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } From 895f10492705fc83a0fd6931fbdb0d950a38f1f2 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:42:58 -0500 Subject: [PATCH 14/24] Remove rootProject --- packages/camera/camera_android/android/build.gradle | 2 +- packages/camera/camera_android_camerax/android/build.gradle | 2 +- packages/espresso/android/build.gradle | 2 +- .../file_selector/file_selector_android/android/build.gradle | 2 +- packages/flutter_plugin_android_lifecycle/android/build.gradle | 2 +- .../google_maps_flutter_android/android/build.gradle | 2 +- .../google_sign_in/google_sign_in_android/android/build.gradle | 2 +- packages/image_picker/image_picker_android/android/build.gradle | 2 +- .../in_app_purchase_android/android/build.gradle | 2 +- packages/local_auth/local_auth_android/android/build.gradle.kts | 2 +- .../path_provider/path_provider_android/android/build.gradle | 2 +- .../alternate_language_test_plugin/android/build.gradle | 2 +- .../quick_actions/quick_actions_android/android/build.gradle | 2 +- .../shared_preferences_android/android/build.gradle | 2 +- packages/url_launcher/url_launcher_android/android/build.gradle | 2 +- packages/video_player/video_player_android/android/build.gradle | 2 +- .../webview_flutter_android/android/build.gradle | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 93a8d7b8826f..def0bb148af5 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -13,7 +13,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 961ed5d6aa90..b72b05c29c28 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle index 445c8ead0b7b..ac018d53beee 100644 --- a/packages/espresso/android/build.gradle +++ b/packages/espresso/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle index c4367f4710f4..a66ffeb3b15d 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle +++ b/packages/file_selector/file_selector_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index 117051b07074..8fea9e60c4fb 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index 0168139b7eba..18870984f756 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 8b2089e3f570..4aa58951fe53 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index 4dbf320ebc0d..b6be6e2ff7d4 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index 451a68750cf3..79b9695ff4af 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/local_auth/local_auth_android/android/build.gradle.kts b/packages/local_auth/local_auth_android/android/build.gradle.kts index cc55f268cb73..a54735652be3 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle.kts +++ b/packages/local_auth/local_auth_android/android/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index 107542d98cf3..8c4fe0a3fb73 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle index d22d7df6a11d..fb39508a1743 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index f021bd407938..1005d0f603bb 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 0190634c2034..5edde3454a65 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index daf842922a5b..1f0404b56623 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 59950e9980af..faf9d181f5ff 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 141725f6070c..92d496491c49 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() From f5dadd744bafc2bdf357a3866cf5a9fe809c8849 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:47:18 -0500 Subject: [PATCH 15/24] Consistent whitespace --- packages/flutter_plugin_android_lifecycle/android/build.gradle | 1 - .../google_sign_in/google_sign_in_android/android/build.gradle | 1 - .../in_app_purchase_android/android/build.gradle | 1 - .../path_provider/path_provider_android/android/build.gradle | 3 ++- .../shared_preferences_android/android/build.gradle | 1 - .../url_launcher/url_launcher_android/android/build.gradle | 2 +- .../video_player/video_player_android/android/build.gradle | 3 +++ 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index 8fea9e60c4fb..23810eba295e 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -48,7 +48,6 @@ android { implementation("androidx.annotation:annotation:1.9.1") } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 4aa58951fe53..01ae5ee74154 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -55,7 +55,6 @@ android { baseline = file("lint-baseline.xml") } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index 79b9695ff4af..9c1dc4b19458 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -48,7 +48,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index 8c4fe0a3fb73..b9379df896ee 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -31,17 +31,18 @@ android { minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 5edde3454a65..7f70d7d3c9f2 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -75,7 +75,6 @@ android { testImplementation("io.mockk:mockk:1.14.9") } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index 1f0404b56623..394a3eed1308 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -27,6 +27,7 @@ android { buildFeatures { buildConfig = true } + namespace = "io.flutter.plugins.urllauncher" compileSdk = flutter.compileSdkVersion @@ -46,7 +47,6 @@ android { disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index faf9d181f5ff..c32247a13a46 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -34,16 +34,19 @@ android { minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + lint { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" baseline = file("lint-baseline.xml") } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } + kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() } From 6442ad5b7b530ea5807621b522f76545fb123ee5 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:49:26 -0500 Subject: [PATCH 16/24] Fix more classpaths --- packages/camera/camera_android_camerax/android/build.gradle | 4 ++-- .../google_sign_in_android/android/build.gradle | 2 +- packages/interactive_media_ads/android/build.gradle | 2 +- .../pigeon/platform_tests/test_plugin/android/build.gradle | 2 +- .../shared_preferences_android/android/build.gradle | 2 +- .../video_player/video_player_android/android/build.gradle | 2 +- .../webview_flutter_android/android/build.gradle | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index b72b05c29c28..3082c3453c55 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -9,8 +9,8 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.13.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("com.android.tools.build:gradle:8.13.1") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 01ae5ee74154..4b6f1a1bac30 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle index 0b929054219b..b82432216112 100644 --- a/packages/interactive_media_ads/android/build.gradle +++ b/packages/interactive_media_ads/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 85ef1be9d089..326bf7a8b45f 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 7f70d7d3c9f2..765122ab7ffa 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index c32247a13a46..150584feac22 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 92d496491c49..8788bcd4cc84 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.13.1") - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } From 3ef33d453de9fb57ebc6b23b3802865feac79bf8 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 10:57:20 -0500 Subject: [PATCH 17/24] Remove sourceSets, as they shouldn't be needed --- .../google_sign_in_android/android/build.gradle | 4 ---- packages/interactive_media_ads/android/build.gradle | 5 ----- .../pigeon/platform_tests/test_plugin/android/build.gradle | 4 ---- .../shared_preferences_android/android/build.gradle | 4 ---- .../video_player/video_player_android/android/build.gradle | 4 ---- 5 files changed, 21 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 4b6f1a1bac30..a0080d1b7bd1 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -44,10 +44,6 @@ android { jvmTarget = JavaVersion.VERSION_17.toString() } - sourceSets { - main.java.srcDirs += "src/main/kotlin" - } - lint { checkAllWarnings = true warningsAsErrors = true diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle index b82432216112..c53f4c4cef05 100644 --- a/packages/interactive_media_ads/android/build.gradle +++ b/packages/interactive_media_ads/android/build.gradle @@ -40,11 +40,6 @@ android { jvmTarget = JavaVersion.VERSION_17.toString() } - sourceSets { - main.java.srcDirs += "src/main/kotlin" - test.java.srcDirs += "src/test/kotlin" - } - defaultConfig { minSdk = 24 } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 326bf7a8b45f..81977f06b7c7 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -40,10 +40,6 @@ android { allWarningsAsErrors = true } - sourceSets { - main.java.srcDirs += "src/main/kotlin" - } - defaultConfig { minSdk = 24 } diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 765122ab7ffa..3488718b5872 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -47,10 +47,6 @@ android { jvmTarget = JavaVersion.VERSION_17.toString() } - sourceSets { - main.java.srcDirs += "src/main/kotlin" - } - defaultConfig { minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 150584feac22..b50ec3d072eb 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -51,10 +51,6 @@ android { jvmTarget = JavaVersion.VERSION_17.toString() } - sourceSets { - main.java.srcDirs += "src/main/kotlin" - } - dependencies { def exoplayer_version = "1.9.2" implementation("androidx.media3:media3-exoplayer:${exoplayer_version}") From 2b7f2c77d18d6d6167b1dd9be974343aaefdce83 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 11:00:43 -0500 Subject: [PATCH 18/24] Convert unchecked and deprecation suppressions --- packages/camera/camera_android/android/build.gradle | 6 +++--- .../shared_preferences_android/android/build.gradle | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index def0bb148af5..57e7ae158e35 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -1,6 +1,5 @@ group = "io.flutter.plugins.camera" version = "1.0-SNAPSHOT" -def args = ["-Xlint:deprecation","-Xlint:unchecked"] buildscript { repositories { @@ -20,8 +19,9 @@ allprojects { } } -project.getTasks().withType(JavaCompile){ - options.compilerArgs.addAll(args) +tasks.withType().configureEach { + options.compilerArgs.add("-Xlint:deprecation") + options.compilerArgs.add("-Xlint:unchecked") } plugins { diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 3488718b5872..981384d64125 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -21,12 +21,10 @@ allprojects { } } -allprojects { - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" - } - } +// TODO(stuartmorgan): See if this can be removed. +tasks.withType().configureEach { + options.compilerArgs.add("-Xlint:deprecation") + options.compilerArgs.add("-Xlint:unchecked") } plugins { From eae9f7b0ace7c265d9fd34a9e05d0886d3c90478 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 11:04:47 -0500 Subject: [PATCH 19/24] def -> val --- .../camera_android_camerax/android/build.gradle | 10 +++++----- .../video_player_android/android/build.gradle | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 3082c3453c55..a2226eef006d 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -77,11 +77,11 @@ android { dependencies { // CameraX core library using the camera2 implementation must use same version number. - def camerax_version = "1.5.3" - implementation("androidx.camera:camera-core:${camerax_version}") - implementation("androidx.camera:camera-camera2:${camerax_version}") - implementation("androidx.camera:camera-lifecycle:${camerax_version}") - implementation("androidx.camera:camera-video:${camerax_version}") + val cameraxVersion = "1.5.3" + implementation("androidx.camera:camera-core:${cameraxVersion}") + implementation("androidx.camera:camera-camera2:${cameraxVersion}") + implementation("androidx.camera:camera-lifecycle:${cameraxVersion}") + implementation("androidx.camera:camera-video:${cameraxVersion}") implementation("com.google.guava:guava:33.5.0-android") testImplementation("junit:junit:4.13.2") testImplementation("org.mockito:mockito-core:5.22.0") diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index b50ec3d072eb..6444612c662a 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -52,17 +52,17 @@ android { } dependencies { - def exoplayer_version = "1.9.2" - implementation("androidx.media3:media3-exoplayer:${exoplayer_version}") - implementation("androidx.media3:media3-exoplayer-hls:${exoplayer_version}") - implementation("androidx.media3:media3-exoplayer-dash:${exoplayer_version}") - implementation("androidx.media3:media3-exoplayer-rtsp:${exoplayer_version}") - implementation("androidx.media3:media3-exoplayer-smoothstreaming:${exoplayer_version}") + val exoplayerVersion = "1.9.2" + implementation("androidx.media3:media3-exoplayer:${exoplayerVersion}") + implementation("androidx.media3:media3-exoplayer-hls:${exoplayerVersion}") + implementation("androidx.media3:media3-exoplayer-dash:${exoplayerVersion}") + implementation("androidx.media3:media3-exoplayer-rtsp:${exoplayerVersion}") + implementation("androidx.media3:media3-exoplayer-smoothstreaming:${exoplayerVersion}") testImplementation("junit:junit:4.13.2") testImplementation("androidx.test:core:1.7.0") testImplementation("org.mockito:mockito-core:5.22.0") testImplementation("org.robolectric:robolectric:4.16") - testImplementation("androidx.media3:media3-test-utils:${exoplayer_version}") + testImplementation("androidx.media3:media3-test-utils:${exoplayerVersion}") } testOptions { From 7097fe95b10abe1b71ec23968ddad17bf4fae2c4 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 11:06:20 -0500 Subject: [PATCH 20/24] Rename build.gradle files --- .../camera_android/android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 packages/espresso/android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../test_plugin/android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 .../android/{build.gradle => build.gradle.kts} | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename packages/camera/camera_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/camera/camera_android_camerax/android/{build.gradle => build.gradle.kts} (100%) rename packages/espresso/android/{build.gradle => build.gradle.kts} (100%) rename packages/file_selector/file_selector_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/flutter_plugin_android_lifecycle/android/{build.gradle => build.gradle.kts} (100%) rename packages/google_maps_flutter/google_maps_flutter_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/google_sign_in/google_sign_in_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/image_picker/image_picker_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/in_app_purchase/in_app_purchase_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/interactive_media_ads/android/{build.gradle => build.gradle.kts} (100%) rename packages/path_provider/path_provider_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/pigeon/platform_tests/alternate_language_test_plugin/android/{build.gradle => build.gradle.kts} (100%) rename packages/pigeon/platform_tests/test_plugin/android/{build.gradle => build.gradle.kts} (100%) rename packages/quick_actions/quick_actions_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/shared_preferences/shared_preferences_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/url_launcher/url_launcher_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/video_player/video_player_android/android/{build.gradle => build.gradle.kts} (100%) rename packages/webview_flutter/webview_flutter_android/android/{build.gradle => build.gradle.kts} (100%) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle.kts similarity index 100% rename from packages/camera/camera_android/android/build.gradle rename to packages/camera/camera_android/android/build.gradle.kts diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle.kts similarity index 100% rename from packages/camera/camera_android_camerax/android/build.gradle rename to packages/camera/camera_android_camerax/android/build.gradle.kts diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle.kts similarity index 100% rename from packages/espresso/android/build.gradle rename to packages/espresso/android/build.gradle.kts diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle.kts similarity index 100% rename from packages/file_selector/file_selector_android/android/build.gradle rename to packages/file_selector/file_selector_android/android/build.gradle.kts diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts similarity index 100% rename from packages/flutter_plugin_android_lifecycle/android/build.gradle rename to packages/flutter_plugin_android_lifecycle/android/build.gradle.kts diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle rename to packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts similarity index 100% rename from packages/google_sign_in/google_sign_in_android/android/build.gradle rename to packages/google_sign_in/google_sign_in_android/android/build.gradle.kts diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle.kts similarity index 100% rename from packages/image_picker/image_picker_android/android/build.gradle rename to packages/image_picker/image_picker_android/android/build.gradle.kts diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts similarity index 100% rename from packages/in_app_purchase/in_app_purchase_android/android/build.gradle rename to packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle.kts similarity index 100% rename from packages/interactive_media_ads/android/build.gradle rename to packages/interactive_media_ads/android/build.gradle.kts diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle.kts similarity index 100% rename from packages/path_provider/path_provider_android/android/build.gradle rename to packages/path_provider/path_provider_android/android/build.gradle.kts diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts similarity index 100% rename from packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle rename to packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/android/build.gradle rename to packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle.kts similarity index 100% rename from packages/quick_actions/quick_actions_android/android/build.gradle rename to packages/quick_actions/quick_actions_android/android/build.gradle.kts diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts similarity index 100% rename from packages/shared_preferences/shared_preferences_android/android/build.gradle rename to packages/shared_preferences/shared_preferences_android/android/build.gradle.kts diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle.kts similarity index 100% rename from packages/url_launcher/url_launcher_android/android/build.gradle rename to packages/url_launcher/url_launcher_android/android/build.gradle.kts diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle.kts similarity index 100% rename from packages/video_player/video_player_android/android/build.gradle rename to packages/video_player/video_player_android/android/build.gradle.kts diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts similarity index 100% rename from packages/webview_flutter/webview_flutter_android/android/build.gradle rename to packages/webview_flutter/webview_flutter_android/android/build.gradle.kts From a33e437c95790a4a14f669cbda10b6702fa156f7 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 13:02:06 -0500 Subject: [PATCH 21/24] Compile fixes; option 1 --- .../camera_android_camerax/android/build.gradle.kts | 13 ++++++++----- packages/espresso/android/build.gradle.kts | 2 +- .../google_sign_in_android/android/build.gradle.kts | 12 ++++++++---- .../interactive_media_ads/android/build.gradle.kts | 12 ++++++++---- .../android/build.gradle.kts | 12 ++++++++---- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/packages/camera/camera_android_camerax/android/build.gradle.kts b/packages/camera/camera_android_camerax/android/build.gradle.kts index a2226eef006d..1322e73470c1 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle.kts +++ b/packages/camera/camera_android_camerax/android/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + group = "io.flutter.plugins.camerax" version = "1.0" @@ -26,6 +28,12 @@ plugins { id("kotlin-android") } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_17.toString()) + } +} + android { namespace = "io.flutter.plugins.camerax" // CameraX dependencies require compilation against version 33 or later. @@ -36,11 +44,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - // This must match the Java version provided in compileOptions. - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { // CameraX APIs require API 23 or later. minSdk = 23 diff --git a/packages/espresso/android/build.gradle.kts b/packages/espresso/android/build.gradle.kts index ac018d53beee..b94b14d8c002 100644 --- a/packages/espresso/android/build.gradle.kts +++ b/packages/espresso/android/build.gradle.kts @@ -41,7 +41,7 @@ android { checkAllWarnings = true warningsAsErrors = true disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" - baseline file("lint-baseline.xml") + baseline = file("lint-baseline.xml") } testOptions { diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts index a0080d1b7bd1..09f545476c7d 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + group = "io.flutter.plugins.googlesignin" version = "1.0-SNAPSHOT" @@ -26,6 +28,12 @@ plugins { id("kotlin-android") } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_17.toString()) + } +} + android { namespace = "io.flutter.plugins.googlesignin" compileSdk = flutter.compileSdkVersion @@ -40,10 +48,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - lint { checkAllWarnings = true warningsAsErrors = true diff --git a/packages/interactive_media_ads/android/build.gradle.kts b/packages/interactive_media_ads/android/build.gradle.kts index c53f4c4cef05..41a55218e3a7 100644 --- a/packages/interactive_media_ads/android/build.gradle.kts +++ b/packages/interactive_media_ads/android/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + group = "dev.flutter.packages.interactive_media_ads" version = "1.0-SNAPSHOT" @@ -26,6 +28,12 @@ plugins { id("kotlin-android") } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_17.toString()) + } +} + android { namespace = "dev.flutter.packages.interactive_media_ads" @@ -36,10 +44,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { minSdk = 24 } diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts index 981384d64125..1845ebbed584 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + group = "io.flutter.plugins.sharedpreferences" version = "1.0-SNAPSHOT" @@ -32,6 +34,12 @@ plugins { id("kotlin-android") } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(JavaVersion.VERSION_17.toString()) + } +} + android { namespace = "io.flutter.plugins.sharedpreferences" compileSdk = flutter.compileSdkVersion @@ -41,10 +49,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From c0ea36b62f5a6eceeed95edb731778e39530634e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 27 Feb 2026 13:53:32 -0500 Subject: [PATCH 22/24] Fix lint disabling syntax --- packages/camera/camera_android/android/build.gradle.kts | 2 +- packages/camera/camera_android_camerax/android/build.gradle.kts | 2 +- packages/espresso/android/build.gradle.kts | 2 +- .../file_selector_android/android/build.gradle.kts | 2 +- .../flutter_plugin_android_lifecycle/android/build.gradle.kts | 2 +- .../google_maps_flutter_android/android/build.gradle.kts | 2 +- .../google_sign_in_android/android/build.gradle.kts | 2 +- .../image_picker/image_picker_android/android/build.gradle.kts | 2 +- .../in_app_purchase_android/android/build.gradle.kts | 2 +- packages/interactive_media_ads/android/build.gradle.kts | 2 +- .../path_provider_android/android/build.gradle.kts | 2 +- .../alternate_language_test_plugin/android/build.gradle.kts | 2 +- .../pigeon/platform_tests/test_plugin/android/build.gradle.kts | 2 +- .../quick_actions_android/android/build.gradle.kts | 2 +- .../shared_preferences_android/android/build.gradle.kts | 2 +- .../url_launcher/url_launcher_android/android/build.gradle.kts | 2 +- .../video_player/video_player_android/android/build.gradle.kts | 2 +- .../webview_flutter_android/android/build.gradle.kts | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle.kts b/packages/camera/camera_android/android/build.gradle.kts index 57e7ae158e35..49dd54eabe43 100644 --- a/packages/camera/camera_android/android/build.gradle.kts +++ b/packages/camera/camera_android/android/build.gradle.kts @@ -43,7 +43,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } compileOptions { diff --git a/packages/camera/camera_android_camerax/android/build.gradle.kts b/packages/camera/camera_android_camerax/android/build.gradle.kts index 1322e73470c1..9279f3d1e43a 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle.kts +++ b/packages/camera/camera_android_camerax/android/build.gradle.kts @@ -73,7 +73,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "GradleDependency" + "InvalidPackage" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "GradleDependency", "InvalidPackage", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } } diff --git a/packages/espresso/android/build.gradle.kts b/packages/espresso/android/build.gradle.kts index b94b14d8c002..ae13c1558ca7 100644 --- a/packages/espresso/android/build.gradle.kts +++ b/packages/espresso/android/build.gradle.kts @@ -40,7 +40,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } diff --git a/packages/file_selector/file_selector_android/android/build.gradle.kts b/packages/file_selector/file_selector_android/android/build.gradle.kts index a66ffeb3b15d..ad60f0150b93 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle.kts +++ b/packages/file_selector/file_selector_android/android/build.gradle.kts @@ -47,7 +47,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } testOptions { diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts b/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts index 23810eba295e..2760047e329f 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts @@ -41,7 +41,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } dependencies { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts index 18870984f756..99e1705bd7ec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts @@ -35,7 +35,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } dependencies { diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts index 09f545476c7d..60ffb1a8111f 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts @@ -51,7 +51,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } diff --git a/packages/image_picker/image_picker_android/android/build.gradle.kts b/packages/image_picker/image_picker_android/android/build.gradle.kts index b6be6e2ff7d4..5489bf303f82 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle.kts +++ b/packages/image_picker/image_picker_android/android/build.gradle.kts @@ -35,7 +35,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } dependencies { diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts index 9c1dc4b19458..ccaeec3a422c 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts @@ -40,7 +40,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } compileOptions { diff --git a/packages/interactive_media_ads/android/build.gradle.kts b/packages/interactive_media_ads/android/build.gradle.kts index 41a55218e3a7..c8883cfae126 100644 --- a/packages/interactive_media_ads/android/build.gradle.kts +++ b/packages/interactive_media_ads/android/build.gradle.kts @@ -62,7 +62,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } diff --git a/packages/path_provider/path_provider_android/android/build.gradle.kts b/packages/path_provider/path_provider_android/android/build.gradle.kts index b9379df896ee..b5586529cef6 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle.kts +++ b/packages/path_provider/path_provider_android/android/build.gradle.kts @@ -35,7 +35,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } compileOptions { diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts index fb39508a1743..d528ba2c3fd7 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts @@ -54,7 +54,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } dependencies { diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts b/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts index 81977f06b7c7..c7cc893976a9 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts @@ -62,7 +62,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle.kts b/packages/quick_actions/quick_actions_android/android/build.gradle.kts index 1005d0f603bb..01c70629c46c 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle.kts +++ b/packages/quick_actions/quick_actions_android/android/build.gradle.kts @@ -35,7 +35,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } dependencies { diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts index 1845ebbed584..0d416939598d 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts @@ -57,7 +57,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle.kts b/packages/url_launcher/url_launcher_android/android/build.gradle.kts index 394a3eed1308..446a4b7482ed 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle.kts +++ b/packages/url_launcher/url_launcher_android/android/build.gradle.kts @@ -44,7 +44,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) } testOptions { diff --git a/packages/video_player/video_player_android/android/build.gradle.kts b/packages/video_player/video_player_android/android/build.gradle.kts index 6444612c662a..10c192f58088 100644 --- a/packages/video_player/video_player_android/android/build.gradle.kts +++ b/packages/video_player/video_player_android/android/build.gradle.kts @@ -38,7 +38,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts b/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts index 8788bcd4cc84..134184d7679d 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts @@ -47,7 +47,7 @@ android { lint { checkAllWarnings = true warningsAsErrors = true - disable += "AndroidGradlePluginVersion" + "InvalidPackage" + "GradleDependency" + "NewerVersionAvailable" + disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) baseline = file("lint-baseline.xml") } From 47e534b050cff382631149dd60749a4dedfebc3d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Mar 2026 13:00:00 -0500 Subject: [PATCH 23/24] Only useJUnitPlatform where that was already present --- packages/camera/camera_android/android/build.gradle.kts | 1 - packages/camera/camera_android_camerax/android/build.gradle.kts | 1 - packages/espresso/android/build.gradle.kts | 1 - .../file_selector/file_selector_android/android/build.gradle.kts | 1 - .../flutter_plugin_android_lifecycle/android/build.gradle.kts | 1 - .../google_maps_flutter_android/android/build.gradle.kts | 1 - .../google_sign_in_android/android/build.gradle.kts | 1 - .../image_picker/image_picker_android/android/build.gradle.kts | 1 - .../in_app_purchase_android/android/build.gradle.kts | 1 - .../path_provider/path_provider_android/android/build.gradle.kts | 1 - .../alternate_language_test_plugin/android/build.gradle.kts | 1 - .../pigeon/platform_tests/test_plugin/android/build.gradle.kts | 1 - .../quick_actions/quick_actions_android/android/build.gradle.kts | 1 - .../shared_preferences_android/android/build.gradle.kts | 1 - .../url_launcher/url_launcher_android/android/build.gradle.kts | 1 - .../video_player/video_player_android/android/build.gradle.kts | 1 - .../webview_flutter_android/android/build.gradle.kts | 1 - 17 files changed, 17 deletions(-) diff --git a/packages/camera/camera_android/android/build.gradle.kts b/packages/camera/camera_android/android/build.gradle.kts index 49dd54eabe43..7439d5a418e9 100644 --- a/packages/camera/camera_android/android/build.gradle.kts +++ b/packages/camera/camera_android/android/build.gradle.kts @@ -56,7 +56,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/camera/camera_android_camerax/android/build.gradle.kts b/packages/camera/camera_android_camerax/android/build.gradle.kts index 9279f3d1e43a..61504fe0c5ec 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle.kts +++ b/packages/camera/camera_android_camerax/android/build.gradle.kts @@ -55,7 +55,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/espresso/android/build.gradle.kts b/packages/espresso/android/build.gradle.kts index ae13c1558ca7..fa6210082701 100644 --- a/packages/espresso/android/build.gradle.kts +++ b/packages/espresso/android/build.gradle.kts @@ -49,7 +49,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/file_selector/file_selector_android/android/build.gradle.kts b/packages/file_selector/file_selector_android/android/build.gradle.kts index ad60f0150b93..99291f8635a1 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle.kts +++ b/packages/file_selector/file_selector_android/android/build.gradle.kts @@ -55,7 +55,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts b/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts index 2760047e329f..f9c9001086f5 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle.kts @@ -53,7 +53,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts index 99e1705bd7ec..3fa1c4abf568 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle.kts @@ -61,7 +61,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts index 60ffb1a8111f..5c1a338c20fd 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle.kts @@ -60,7 +60,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/image_picker/image_picker_android/android/build.gradle.kts b/packages/image_picker/image_picker_android/android/build.gradle.kts index 5489bf303f82..5cb0a4825651 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle.kts +++ b/packages/image_picker/image_picker_android/android/build.gradle.kts @@ -60,7 +60,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts index ccaeec3a422c..a5a11945ce67 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle.kts @@ -53,7 +53,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/path_provider/path_provider_android/android/build.gradle.kts b/packages/path_provider/path_provider_android/android/build.gradle.kts index b5586529cef6..3114e6c6385e 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle.kts +++ b/packages/path_provider/path_provider_android/android/build.gradle.kts @@ -48,7 +48,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts index d528ba2c3fd7..14e778fe7a14 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle.kts @@ -41,7 +41,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts b/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts index c7cc893976a9..60847669c6f0 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle.kts @@ -49,7 +49,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle.kts b/packages/quick_actions/quick_actions_android/android/build.gradle.kts index 01c70629c46c..da2460ff619d 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle.kts +++ b/packages/quick_actions/quick_actions_android/android/build.gradle.kts @@ -54,7 +54,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts index 0d416939598d..edf15edc0ca4 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle.kts @@ -78,7 +78,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle.kts b/packages/url_launcher/url_launcher_android/android/build.gradle.kts index 446a4b7482ed..d5bbc4953b01 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle.kts +++ b/packages/url_launcher/url_launcher_android/android/build.gradle.kts @@ -52,7 +52,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/video_player/video_player_android/android/build.gradle.kts b/packages/video_player/video_player_android/android/build.gradle.kts index 10c192f58088..663d96838140 100644 --- a/packages/video_player/video_player_android/android/build.gradle.kts +++ b/packages/video_player/video_player_android/android/build.gradle.kts @@ -70,7 +70,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts b/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts index 134184d7679d..e345474e5106 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle.kts @@ -65,7 +65,6 @@ android { isIncludeAndroidResources = true isReturnDefaultValues = true all { - it.useJUnitPlatform() it.outputs.upToDateWhen { false } it.testLogging { events("passed", "skipped", "failed", "standardOut", "standardError") From b9627d57d03ab17fe8d8e88d611267ed1cd7be3b Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 3 Mar 2026 13:04:06 -0500 Subject: [PATCH 24/24] Version bumps --- packages/camera/camera_android/CHANGELOG.md | 4 ++++ packages/camera/camera_android/pubspec.yaml | 2 +- packages/camera/camera_android_camerax/CHANGELOG.md | 6 +++++- packages/camera/camera_android_camerax/pubspec.yaml | 2 +- packages/espresso/CHANGELOG.md | 4 ++++ packages/espresso/pubspec.yaml | 2 +- packages/file_selector/file_selector_android/CHANGELOG.md | 3 ++- packages/file_selector/file_selector_android/pubspec.yaml | 2 +- packages/flutter_plugin_android_lifecycle/CHANGELOG.md | 3 ++- packages/flutter_plugin_android_lifecycle/pubspec.yaml | 2 +- .../google_maps_flutter_android/CHANGELOG.md | 4 ++++ .../google_maps_flutter_android/pubspec.yaml | 2 +- packages/google_sign_in/google_sign_in_android/CHANGELOG.md | 4 ++++ packages/google_sign_in/google_sign_in_android/pubspec.yaml | 2 +- packages/image_picker/image_picker_android/CHANGELOG.md | 4 ++++ packages/image_picker/image_picker_android/pubspec.yaml | 2 +- .../in_app_purchase/in_app_purchase_android/CHANGELOG.md | 4 ++++ .../in_app_purchase/in_app_purchase_android/pubspec.yaml | 2 +- packages/interactive_media_ads/CHANGELOG.md | 4 ++++ packages/interactive_media_ads/pubspec.yaml | 2 +- packages/path_provider/path_provider_android/CHANGELOG.md | 4 ++++ packages/path_provider/path_provider_android/pubspec.yaml | 2 +- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/pubspec.yaml | 2 +- packages/quick_actions/quick_actions_android/CHANGELOG.md | 3 ++- packages/quick_actions/quick_actions_android/pubspec.yaml | 2 +- .../shared_preferences_android/CHANGELOG.md | 4 ++++ .../shared_preferences_android/pubspec.yaml | 2 +- packages/url_launcher/url_launcher_android/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher_android/pubspec.yaml | 2 +- packages/video_player/video_player_android/CHANGELOG.md | 4 ++++ packages/video_player/video_player_android/pubspec.yaml | 2 +- .../webview_flutter/webview_flutter_android/CHANGELOG.md | 4 ++++ .../webview_flutter/webview_flutter_android/pubspec.yaml | 2 +- 34 files changed, 80 insertions(+), 21 deletions(-) diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md index 9357004bb894..0bf9721e6ab9 100644 --- a/packages/camera/camera_android/CHANGELOG.md +++ b/packages/camera/camera_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.10+16 + +* Updates build files from Groovy to Kotlin. + ## 0.10.10+15 * Updates example to demonstrate correct exception handling for async return statements, ensuring exceptions thrown during return within try blocks are properly caught as per [dart-lang/sdk#44395](https://github.com/dart-lang/sdk/issues/44395). diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index 4448279e3a32..34ffc900e502 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.10+15 +version: 0.10.10+16 environment: sdk: ^3.9.0 diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 159cdf9b67b6..2223d805003f 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.0+2 + +* Updates build files from Groovy to Kotlin. + ## 0.7.0+1 * Updates example to demonstrate correct exception handling for async return statements, ensuring exceptions thrown during return within try blocks are properly caught as per [dart-lang/sdk#44395](https://github.com/dart-lang/sdk/issues/44395). @@ -514,4 +518,4 @@ this plugin should now be compatible with [google_ml_kit_flutter](https://github * Displaying a live camera preview * Image streaming - See [`README.md`](README.md) for more details on the limitations of this implementation. \ No newline at end of file + See [`README.md`](README.md) for more details on the limitations of this implementation. diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index ef3930bee73b..eef9a72cbe45 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/packages/camera/camera_android_camerax/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_android_camerax description: Android implementation of the camera plugin using the CameraX library. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.7.0+1 +version: 0.7.0+2 environment: sdk: ^3.9.0 diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md index 14b7dce5dcae..53e9782e206c 100644 --- a/packages/espresso/CHANGELOG.md +++ b/packages/espresso/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0+23 + +* Updates build files from Groovy to Kotlin. + ## 0.4.0+22 * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml index dbec8b813844..63e77af8c5a9 100644 --- a/packages/espresso/pubspec.yaml +++ b/packages/espresso/pubspec.yaml @@ -3,7 +3,7 @@ description: Java classes for testing Flutter apps using Espresso. Allows driving Flutter widgets from a native Espresso test. repository: https://github.com/flutter/packages/tree/main/packages/espresso issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22 -version: 0.4.0+22 +version: 0.4.0+23 environment: sdk: ^3.9.0 diff --git a/packages/file_selector/file_selector_android/CHANGELOG.md b/packages/file_selector/file_selector_android/CHANGELOG.md index 7e0e36773d2d..070599f8e5d7 100644 --- a/packages/file_selector/file_selector_android/CHANGELOG.md +++ b/packages/file_selector/file_selector_android/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.5.2+5 +* Updates build files from Groovy to Kotlin. * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. ## 0.5.2+4 diff --git a/packages/file_selector/file_selector_android/pubspec.yaml b/packages/file_selector/file_selector_android/pubspec.yaml index 042236bfae85..80440caaa287 100644 --- a/packages/file_selector/file_selector_android/pubspec.yaml +++ b/packages/file_selector/file_selector_android/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_android description: Android implementation of the file_selector package. repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.5.2+4 +version: 0.5.2+5 environment: sdk: ^3.9.0 diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md index 85dd8c13e2e1..aec558de4c34 100644 --- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md +++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 2.0.34 +* Updates build files from Groovy to Kotlin. * Updates README to reflect currently supported OS version. ## 2.0.33 diff --git a/packages/flutter_plugin_android_lifecycle/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/pubspec.yaml index 6c146b98342e..038fc39804aa 100644 --- a/packages/flutter_plugin_android_lifecycle/pubspec.yaml +++ b/packages/flutter_plugin_android_lifecycle/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_plugin_android_lifecycle description: Flutter plugin for accessing an Android Lifecycle within other plugins. repository: https://github.com/flutter/packages/tree/main/packages/flutter_plugin_android_lifecycle issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_plugin_android_lifecycle%22 -version: 2.0.33 +version: 2.0.34 environment: sdk: ^3.9.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index fed644c5be91..09707615326f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.19.3 + +* Updates build files from Groovy to Kotlin. + ## 2.19.2 * Bump com.google.maps.android:android-maps-utils from 4.0.0 to 4.1.0. diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 2caebe121cde..817e60a672ae 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.19.2 +version: 2.19.3 environment: sdk: ^3.9.0 diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md index 38624c575a70..0117c25f07d9 100644 --- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 7.2.10 + +* Updates build files from Groovy to Kotlin. + ## 7.2.9 * Simplifies internal code for Kotlin/Java interoperability. diff --git a/packages/google_sign_in/google_sign_in_android/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/pubspec.yaml index 244cf1d3f6fd..ead6b61afa4a 100644 --- a/packages/google_sign_in/google_sign_in_android/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in_android description: Android implementation of the google_sign_in plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22 -version: 7.2.9 +version: 7.2.10 environment: sdk: ^3.9.0 diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index 7f2e33347447..80d91b1deb87 100644 --- a/packages/image_picker/image_picker_android/CHANGELOG.md +++ b/packages/image_picker/image_picker_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.8.13+15 + +* Updates build files from Groovy to Kotlin. + ## 0.8.13+14 * Bumps androidx.activity:activity from 1.12.2 to 1.12.4. diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index 37dfcbaf8654..aba9ecbef800 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_android description: Android implementation of the image_picker plugin. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.8.13+14 +version: 0.8.13+15 environment: sdk: ^3.9.0 diff --git a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md index 5769150bf7fb..e1c8438aa111 100644 --- a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0+9 + +* Updates build files from Groovy to Kotlin. + ## 0.4.0+8 * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.1. diff --git a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml index 06a91eb3cfaa..e6fc2a4efa5b 100644 --- a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml @@ -3,7 +3,7 @@ description: An implementation for the Android platform of the Flutter `in_app_p repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.4.0+8 +version: 0.4.0+9 environment: sdk: ^3.9.0 diff --git a/packages/interactive_media_ads/CHANGELOG.md b/packages/interactive_media_ads/CHANGELOG.md index 9a5ffb9eafa8..e36a21703873 100644 --- a/packages/interactive_media_ads/CHANGELOG.md +++ b/packages/interactive_media_ads/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0+12 + +* Updates build files from Groovy to Kotlin. + ## 0.3.0+11 * Updates `README` to recommend that a single `AdsLoader` should be used per page not for the entire diff --git a/packages/interactive_media_ads/pubspec.yaml b/packages/interactive_media_ads/pubspec.yaml index 7a886069f1f6..a9a6d0ea061a 100644 --- a/packages/interactive_media_ads/pubspec.yaml +++ b/packages/interactive_media_ads/pubspec.yaml @@ -2,7 +2,7 @@ name: interactive_media_ads description: A Flutter plugin for using the Interactive Media Ads SDKs on Android and iOS. repository: https://github.com/flutter/packages/tree/main/packages/interactive_media_ads issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+interactive_media_ads%22 -version: 0.3.0+11 # This must match the version in +version: 0.3.0+12 # This must match the version in # `android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt` and # `ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift` diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md index 76f560327b59..106b35fa0676 100644 --- a/packages/path_provider/path_provider_android/CHANGELOG.md +++ b/packages/path_provider/path_provider_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.23 + +* Updates build files from Groovy to Kotlin. + ## 2.2.22 * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.1. diff --git a/packages/path_provider/path_provider_android/pubspec.yaml b/packages/path_provider/path_provider_android/pubspec.yaml index 021a3bf16d66..a5a6380aa24b 100644 --- a/packages/path_provider/path_provider_android/pubspec.yaml +++ b/packages/path_provider/path_provider_android/pubspec.yaml @@ -2,7 +2,7 @@ name: path_provider_android description: Android implementation of the path_provider plugin. repository: https://github.com/flutter/packages/tree/main/packages/path_provider/path_provider_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22 -version: 2.2.22 +version: 2.2.23 environment: sdk: ^3.9.0 diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 27ebd2090661..679a86405b3e 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 26.1.11 + +* Updates build files from Groovy to Kotlin. + ## 26.1.10 * Dramatically reduces the number of File write operations sent to the operating diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index e0e25734e32e..ef6202d4350a 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 26.1.10 # This must match the version in lib/src/generator_tools.dart +version: 26.1.11 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.9.0 diff --git a/packages/quick_actions/quick_actions_android/CHANGELOG.md b/packages/quick_actions/quick_actions_android/CHANGELOG.md index 9fdf32001183..fcacbb356d3c 100644 --- a/packages/quick_actions/quick_actions_android/CHANGELOG.md +++ b/packages/quick_actions/quick_actions_android/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 1.0.28 +* Updates build files from Groovy to Kotlin. * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. ## 1.0.27 diff --git a/packages/quick_actions/quick_actions_android/pubspec.yaml b/packages/quick_actions/quick_actions_android/pubspec.yaml index d468da6bbd51..dd05368fd9de 100644 --- a/packages/quick_actions/quick_actions_android/pubspec.yaml +++ b/packages/quick_actions/quick_actions_android/pubspec.yaml @@ -2,7 +2,7 @@ name: quick_actions_android description: An implementation for the Android platform of the Flutter `quick_actions` plugin. repository: https://github.com/flutter/packages/tree/main/packages/quick_actions/quick_actions_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 1.0.27 +version: 1.0.28 environment: sdk: ^3.9.0 diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md index d9d83230286a..32bfb5ee185f 100644 --- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.4.22 + +* Updates build files from Groovy to Kotlin. + ## 2.4.21 * Reverts `androidx.datastore:datastore` to 1.1.7 due to a regression 16 KB diff --git a/packages/shared_preferences/shared_preferences_android/pubspec.yaml b/packages/shared_preferences/shared_preferences_android/pubspec.yaml index 8ef265cd3b95..67998482ecde 100644 --- a/packages/shared_preferences/shared_preferences_android/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_android/pubspec.yaml @@ -2,7 +2,7 @@ name: shared_preferences_android description: Android implementation of the shared_preferences plugin repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22 -version: 2.4.21 +version: 2.4.22 environment: sdk: ^3.9.0 diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md index 09f2f425163c..2cb8a74f5f26 100644 --- a/packages/url_launcher/url_launcher_android/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.3.29 + +* Updates build files from Groovy to Kotlin. + ## 6.3.28 * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.1. diff --git a/packages/url_launcher/url_launcher_android/pubspec.yaml b/packages/url_launcher/url_launcher_android/pubspec.yaml index 4aeab9b6eee2..425b261484ae 100644 --- a/packages/url_launcher/url_launcher_android/pubspec.yaml +++ b/packages/url_launcher/url_launcher_android/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher_android description: Android implementation of the url_launcher plugin. repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22 -version: 6.3.28 +version: 6.3.29 environment: sdk: ^3.9.0 diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md index 4dc08f0c4624..3180609828e8 100644 --- a/packages/video_player/video_player_android/CHANGELOG.md +++ b/packages/video_player/video_player_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.9.5 + +* Updates build files from Groovy to Kotlin. + ## 2.9.4 * Updates `androidx.media3` to 1.9.2. diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml index 359ba7466e27..4461ddd73d1e 100644 --- a/packages/video_player/video_player_android/pubspec.yaml +++ b/packages/video_player/video_player_android/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player_android description: Android implementation of the video_player plugin. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 -version: 2.9.4 +version: 2.9.5 environment: sdk: ^3.9.0 diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md index 088dcb547c3e..832b6a95711e 100644 --- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md +++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.10.14 + +* Updates build files from Groovy to Kotlin. + ## 4.10.13 * Bumps androidx.webkit:webkit from 1.14.0 to 1.15.0. diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml index 4415fcfbbaee..1657eeb4af99 100644 --- a/packages/webview_flutter/webview_flutter_android/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: webview_flutter_android description: A Flutter plugin that provides a WebView widget on Android. repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22 -version: 4.10.13 +version: 4.10.14 environment: sdk: ^3.9.0