From 8b501d9e3faeb1bde9cc1af7a0d2c1df4fce68d3 Mon Sep 17 00:00:00 2001 From: Sagar Ghag 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 +- compass_app/app/lib/routing/router.dart | 4 +-- .../home/widgets/home_screen_container.dart | 5 +-- .../Flutter/GeneratedPluginRegistrant.swift | 2 -- .../ui/home/widgets/home_screen_test.dart | 5 +-- .../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 ++++++++++++++----- .../lib/pedometer_bindings_generated.dart | 4 ++- 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 ++++++++++++++----- 74 files changed, 223 insertions(+), 322 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 @@ - + GoRouter( authRepository: context.read(), itineraryConfigRepository: context.read(), ); - return HomeScreenContainer( - logoutViewModel: logoutViewModel, - ); + return HomeScreenContainer(logoutViewModel: logoutViewModel); }, routes: [ GoRoute( diff --git a/compass_app/app/lib/ui/home/widgets/home_screen_container.dart b/compass_app/app/lib/ui/home/widgets/home_screen_container.dart index 31608b1a530..5ec0cbcf701 100644 --- a/compass_app/app/lib/ui/home/widgets/home_screen_container.dart +++ b/compass_app/app/lib/ui/home/widgets/home_screen_container.dart @@ -8,10 +8,7 @@ import '../view_models/home_viewmodel.dart'; import 'home_screen.dart'; class HomeScreenContainer extends StatefulWidget { - const HomeScreenContainer({ - super.key, - required this.logoutViewModel, - }); + const HomeScreenContainer({super.key, required this.logoutViewModel}); final LogoutViewModel logoutViewModel; diff --git a/compass_app/app/macos/Flutter/GeneratedPluginRegistrant.swift b/compass_app/app/macos/Flutter/GeneratedPluginRegistrant.swift index 8c02029d1e4..8255a0b9913 100644 --- a/compass_app/app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/compass_app/app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,13 +5,11 @@ import FlutterMacOS import Foundation -import path_provider_foundation import share_plus import shared_preferences_foundation import sqflite_darwin func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) diff --git a/compass_app/app/test/ui/home/widgets/home_screen_test.dart b/compass_app/app/test/ui/home/widgets/home_screen_test.dart index a9998110043..4464f53254d 100644 --- a/compass_app/app/test/ui/home/widgets/home_screen_test.dart +++ b/compass_app/app/test/ui/home/widgets/home_screen_test.dart @@ -43,10 +43,7 @@ void main() { Future loadWidget(WidgetTester tester) async { await testApp( tester, - HomeScreen( - viewModel: viewModel, - logoutViewModel: logoutViewModel, - ), + HomeScreen(viewModel: viewModel, logoutViewModel: logoutViewModel), goRouter: goRouter, ); } 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 @@ - +