Skip to content

Commit 8fddd1c

Browse files
authored
[AGP 9] Update remaining tests to AGP 9 (flutter#191824)
Updated remaining tests to AGP 9 including some add-to-app scenario tests. Had to manually add newDsl (as expected) and migrate to built-in kotlin. Fixes flutter#189386 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 1480514 commit 8fddd1c

20 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎dev/benchmarks/multiple_flutters/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
// Top-level build file where you can add configuration options common to all sub-projects/modules.
66
buildscript {
7-
ext.kotlin_version = "2.2.20"
7+
ext.kotlin_version = "2.4.0"
88
repositories {
99
google()
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:8.11.1'
13+
classpath 'com.android.tools.build:gradle:9.1.0'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515

1616
// Do not place your application dependencies here; they belong
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Feb 24 15:28:21 EST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ List<VersionTuple> versionTuples = <VersionTuple>[
2222
// TODO(jesswon): Separate max known once there exists a newer one: https://github.com/flutter/flutter/issues/189112.
2323
VersionTuple(agpVersion: '9.1.0', gradleVersion: '9.3.1', kotlinVersion: '2.4.0'),
2424
/* Others */
25-
VersionTuple(agpVersion: '8.11.1', gradleVersion: '8.14', kotlinVersion: '2.2.20'),
2625
VersionTuple(agpVersion: '8.12.0', gradleVersion: '8.14', kotlinVersion: '2.2.20'),
2726
]; // Max length is 7 entries until this test is split See https://github.com/flutter/flutter/issues/167495.
2827

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ Future<void> main() async {
452452
// Pre AGP 8.3
453453
ModuleTest(gradleVersion: '8.4', agpVersion: Version.parse('8.2.1')).call,
454454
// Post AGP 8.3 + rc candidates can work
455-
ModuleTest(gradleVersion: '8.13-rc-1', agpVersion: Version.parse('8.8.1')).call,
455+
ModuleTest(gradleVersion: '9.3.1', agpVersion: Version.parse('9.1.0')).call,
456456
]),
457457
);
458458
}

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,5 +390,5 @@ class ModuleTest {
390390
}
391391

392392
Future<void> main() async {
393-
await task(combine(<TaskFunction>[ModuleTest(gradleVersion: '8.14').call]));
393+
await task(combine(<TaskFunction>[ModuleTest(gradleVersion: '9.3.1').call]));
394394
}

‎dev/integration_tests/deferred_components_test/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
// See dev/tools/bin/generate_gradle_lockfiles.dart.
88

99
buildscript {
10-
ext.kotlin_version = '2.2.0'
10+
ext.kotlin_version = '2.4.0'
1111
repositories {
1212
google()
1313
mavenCentral()
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:8.11.0'
17+
classpath 'com.android.tools.build:gradle:9.1.0'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

‎dev/integration_tests/module_host_with_custom_build_v2_embedding/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
mavenCentral()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.11.1'
11+
classpath 'com.android.tools.build:gradle:9.1.0'
1212
}
1313
}
1414

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
3+
android.newDsl=false

‎dev/integration_tests/module_host_with_custom_build_v2_embedding/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎dev/integration_tests/pure_android_host_apps/android_custom_host_app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
mavenCentral()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.11.1'
11+
classpath 'com.android.tools.build:gradle:9.1.0'
1212
}
1313
}
1414

0 commit comments

Comments
 (0)