Skip to content

[all_packages] Bump compileSdk version to 35 #9168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
{
Expand Down Expand Up @@ -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: >-
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .ci/legacy_project/all_packages/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions script/tool/lib/src/create_all_packages_app_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ dependencies {}
gradleFile,
replacements: <String, List<String>>{
if (gradleFileIsKotlin)
'compileSdk': <String>['compileSdk = 34']
'compileSdk': <String>['compileSdk = 35']
else ...<String, List<String>>{
'compileSdkVersion': <String>['compileSdk 34'],
'compileSdkVersion': <String>['compileSdk 35'],
}
},
regexReplacements: <RegExp, List<String>>{
Expand Down
4 changes: 2 additions & 2 deletions script/tool/test/create_all_packages_app_command_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ android {
buildGradle,
containsAll(<Matcher>[
contains('This is the legacy file'),
contains('compileSdk 34'),
contains('compileSdk 35'),
]));
});

Expand Down Expand Up @@ -372,7 +372,7 @@ android {
expect(
buildGradle,
containsAll(<Matcher>[
contains('compileSdk 34'),
contains('compileSdk 35'),
contains('androidx.lifecycle:lifecycle-runtime'),
]));
});
Expand Down