From 70e31b48bf81c182d2aa0990f78cd28114e85cf2 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:13:24 -0800 Subject: [PATCH] Bump AGP/Gradle/Kotlin warn versions (#158839) Bumps the versions up a bit, so we can keep people moving forward. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [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]. - [ ] 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]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [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 --------- Co-authored-by: Gray Mackall --- .../src/main/kotlin/dependency_version_checker.gradle.kts | 6 +++--- .../android_dependency_version_checking_test.dart | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts b/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts index 834038ae85..d785fb43b5 100644 --- a/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts +++ b/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts @@ -88,16 +88,16 @@ class DependencyVersionChecker { // Before updating any "error" version, ensure that you have updated the corresponding // "warn" version for a full release to provide advanced warning. See // flutter.dev/go/android-dependency-versions for more. - val warnGradleVersion: Version = Version(7, 1, 0) + val warnGradleVersion: Version = Version(7, 4, 2) val errorGradleVersion: Version = Version(7, 0, 2) val warnJavaVersion: JavaVersion = JavaVersion.VERSION_11 val errorJavaVersion: JavaVersion = JavaVersion.VERSION_1_1 - val warnAGPVersion: Version = Version(7, 0, 1) + val warnAGPVersion: Version = Version(7, 3, 1) val errorAGPVersion: Version = Version(7, 0, 0) - val warnKGPVersion: Version = Version(1, 7, 10) + val warnKGPVersion: Version = Version(1, 8, 10) val errorKGPVersion: Version = Version(1, 7, 0) /** diff --git a/packages/flutter_tools/test/android_java11_integration.shard/android_dependency_version_checking_test.dart b/packages/flutter_tools/test/android_java11_integration.shard/android_dependency_version_checking_test.dart index 97fe9839ad..547b3c36e2 100644 --- a/packages/flutter_tools/test/android_java11_integration.shard/android_dependency_version_checking_test.dart +++ b/packages/flutter_tools/test/android_java11_integration.shard/android_dependency_version_checking_test.dart @@ -30,7 +30,7 @@ void main() { testUsingContext( 'AGP version out of "warn" support band but in "error" band builds ' 'successfully and prints warning', () async { - final VersionTuple versionTuple = VersionTuple(agpVersion: '7.0.0', gradleVersion: '7.5', kotlinVersion: '1.7.10', compileSdkVersion: '34'); + final VersionTuple versionTuple = VersionTuple(agpVersion: '7.3.0', gradleVersion: '7.5', kotlinVersion: '1.7.10', compileSdkVersion: '34'); final ProcessResult result = await buildFlutterApkWithSpecifiedDependencyVersions( versions: versionTuple, tempDir: tempDir @@ -43,7 +43,7 @@ void main() { 'Gradle version out of "warn" support band but in "error" band builds ' 'successfully and prints warning', () async { // Create a new flutter project. - final VersionTuple versionTuple = VersionTuple(agpVersion: '7.0.0', gradleVersion: '7.0.2', kotlinVersion: '1.7.10', compileSdkVersion: '34'); + final VersionTuple versionTuple = VersionTuple(agpVersion: '7.3.0', gradleVersion: '7.4.1', kotlinVersion: '1.7.10', compileSdkVersion: '34'); final ProcessResult result = await buildFlutterApkWithSpecifiedDependencyVersions( versions: versionTuple, tempDir: tempDir @@ -55,7 +55,7 @@ void main() { testUsingContext( 'Kotlin version out of "warn" support band but in "error" band builds ' 'successfully and prints warning', () async { - final VersionTuple versionTuple = VersionTuple(agpVersion: '7.4.0', gradleVersion: '7.5', kotlinVersion: '1.7.0', compileSdkVersion: '34'); + final VersionTuple versionTuple = VersionTuple(agpVersion: '7.4.0', gradleVersion: '7.5', kotlinVersion: '1.8.0', compileSdkVersion: '34'); final ProcessResult result = await buildFlutterApkWithSpecifiedDependencyVersions( versions: versionTuple, tempDir: tempDir