Skip to content

Commit b19b680

Browse files
gmackallGray Mackall
andauthored
Fix regression to hardcoded AGP/Kotlin values in Android module templates (#160108)
flutter/flutter#159770 regressed the module templates to use a hardcoded `8.7.0` and `1.8.22` as the AGP and Kotlin versions respectively. This PR returns them to using the template context values. ## 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. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [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 <mackall@google.com>
1 parent a0f2424 commit b19b680

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ pluginManagement {
2020

2121
plugins {
2222
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
23-
id "com.android.library" version "8.7.0" apply false
24-
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
23+
id "com.android.library" version "{{agpVersionForModule}}" apply false
24+
id "org.jetbrains.kotlin.android" version "{{kotlinVersion}}" apply false
2525
}
2626

2727
include ':app'

packages/flutter_tools/templates/template_manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"templates/module/android/host_app_common/app.tmpl/src/main/res/mipmap-hdpi/ic_launcher.png",
165165
"templates/module/android/host_app_common/app.tmpl/src/main/res/values/styles.xml",
166166
"templates/module/android/host_app_editable/settings.gradle.copy.tmpl",
167-
"templates/module/android/host_app_ephemeral/settings.gradle.copy.tmpl",
167+
"templates/module/android/host_app_ephemeral/settings.gradle.tmpl",
168168
"templates/module/android/library/Flutter.tmpl/build.gradle.tmpl",
169169
"templates/module/android/library/Flutter.tmpl/flutter.iml.copy.tmpl",
170170
"templates/module/android/library/Flutter.tmpl/src/main/AndroidManifest.xml.tmpl",

0 commit comments

Comments
 (0)