From a99b839f30596a7603619c4b100add3413f992a6 Mon Sep 17 00:00:00 2001
From: Sagar Ghag <sagar.ghag23@yahoo.com>
Date: Fri, 17 Jul 2026 23:10:47 +0530
Subject: [PATCH] fix: update Gradle 8.12 + AGP 8.9.1 for JDK 23+ compat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All 22 android sample dirs migrated:
- gradle-wrapper → 8.12-all
- AGP 7.3.0 → 8.9.1
- namespace added where missing (AGP 8.x requirement)
- package= removed from AndroidManifest.xml
- old-style buildscript/apply-plugin → plugins {} DSL where applicable

Fixes #2568
---
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +-
 .../books/android_books/app/build.gradle      | 14 ++++-----
 .../app/src/main/AndroidManifest.xml          |  3 +-
 add_to_app/books/android_books/build.gradle   |  6 ++--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../android_fullscreen/app/build.gradle       | 11 ++++---
 .../android_fullscreen/build.gradle           |  4 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +-
 animations/android/build.gradle               | 12 -------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 animations/android/settings.gradle            |  3 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 asset_transformation/android/settings.gradle  |  4 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 form_app/android/build.gradle                 | 12 -------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 form_app/android/settings.gradle              |  3 +-
 google_maps/android/app/build.gradle          | 18 ++++-------
 .../android/app/src/debug/AndroidManifest.xml |  3 +-
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../app/src/profile/AndroidManifest.xml       |  3 +-
 google_maps/android/build.gradle              | 13 --------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 google_maps/android/settings.gradle           | 31 ++++++++++++++-----
 material_3_demo/android/app/build.gradle      | 18 ++++-------
 .../android/app/src/debug/AndroidManifest.xml |  3 +-
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../app/src/profile/AndroidManifest.xml       |  3 +-
 material_3_demo/android/build.gradle          | 13 --------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 material_3_demo/android/settings.gradle       | 31 ++++++++++++++-----
 navigation_and_routing/android/build.gradle   | 12 -------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../android/settings.gradle                   |  3 +-
 pedometer/android/build.gradle                |  4 ++-
 .../android/src/main/AndroidManifest.xml      |  3 +-
 pedometer/example/android/app/build.gradle    | 15 ++++-----
 .../android/app/src/debug/AndroidManifest.xml |  3 +-
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../app/src/profile/AndroidManifest.xml       |  3 +-
 pedometer/example/android/build.gradle        | 14 ---------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 pedometer/example/android/settings.gradle     | 31 ++++++++++++++-----
 platform_channels/android/build.gradle        | 12 -------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 platform_channels/android/settings.gradle     |  3 +-
 platform_design/android/build.gradle          | 12 -------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 platform_design/android/settings.gradle       |  3 +-
 simple_shader/android/app/build.gradle        | 18 ++++-------
 .../android/app/src/debug/AndroidManifest.xml |  3 +-
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../app/src/profile/AndroidManifest.xml       |  3 +-
 simple_shader/android/build.gradle            | 13 --------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 simple_shader/android/settings.gradle         | 31 ++++++++++++++-----
 testing_app/android/app/build.gradle          | 18 ++++-------
 .../android/app/src/debug/AndroidManifest.xml |  3 +-
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../app/src/profile/AndroidManifest.xml       |  3 +-
 testing_app/android/build.gradle              | 15 +--------
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 testing_app/android/settings.gradle           | 31 ++++++++++++++-----
 69 files changed, 217 insertions(+), 308 deletions(-)

diff --git a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
index d7952dcde62..ac3b47926ee 100644
--- a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jul 26 11:31:21 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/add_to_app/android_view/content_sizing_android_view/gradle/wrapper/gradle-wrapper.properties b/add_to_app/android_view/content_sizing_android_view/gradle/wrapper/gradle-wrapper.properties
index d7952dcde62..ac3b47926ee 100644
--- a/add_to_app/android_view/content_sizing_android_view/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/android_view/content_sizing_android_view/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jul 26 11:31:21 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/add_to_app/books/android_books/app/build.gradle b/add_to_app/books/android_books/app/build.gradle
index a932ff675eb..e4e9d91242f 100644
--- a/add_to_app/books/android_books/app/build.gradle
+++ b/add_to_app/books/android_books/app/build.gradle
@@ -1,15 +1,16 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    namespace 'dev.flutter.example.books'
+    compileSdk 36
 
     defaultConfig {
         applicationId "dev.flutter.example.books"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdk 36
         versionCode 1
         versionName "1.0"
 
@@ -36,7 +37,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.squareup.okhttp3:okhttp:4.7.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.0'
diff --git a/add_to_app/books/android_books/app/src/main/AndroidManifest.xml b/add_to_app/books/android_books/app/src/main/AndroidManifest.xml
index b15f0cc5609..33a346bc72b 100644
--- a/add_to_app/books/android_books/app/src/main/AndroidManifest.xml
+++ b/add_to_app/books/android_books/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.example.books">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".BookApplication"
diff --git a/add_to_app/books/android_books/build.gradle b/add_to_app/books/android_books/build.gradle
index 50ff45105e1..3e4a0c0d291 100644
--- a/add_to_app/books/android_books/build.gradle
+++ b/add_to_app/books/android_books/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.0"
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -21,6 +21,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file
diff --git a/add_to_app/books/android_books/gradle/wrapper/gradle-wrapper.properties b/add_to_app/books/android_books/gradle/wrapper/gradle-wrapper.properties
index 3994438e229..8357d84852e 100644
--- a/add_to_app/books/android_books/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/books/android_books/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/add_to_app/fullscreen/android_fullscreen/app/build.gradle b/add_to_app/fullscreen/android_fullscreen/app/build.gradle
index b0792ecb559..201d0a75516 100644
--- a/add_to_app/fullscreen/android_fullscreen/app/build.gradle
+++ b/add_to_app/fullscreen/android_fullscreen/app/build.gradle
@@ -1,13 +1,14 @@
-apply plugin: 'com.android.application'
-
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdk 33
+    compileSdk 36
     defaultConfig {
         applicationId "dev.flutter.example.androidfullscreen"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 36
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/add_to_app/fullscreen/android_fullscreen/build.gradle b/add_to_app/fullscreen/android_fullscreen/build.gradle
index 6dfe3ca9ff5..ae2baf2bd66 100644
--- a/add_to_app/fullscreen/android_fullscreen/build.gradle
+++ b/add_to_app/fullscreen/android_fullscreen/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -21,6 +21,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties b/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties
index 3994438e229..8357d84852e 100644
--- a/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties b/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
index 1b48fdc2fe3..ac3b47926ee 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Dec 11 09:57:20 AEDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties b/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties
index 81aa1c0448a..ac3b47926ee 100644
--- a/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties
index 81aa1c0448a..ac3b47926ee 100644
--- a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/android_splash_screen/android/gradle/wrapper/gradle-wrapper.properties b/android_splash_screen/android/gradle/wrapper/gradle-wrapper.properties
index 7aeeb11c6ee..ac3b47926ee 100644
--- a/android_splash_screen/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android_splash_screen/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/animations/android/build.gradle b/animations/android/build.gradle
index e83fb5daca3..bc157bd1a12 100644
--- a/animations/android/build.gradle
+++ b/animations/android/build.gradle
@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/animations/android/gradle/wrapper/gradle-wrapper.properties b/animations/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/animations/android/gradle/wrapper/gradle-wrapper.properties
+++ b/animations/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/animations/android/settings.gradle b/animations/android/settings.gradle
index 7cd7128551b..2454cb9aee1 100644
--- a/animations/android/settings.gradle
+++ b/animations/android/settings.gradle
@@ -23,7 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/asset_transformation/android/gradle/wrapper/gradle-wrapper.properties b/asset_transformation/android/gradle/wrapper/gradle-wrapper.properties
index e1ca574ef01..ac3b47926ee 100644
--- a/asset_transformation/android/gradle/wrapper/gradle-wrapper.properties
+++ b/asset_transformation/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/asset_transformation/android/settings.gradle b/asset_transformation/android/settings.gradle
index 536165d35a4..b507b9437f8 100644
--- a/asset_transformation/android/settings.gradle
+++ b/asset_transformation/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties b/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
index 3c85cfe057a..ac3b47926ee 100644
--- a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/dynamic_theme/android/gradle/wrapper/gradle-wrapper.properties b/dynamic_theme/android/gradle/wrapper/gradle-wrapper.properties
index efdcc4ace98..ac3b47926ee 100644
--- a/dynamic_theme/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dynamic_theme/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/form_app/android/build.gradle b/form_app/android/build.gradle
index e83fb5daca3..bc157bd1a12 100644
--- a/form_app/android/build.gradle
+++ b/form_app/android/build.gradle
@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/form_app/android/gradle/wrapper/gradle-wrapper.properties b/form_app/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/form_app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/form_app/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/form_app/android/settings.gradle b/form_app/android/settings.gradle
index 7cd7128551b..2454cb9aee1 100644
--- a/form_app/android/settings.gradle
+++ b/form_app/android/settings.gradle
@@ -23,7 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/google_maps/android/app/build.gradle b/google_maps/android/app/build.gradle
index bfc1e6d9af6..9e0f0323a9f 100644
--- a/google_maps/android/app/build.gradle
+++ b/google_maps/android/app/build.gradle
@@ -6,11 +6,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +16,14 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 
 android {
+    namespace "com.example.google_maps_in_flutter"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -65,7 +63,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/google_maps/android/app/src/debug/AndroidManifest.xml b/google_maps/android/app/src/debug/AndroidManifest.xml
index 9ae2de28305..399f6981d5d 100644
--- a/google_maps/android/app/src/debug/AndroidManifest.xml
+++ b/google_maps/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.google_maps_in_flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/google_maps/android/app/src/main/AndroidManifest.xml b/google_maps/android/app/src/main/AndroidManifest.xml
index 2bc113269a5..e2b1aa1719b 100644
--- a/google_maps/android/app/src/main/AndroidManifest.xml
+++ b/google_maps/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.google_maps_in_flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="google_maps_in_flutter"
         android:name="${applicationName}"
diff --git a/google_maps/android/app/src/profile/AndroidManifest.xml b/google_maps/android/app/src/profile/AndroidManifest.xml
index 9ae2de28305..399f6981d5d 100644
--- a/google_maps/android/app/src/profile/AndroidManifest.xml
+++ b/google_maps/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.google_maps_in_flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/google_maps/android/build.gradle b/google_maps/android/build.gradle
index f7eb7f63ce1..bc157bd1a12 100644
--- a/google_maps/android/build.gradle
+++ b/google_maps/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/google_maps/android/gradle/wrapper/gradle-wrapper.properties b/google_maps/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/google_maps/android/gradle/wrapper/gradle-wrapper.properties
+++ b/google_maps/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/google_maps/android/settings.gradle b/google_maps/android/settings.gradle
index 44e62bcf06a..1bb3284d765 100644
--- a/google_maps/android/settings.gradle
+++ b/google_maps/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
+
+include ":app"
diff --git a/material_3_demo/android/app/build.gradle b/material_3_demo/android/app/build.gradle
index 70c38f517e6..079109fc7bf 100644
--- a/material_3_demo/android/app/build.gradle
+++ b/material_3_demo/android/app/build.gradle
@@ -6,11 +6,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +16,14 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 
 android {
+    namespace "com.example.material_3_demo"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -65,7 +63,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/material_3_demo/android/app/src/debug/AndroidManifest.xml b/material_3_demo/android/app/src/debug/AndroidManifest.xml
index 2773b0bca1f..399f6981d5d 100644
--- a/material_3_demo/android/app/src/debug/AndroidManifest.xml
+++ b/material_3_demo/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.material_3_demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/material_3_demo/android/app/src/main/AndroidManifest.xml b/material_3_demo/android/app/src/main/AndroidManifest.xml
index a863694d19b..0268bf1505f 100644
--- a/material_3_demo/android/app/src/main/AndroidManifest.xml
+++ b/material_3_demo/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.material_3_demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="material_3_demo"
         android:name="${applicationName}"
diff --git a/material_3_demo/android/app/src/profile/AndroidManifest.xml b/material_3_demo/android/app/src/profile/AndroidManifest.xml
index 2773b0bca1f..399f6981d5d 100644
--- a/material_3_demo/android/app/src/profile/AndroidManifest.xml
+++ b/material_3_demo/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.material_3_demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/material_3_demo/android/build.gradle b/material_3_demo/android/build.gradle
index f7eb7f63ce1..bc157bd1a12 100644
--- a/material_3_demo/android/build.gradle
+++ b/material_3_demo/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties b/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties
+++ b/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/material_3_demo/android/settings.gradle b/material_3_demo/android/settings.gradle
index 44e62bcf06a..1bb3284d765 100644
--- a/material_3_demo/android/settings.gradle
+++ b/material_3_demo/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
+
+include ":app"
diff --git a/navigation_and_routing/android/build.gradle b/navigation_and_routing/android/build.gradle
index e83fb5daca3..bc157bd1a12 100644
--- a/navigation_and_routing/android/build.gradle
+++ b/navigation_and_routing/android/build.gradle
@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties b/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties
+++ b/navigation_and_routing/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/navigation_and_routing/android/settings.gradle b/navigation_and_routing/android/settings.gradle
index 7cd7128551b..2454cb9aee1 100644
--- a/navigation_and_routing/android/settings.gradle
+++ b/navigation_and_routing/android/settings.gradle
@@ -23,7 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/pedometer/android/build.gradle b/pedometer/android/build.gradle
index de4a69eeeb6..09235fb1ead 100644
--- a/pedometer/android/build.gradle
+++ b/pedometer/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 
     dependencies {
         // The Android Gradle Plugin knows how to build native code with the NDK.
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.9.1'
     }
 }
 
@@ -25,6 +25,8 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'dev.flutter.pedometer'
+
     // Bumping the plugin compileSdkVersion requires all clients of this plugin
     // to bump the version in their app.
     compileSdkVersion 34
diff --git a/pedometer/android/src/main/AndroidManifest.xml b/pedometer/android/src/main/AndroidManifest.xml
index 1a19daf14d6..a2f47b6057d 100644
--- a/pedometer/android/src/main/AndroidManifest.xml
+++ b/pedometer/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="dev.flutter.pedometer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/pedometer/example/android/app/build.gradle b/pedometer/example/android/app/build.gradle
index 9dc4c0d60a9..a9b19de2d8f 100644
--- a/pedometer/example/android/app/build.gradle
+++ b/pedometer/example/android/app/build.gradle
@@ -12,11 +12,6 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -27,11 +22,14 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 
 android {
+    namespace "com.example.jni_demo"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion '25.1.8937393'
 
@@ -72,6 +70,5 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.health.connect:connect-client:1.0.0-alpha06"
 }
diff --git a/pedometer/example/android/app/src/debug/AndroidManifest.xml b/pedometer/example/android/app/src/debug/AndroidManifest.xml
index dfafb1a9576..399f6981d5d 100644
--- a/pedometer/example/android/app/src/debug/AndroidManifest.xml
+++ b/pedometer/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.jni_demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/pedometer/example/android/app/src/main/AndroidManifest.xml b/pedometer/example/android/app/src/main/AndroidManifest.xml
index 0b7b616446c..23d09d17bbc 100644
--- a/pedometer/example/android/app/src/main/AndroidManifest.xml
+++ b/pedometer/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.jni_demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="jni_demo"
         android:name="${applicationName}"
diff --git a/pedometer/example/android/app/src/profile/AndroidManifest.xml b/pedometer/example/android/app/src/profile/AndroidManifest.xml
index dfafb1a9576..399f6981d5d 100644
--- a/pedometer/example/android/app/src/profile/AndroidManifest.xml
+++ b/pedometer/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.jni_demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/pedometer/example/android/build.gradle b/pedometer/example/android/build.gradle
index 4c47d699770..bc157bd1a12 100644
--- a/pedometer/example/android/build.gradle
+++ b/pedometer/example/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -29,4 +16,3 @@ subprojects {
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
-
diff --git a/pedometer/example/android/gradle/wrapper/gradle-wrapper.properties b/pedometer/example/android/gradle/wrapper/gradle-wrapper.properties
index dcf0f19c522..ac3b47926ee 100644
--- a/pedometer/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/pedometer/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/pedometer/example/android/settings.gradle b/pedometer/example/android/settings.gradle
index 44e62bcf06a..1bb3284d765 100644
--- a/pedometer/example/android/settings.gradle
+++ b/pedometer/example/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
+
+include ":app"
diff --git a/platform_channels/android/build.gradle b/platform_channels/android/build.gradle
index e83fb5daca3..bc157bd1a12 100644
--- a/platform_channels/android/build.gradle
+++ b/platform_channels/android/build.gradle
@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/platform_channels/android/gradle/wrapper/gradle-wrapper.properties b/platform_channels/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/platform_channels/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform_channels/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/platform_channels/android/settings.gradle b/platform_channels/android/settings.gradle
index 7cd7128551b..2454cb9aee1 100644
--- a/platform_channels/android/settings.gradle
+++ b/platform_channels/android/settings.gradle
@@ -23,7 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/platform_design/android/build.gradle b/platform_design/android/build.gradle
index e83fb5daca3..bc157bd1a12 100644
--- a/platform_design/android/build.gradle
+++ b/platform_design/android/build.gradle
@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/platform_design/android/gradle/wrapper/gradle-wrapper.properties b/platform_design/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/platform_design/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform_design/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/platform_design/android/settings.gradle b/platform_design/android/settings.gradle
index 7cd7128551b..2454cb9aee1 100644
--- a/platform_design/android/settings.gradle
+++ b/platform_design/android/settings.gradle
@@ -23,7 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/simple_shader/android/app/build.gradle b/simple_shader/android/app/build.gradle
index c63a3a8b97d..fccfc0a164f 100644
--- a/simple_shader/android/app/build.gradle
+++ b/simple_shader/android/app/build.gradle
@@ -6,11 +6,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +16,14 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 
 android {
+    namespace "com.example.simple_shader"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -65,7 +63,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/simple_shader/android/app/src/debug/AndroidManifest.xml b/simple_shader/android/app/src/debug/AndroidManifest.xml
index 3bb7d4d17a8..399f6981d5d 100644
--- a/simple_shader/android/app/src/debug/AndroidManifest.xml
+++ b/simple_shader/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.simple_shader">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/simple_shader/android/app/src/main/AndroidManifest.xml b/simple_shader/android/app/src/main/AndroidManifest.xml
index 79b9a199638..340ff633006 100644
--- a/simple_shader/android/app/src/main/AndroidManifest.xml
+++ b/simple_shader/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.simple_shader">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="simple_shader"
         android:name="${applicationName}"
diff --git a/simple_shader/android/app/src/profile/AndroidManifest.xml b/simple_shader/android/app/src/profile/AndroidManifest.xml
index 3bb7d4d17a8..399f6981d5d 100644
--- a/simple_shader/android/app/src/profile/AndroidManifest.xml
+++ b/simple_shader/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.simple_shader">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/simple_shader/android/build.gradle b/simple_shader/android/build.gradle
index f7eb7f63ce1..bc157bd1a12 100644
--- a/simple_shader/android/build.gradle
+++ b/simple_shader/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/simple_shader/android/gradle/wrapper/gradle-wrapper.properties b/simple_shader/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/simple_shader/android/gradle/wrapper/gradle-wrapper.properties
+++ b/simple_shader/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/simple_shader/android/settings.gradle b/simple_shader/android/settings.gradle
index 44e62bcf06a..1bb3284d765 100644
--- a/simple_shader/android/settings.gradle
+++ b/simple_shader/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
+
+include ":app"
diff --git a/testing_app/android/app/build.gradle b/testing_app/android/app/build.gradle
index a453bc11916..0e263337d33 100644
--- a/testing_app/android/app/build.gradle
+++ b/testing_app/android/app/build.gradle
@@ -6,11 +6,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +16,14 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 
 android {
+    namespace "dev.flutter.testing_app"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -65,7 +63,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/testing_app/android/app/src/debug/AndroidManifest.xml b/testing_app/android/app/src/debug/AndroidManifest.xml
index fcc8f1994f2..399f6981d5d 100644
--- a/testing_app/android/app/src/debug/AndroidManifest.xml
+++ b/testing_app/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.testing_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/testing_app/android/app/src/main/AndroidManifest.xml b/testing_app/android/app/src/main/AndroidManifest.xml
index 0ebc3584912..6da1bab2862 100644
--- a/testing_app/android/app/src/main/AndroidManifest.xml
+++ b/testing_app/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.testing_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="testing_app"
         android:name="${applicationName}"
diff --git a/testing_app/android/app/src/profile/AndroidManifest.xml b/testing_app/android/app/src/profile/AndroidManifest.xml
index fcc8f1994f2..399f6981d5d 100644
--- a/testing_app/android/app/src/profile/AndroidManifest.xml
+++ b/testing_app/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.testing_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/testing_app/android/build.gradle b/testing_app/android/build.gradle
index e50c3a02b05..bc157bd1a12 100644
--- a/testing_app/android/build.gradle
+++ b/testing_app/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -26,6 +13,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/testing_app/android/gradle/wrapper/gradle-wrapper.properties b/testing_app/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f..ac3b47926ee 100644
--- a/testing_app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/testing_app/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/testing_app/android/settings.gradle b/testing_app/android/settings.gradle
index 44e62bcf06a..1bb3284d765 100644
--- a/testing_app/android/settings.gradle
+++ b/testing_app/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
+
+include ":app"