From e4687c95a20f377d44c1294225783aaa591ff754 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:13:06 -0500
Subject: [PATCH 1/9] group, version, classpath

---
 packages/camera/camera_android/android/build.gradle       | 6 +++---
 .../camera/camera_android_camerax/android/build.gradle    | 8 ++++----
 packages/espresso/android/build.gradle                    | 6 +++---
 .../file_selector_android/android/build.gradle            | 6 +++---
 .../flutter_plugin_android_lifecycle/android/build.gradle | 6 +++---
 .../example/android/settings.gradle                       | 2 +-
 .../google_maps_flutter_android/android/build.gradle      | 6 +++---
 .../google_sign_in_android/android/build.gradle           | 8 ++++----
 .../image_picker_android/android/build.gradle             | 6 +++---
 .../in_app_purchase_android/android/build.gradle          | 6 +++---
 packages/interactive_media_ads/android/build.gradle       | 8 ++++----
 .../path_provider_android/android/build.gradle            | 6 +++---
 .../alternate_language_test_plugin/android/build.gradle   | 6 +++---
 .../platform_tests/test_plugin/android/build.gradle       | 8 ++++----
 .../quick_actions_android/android/build.gradle            | 6 +++---
 .../shared_preferences_android/android/build.gradle       | 8 ++++----
 .../example/android/app/build.gradle                      | 4 ++--
 .../url_launcher_android/android/build.gradle             | 6 +++---
 .../video_player_android/android/build.gradle             | 8 ++++----
 .../webview_flutter_android/android/build.gradle          | 8 ++++----
 20 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
index 609ffa80fcbb..65fec43c69df 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")
     }
 }
 
diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle
index 8d7553028e1b..89f2c5e2a2a4 100644
--- a/packages/camera/camera_android_camerax/android/build.gradle
+++ b/packages/camera/camera_android_camerax/android/build.gradle
@@ -1,5 +1,5 @@
-group = 'io.flutter.plugins.camerax'
-version = '1.0'
+group = "io.flutter.plugins.camerax"
+version = "1.0"
 
 buildscript {
     ext.kotlin_version = '2.3.0'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index d545cfc1b277..efe2b54812eb 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")
     }
 }
 
diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle
index aaae0b684ceb..1ed153f73d5a 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")
     }
 }
 
diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle
index 1868b38dafe3..f2c23fc760c6 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")
     }
 }
 
diff --git a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle
index c2dd5379a768..d24c400c7113 100644
--- a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle
+++ b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle
@@ -24,7 +24,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.1"
+        classpath("gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.1")
     }
 }
 
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..b6886bb7cd13 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")
     }
 }
 
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..a3098e843fc2 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,5 +1,5 @@
-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'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
index 6e1aa71e2d64..4aff3fb8d693 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")
     }
 }
 
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..64e2dbb8f053 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")
     }
 }
 
diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle
index acf02e97af25..a83ea97c5cd8 100644
--- a/packages/interactive_media_ads/android/build.gradle
+++ b/packages/interactive_media_ads/android/build.gradle
@@ -1,5 +1,5 @@
-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'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index 163ca2de6e0f..249d7e2547ee 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")
     }
 }
 
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..58d02ebdfb04 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")
     }
 }
 
diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle
index 5f0b03c47864..c6a3924ccb4e 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle
+++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle
@@ -1,5 +1,5 @@
-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'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle
index 5895a7336317..7345d1993fe9 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")
     }
 }
 
diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle
index c855fe40328e..6f4ab3f2a534 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -1,5 +1,5 @@
-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'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
index 806bea4e4e6a..c15d9d44c9a5 100644
--- a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.9.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle
index 3d3470587705..93b0e6e080a3 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")
     }
 }
 
diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle
index 173cb32a30d7..d314fe506001 100644
--- a/packages/video_player/video_player_android/android/build.gradle
+++ b/packages/video_player/video_player_android/android/build.gradle
@@ -1,5 +1,5 @@
-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'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle
index fb026cb7a778..77f9eee8c183 100644
--- a/packages/webview_flutter/webview_flutter_android/android/build.gradle
+++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle
@@ -1,5 +1,5 @@
-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'
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.13.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 

From 0d05bf6d3eab872dbdc4ba5909fc5fa82151a4a5 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:15:24 -0500
Subject: [PATCH 2/9] testInstrumentationRunner

---
 packages/camera/camera_android/android/build.gradle             | 2 +-
 packages/camera/camera_android_camerax/android/build.gradle     | 2 +-
 packages/espresso/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 +-
 .../path_provider/path_provider_android/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 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
index 65fec43c69df..0016ecbf3f20 100644
--- a/packages/camera/camera_android/android/build.gradle
+++ b/packages/camera/camera_android/android/build.gradle
@@ -35,7 +35,7 @@ buildFeatures {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         checkAllWarnings = true
diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle
index 89f2c5e2a2a4..484ed57ff3d2 100644
--- a/packages/camera/camera_android_camerax/android/build.gradle
+++ b/packages/camera/camera_android_camerax/android/build.gradle
@@ -42,7 +42,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 efe2b54812eb..6d6c091f446a 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 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 f2c23fc760c6..661d1301b27c 100644
--- a/packages/flutter_plugin_android_lifecycle/android/build.gradle
+++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard.txt'
     }
 
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 b6886bb7cd13..850770504df4 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
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         checkAllWarnings = 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 a3098e843fc2..9e346254f144 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
@@ -30,7 +30,7 @@ android {
 
     defaultConfig {
         minSdkVersion 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 4aff3fb8d693..c47afcce395b 100644
--- a/packages/image_picker/image_picker_android/android/build.gradle
+++ b/packages/image_picker/image_picker_android/android/build.gradle
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         checkAllWarnings = 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 64e2dbb8f053..165b5a0eff26 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
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         minSdk = 21
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         checkAllWarnings = true
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index 249d7e2547ee..2a4c22e4058d 100644
--- a/packages/path_provider/path_provider_android/android/build.gradle
+++ b/packages/path_provider/path_provider_android/android/build.gradle
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         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 7345d1993fe9..cb03abfdd1ba 100644
--- a/packages/quick_actions/quick_actions_android/android/build.gradle
+++ b/packages/quick_actions/quick_actions_android/android/build.gradle
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         checkAllWarnings = true
diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle
index 6f4ab3f2a534..7f6ac0676aa4 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -51,7 +51,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lint {
         checkAllWarnings = true
diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle
index 93b0e6e080a3..e79af3e0d5a3 100644
--- a/packages/url_launcher/url_launcher_android/android/build.gradle
+++ b/packages/url_launcher/url_launcher_android/android/build.gradle
@@ -30,7 +30,7 @@ android {
 
     defaultConfig {
         minSdkVersion 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 d314fe506001..21bb6c5f2a57 100644
--- a/packages/video_player/video_player_android/android/build.gradle
+++ b/packages/video_player/video_player_android/android/build.gradle
@@ -30,7 +30,7 @@ android {
 
     defaultConfig {
         minSdkVersion 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 77f9eee8c183..b7ba05c4c618 100644
--- a/packages/webview_flutter/webview_flutter_android/android/build.gradle
+++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle
@@ -39,7 +39,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lint {

From d75c263a9be84b0113f251037278fc41f5821374 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:17:20 -0500
Subject: [PATCH 3/9] minSdk

---
 packages/camera/camera_android/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 +-
 packages/interactive_media_ads/android/build.gradle             | 2 +-
 packages/local_auth/local_auth_android/android/build.gradle     | 2 +-
 .../path_provider/path_provider_android/android/build.gradle    | 2 +-
 .../alternate_language_test_plugin/android/build.gradle         | 2 +-
 packages/pigeon/platform_tests/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 0016ecbf3f20..19c098c7300f 100644
--- a/packages/camera/camera_android/android/build.gradle
+++ b/packages/camera/camera_android/android/build.gradle
@@ -34,7 +34,7 @@ buildFeatures {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index 6d6c091f446a..420ea7a4f9bb 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle
index 1ed153f73d5a..41aeddb463c2 100644
--- a/packages/file_selector/file_selector_android/android/build.gradle
+++ b/packages/file_selector/file_selector_android/android/build.gradle
@@ -31,7 +31,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 
     dependencies {
diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle
index 661d1301b27c..ce26a3efe61d 100644
--- a/packages/flutter_plugin_android_lifecycle/android/build.gradle
+++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard.txt'
     }
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 850770504df4..590cbc277c31 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
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
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 9e346254f144..b44d5fd9a5de 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
@@ -29,7 +29,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
index c47afcce395b..e5f6cd8b5376 100644
--- a/packages/image_picker/image_picker_android/android/build.gradle
+++ b/packages/image_picker/image_picker_android/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/packages/interactive_media_ads/android/build.gradle b/packages/interactive_media_ads/android/build.gradle
index a83ea97c5cd8..1f27c4dcab07 100644
--- a/packages/interactive_media_ads/android/build.gradle
+++ b/packages/interactive_media_ads/android/build.gradle
@@ -44,7 +44,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 
     dependencies {
diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle
index 02f2f41c7dfb..16c0e03bc83a 100644
--- a/packages/local_auth/local_auth_android/android/build.gradle
+++ b/packages/local_auth/local_auth_android/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index 2a4c22e4058d..53f11dfd91fc 100644
--- a/packages/path_provider/path_provider_android/android/build.gradle
+++ b/packages/path_provider/path_provider_android/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
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 58d02ebdfb04..8eadbf980366 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
@@ -31,7 +31,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 
     testOptions {
diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle
index c6a3924ccb4e..40cfeb019396 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle
+++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle
@@ -43,7 +43,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 
     testOptions {
diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle
index cb03abfdd1ba..23e4c80398bb 100644
--- a/packages/quick_actions/quick_actions_android/android/build.gradle
+++ b/packages/quick_actions/quick_actions_android/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle
index 7f6ac0676aa4..f11c5b644877 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -50,7 +50,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lint {
diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle
index e79af3e0d5a3..07dda6344b79 100644
--- a/packages/url_launcher/url_launcher_android/android/build.gradle
+++ b/packages/url_launcher/url_launcher_android/android/build.gradle
@@ -29,7 +29,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        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 21bb6c5f2a57..f2c6c78d6d19 100644
--- a/packages/video_player/video_player_android/android/build.gradle
+++ b/packages/video_player/video_player_android/android/build.gradle
@@ -29,7 +29,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     lint {
diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle
index b7ba05c4c618..1187d314e8eb 100644
--- a/packages/webview_flutter/webview_flutter_android/android/build.gradle
+++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle
@@ -38,7 +38,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

From ca8101a0af91fb021b50001847d76e9d1c785cda Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:21:15 -0500
Subject: [PATCH 4/9] lint

---
 packages/camera/camera_android/android/build.gradle           | 2 +-
 packages/espresso/android/build.gradle                        | 4 ++--
 .../file_selector/file_selector_android/android/build.gradle  | 2 +-
 .../flutter_plugin_android_lifecycle/android/build.gradle     | 2 +-
 .../google_maps_flutter_android/android/build.gradle          | 2 +-
 .../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   | 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 +-
 .../url_launcher/url_launcher_android/android/build.gradle    | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
index 19c098c7300f..972a141f32ad 100644
--- a/packages/camera/camera_android/android/build.gradle
+++ b/packages/camera/camera_android/android/build.gradle
@@ -37,7 +37,7 @@ buildFeatures {
         minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index 420ea7a4f9bb..b0830eed104b 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -35,11 +35,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
-        baseline file("lint-baseline.xml")
+        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 41aeddb463c2..f39b8d10285f 100644
--- a/packages/file_selector/file_selector_android/android/build.gradle
+++ b/packages/file_selector/file_selector_android/android/build.gradle
@@ -42,7 +42,7 @@ android {
         testImplementation("org.robolectric:robolectric:4.16")
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle
index ce26a3efe61d..678a3bcb4365 100644
--- a/packages/flutter_plugin_android_lifecycle/android/build.gradle
+++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle
@@ -36,7 +36,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
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 590cbc277c31..5df8b776ecf4 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,7 +29,7 @@ android {
         minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
index e5f6cd8b5376..71a6ed0cee02 100644
--- a/packages/image_picker/image_picker_android/android/build.gradle
+++ b/packages/image_picker/image_picker_android/android/build.gradle
@@ -29,7 +29,7 @@ android {
         minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
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 165b5a0eff26..97b33277c23b 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,7 +34,7 @@ android {
         minSdk = 21
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle
index 16c0e03bc83a..18742f3611d5 100644
--- a/packages/local_auth/local_auth_android/android/build.gradle
+++ b/packages/local_auth/local_auth_android/android/build.gradle
@@ -35,7 +35,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index 53f11dfd91fc..297699b8f523 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 {
         minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
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 8eadbf980366..94e831eab439 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
@@ -46,7 +46,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle
index 23e4c80398bb..5dbe19a89793 100644
--- a/packages/quick_actions/quick_actions_android/android/build.gradle
+++ b/packages/quick_actions/quick_actions_android/android/build.gradle
@@ -29,7 +29,7 @@ android {
         minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle
index 07dda6344b79..09682aff1287 100644
--- a/packages/url_launcher/url_launcher_android/android/build.gradle
+++ b/packages/url_launcher/url_launcher_android/android/build.gradle
@@ -38,7 +38,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'

From 29e5fa537fea4b2f76b583ce8f96646012a3e659 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:23:01 -0500
Subject: [PATCH 5/9] Proguard

---
 packages/flutter_plugin_android_lifecycle/android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle
index 678a3bcb4365..5d2f2fdde437 100644
--- a/packages/flutter_plugin_android_lifecycle/android/build.gradle
+++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle
@@ -28,7 +28,7 @@ android {
     defaultConfig {
         minSdk = 24
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'proguard.txt'
+        consumerProguardFiles("proguard.txt")
     }
 
     compileOptions {

From 32c2ec69430939e7d16142cced40fba001f94f69 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:27:54 -0500
Subject: [PATCH 6/9] Whitespace

---
 packages/camera/camera_android/android/build.gradle           | 4 +++-
 .../google_maps_flutter_android/android/build.gradle          | 1 +
 .../google_sign_in_android/android/build.gradle               | 1 -
 .../image_picker/image_picker_android/android/build.gradle    | 2 ++
 .../in_app_purchase_android/android/build.gradle              | 3 ++-
 packages/local_auth/local_auth_android/android/build.gradle   | 1 -
 .../path_provider/path_provider_android/android/build.gradle  | 3 ++-
 .../quick_actions/quick_actions_android/android/build.gradle  | 1 +
 .../shared_preferences_android/android/build.gradle           | 3 ++-
 .../url_launcher/url_launcher_android/android/build.gradle    | 1 -
 .../video_player/video_player_android/android/build.gradle    | 3 +++
 11 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
index 972a141f32ad..85af8446ba3f 100644
--- a/packages/camera/camera_android/android/build.gradle
+++ b/packages/camera/camera_android/android/build.gradle
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-buildFeatures {
+    buildFeatures {
         buildConfig = true
     }
     namespace = "io.flutter.plugins.camera"
@@ -37,11 +37,13 @@ buildFeatures {
         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
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 5df8b776ecf4..915ad7cdddc9 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,6 +29,7 @@ android {
         minSdk = 24
         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 b44d5fd9a5de..2a944e8846c3 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
@@ -53,7 +53,6 @@ android {
         baseline = file("lint-baseline.xml")
     }
 
-
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
index 71a6ed0cee02..f7cb2564f46b 100644
--- a/packages/image_picker/image_picker_android/android/build.gradle
+++ b/packages/image_picker/image_picker_android/android/build.gradle
@@ -29,11 +29,13 @@ android {
         minSdk = 24
         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 97b33277c23b..1ccc6339ef65 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,17 +34,18 @@ android {
         minSdk = 21
         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.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle
index 18742f3611d5..4841580f8376 100644
--- a/packages/local_auth/local_auth_android/android/build.gradle
+++ b/packages/local_auth/local_auth_android/android/build.gradle
@@ -41,7 +41,6 @@ android {
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
     }
 
-
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle
index 297699b8f523..6201b8529533 100644
--- a/packages/path_provider/path_provider_android/android/build.gradle
+++ b/packages/path_provider/path_provider_android/android/build.gradle
@@ -29,17 +29,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.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle
index 5dbe19a89793..65d9fee552f3 100644
--- a/packages/quick_actions/quick_actions_android/android/build.gradle
+++ b/packages/quick_actions/quick_actions_android/android/build.gradle
@@ -29,6 +29,7 @@ android {
         minSdk = 24
         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 f11c5b644877..98f49676199a 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -53,12 +53,14 @@ android {
         minSdk = 24
         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")
@@ -71,7 +73,6 @@ android {
         testImplementation("io.mockk:mockk:1.14.9")
     }
 
-
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle
index 09682aff1287..221e6292fb9b 100644
--- a/packages/url_launcher/url_launcher_android/android/build.gradle
+++ b/packages/url_launcher/url_launcher_android/android/build.gradle
@@ -44,7 +44,6 @@ android {
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
     }
 
-
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle
index f2c6c78d6d19..472d36727a96 100644
--- a/packages/video_player/video_player_android/android/build.gradle
+++ b/packages/video_player/video_player_android/android/build.gradle
@@ -32,16 +32,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 2fa1dd07db936609a8a611e20b1ba30a472892bc Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:28:34 -0500
Subject: [PATCH 7/9] Revert examples

---
 .../example/android/settings.gradle                           | 2 +-
 .../example/android/app/build.gradle                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle
index d24c400c7113..c2dd5379a768 100644
--- a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle
+++ b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle
@@ -24,7 +24,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.1")
+        classpath "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.1"
     }
 }
 
diff --git a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
index c15d9d44c9a5..806bea4e4e6a 100644
--- a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.9.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+        classpath 'com.android.tools.build:gradle:8.9.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

From 9f81ec775c17342e8de717fa69e75841096f5a30 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 13:29:13 -0500
Subject: [PATCH 8/9] Dependencies

---
 packages/espresso/android/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index b0830eed104b..cadf4a2c1cf5 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -57,10 +57,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")

From 160d79274ad71fa976d120014ccb1c6e641769a6 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Tue, 3 Mar 2026 15:19:37 -0500
Subject: [PATCH 9/9] Revert local_auth

---
 packages/local_auth/local_auth_android/android/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle
index 4841580f8376..02f2f41c7dfb 100644
--- a/packages/local_auth/local_auth_android/android/build.gradle
+++ b/packages/local_auth/local_auth_android/android/build.gradle
@@ -26,7 +26,7 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
-        minSdk = 24
+        minSdkVersion 24
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -35,12 +35,13 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    lint {
+    lintOptions {
         checkAllWarnings = true
         warningsAsErrors = true
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
     }
 
+
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true