From c4ae5da80562d965edf024319c89217c3b2390f1 Mon Sep 17 00:00:00 2001 From: Camille Simon Date: Mon, 28 Apr 2025 11:19:04 -0700 Subject: [PATCH 1/4] bump ap build compilesdk to 35 --- script/tool/lib/src/create_all_packages_app_command.dart | 4 ++-- script/tool/test/create_all_packages_app_command_test.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/tool/lib/src/create_all_packages_app_command.dart b/script/tool/lib/src/create_all_packages_app_command.dart index 812c32133b25..2385af12657a 100644 --- a/script/tool/lib/src/create_all_packages_app_command.dart +++ b/script/tool/lib/src/create_all_packages_app_command.dart @@ -243,9 +243,9 @@ dependencies {} gradleFile, replacements: >{ if (gradleFileIsKotlin) - 'compileSdk': ['compileSdk = 34'] + 'compileSdk': ['compileSdk = 35'] else ...>{ - 'compileSdkVersion': ['compileSdk 34'], + 'compileSdkVersion': ['compileSdk 35'], } }, regexReplacements: >{ diff --git a/script/tool/test/create_all_packages_app_command_test.dart b/script/tool/test/create_all_packages_app_command_test.dart index 30ef798fff0a..386a9a07a499 100644 --- a/script/tool/test/create_all_packages_app_command_test.dart +++ b/script/tool/test/create_all_packages_app_command_test.dart @@ -339,7 +339,7 @@ android { buildGradle, containsAll([ contains('This is the legacy file'), - contains('compileSdk 34'), + contains('compileSdk 35'), ])); }); @@ -372,7 +372,7 @@ android { expect( buildGradle, containsAll([ - contains('compileSdk 34'), + contains('compileSdk 35'), contains('androidx.lifecycle:lifecycle-runtime'), ])); }); From 23bb9847de3baadb64807274473f9ad32fb9ae54 Mon Sep 17 00:00:00 2001 From: Camille Simon Date: Mon, 28 Apr 2025 11:41:44 -0700 Subject: [PATCH 2/4] bump AGP version --- .ci/legacy_project/all_packages/android/settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/legacy_project/all_packages/android/settings.gradle b/.ci/legacy_project/all_packages/android/settings.gradle index 02d009e408b1..f3d3df7186c2 100644 --- a/.ci/legacy_project/all_packages/android/settings.gradle +++ b/.ci/legacy_project/all_packages/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.0.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.9.0" apply false } From e60578ed9a91a57c81ecf8136d36c2c00168aa95 Mon Sep 17 00:00:00 2001 From: Camille Simon Date: Mon, 28 Apr 2025 12:10:27 -0700 Subject: [PATCH 3/4] Bump Gradle version --- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties b/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties index b8793d3c0d69..89e56bdb6006 100644 --- a/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties +++ b/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip From 9497fe6c61aae55bfeffa7c86348149d94c753fd Mon Sep 17 00:00:00 2001 From: Camille Simon Date: Tue, 29 Apr 2025 15:59:01 -0700 Subject: [PATCH 4/4] test java version bump, go back to look at todos --- .ci.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 38ba297be117..553313d9e6eb 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -413,10 +413,9 @@ targets: # This file only builds a *legacy* version of the project. target_file: android_build_all_packages_legacy.yaml channel: master - # The legacy project build requires an older JDK. dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"} + {"dependency": "open_jdk", "version": "version:17"} ] env_variables: >- { @@ -445,10 +444,9 @@ targets: # This file only builds a *legacy* version of the project. target_file: android_build_all_packages_legacy.yaml channel: stable - # The legacy project build requires an older JDK. dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"} + {"dependency": "open_jdk", "version": "version:17"} ] env_variables: >- {