Use Gradle KTS in new Android app projects by default #154061

bartekpacia · 2024-08-24T22:57:26Z

This PR resolves #151166

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
All existing and new tests are passing.

bartekpacia · 2024-08-26T17:33:07Z

should the plugins template be updated two ?

Not until #154125 gets merged to master and we wait a few days to get some confidence that it's not going to get reverted.

bartekpacia · 2024-09-20T19:23:31Z

packages/flutter_tools/lib/src/project.dart

+  static final List<RegExp> _declarativeKotlinPluginPatterns = <RegExp>[
+      RegExp('^\\s*id\\s*\\(?\\s*[\'"]kotlin-android[\'"]\\s*\\)?\\s*\$'),
+      RegExp('^\\s*id\\s*\\(?\\s*[\'"]org.jetbrains.kotlin.android[\'"]\\s*\\)?\\s*\$'),
+  ];
+


Here's a small DartPad playground I made to ensure I got the regexes right.

Please include some examples in a dart doc above this regex. I know we do not have them for other examples but I find it super helpful when reading the code.

bartekpacia · 2024-09-20T19:42:41Z

No idea why Linux gradle_plugin_light_apk_test is failing.

reidbaker · 2024-10-01T17:34:46Z

out of band comms, this is ready for review

reidbaker · 2024-10-07T14:57:55Z

packages/flutter_tools/lib/src/project.dart

+  static final List<RegExp> _declarativeKotlinPluginPatterns = <RegExp>[
+      RegExp('^\\s*id\\s*\\(?\\s*[\'"]kotlin-android[\'"]\\s*\\)?\\s*\$'),
+      RegExp('^\\s*id\\s*\\(?\\s*[\'"]org.jetbrains.kotlin.android[\'"]\\s*\\)?\\s*\$'),
+  ];
+


Please include some examples in a dart doc above this regex. I know we do not have them for other examples but I find it super helpful when reading the code.

reidbaker · 2024-10-07T14:59:45Z

packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.kts.tmpl

@@ -16,7 +16,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = "1.8"


Out of curiosity why not use the constant and move to a string. We usually want to move away from string based types.

I ask because this value will get moved to java 11 shortly.

bkonyi · 2024-10-17T20:09:01Z

@bartekpacia just following up on this. Do you think you'll have time to address @reidbaker's comments? If not, this is probably something we can push over the finish line since it's a change we'd like to land.

bartekpacia · 2024-10-17T20:36:04Z

hey @bkonyi - sure I'm happy to do it!

i was kinda distracted recently, sorry

…view_sdk_test.dart`

…h_test.dart`

…art` flutter_tools will now correctly detect if the Android app uses Kotlin in more situations.

…mismatch_test.dart`

…erns

bartekpacia · 2024-10-17T23:09:37Z

done!

also rebased with master

gmackall · 2024-10-17T23:12:54Z

packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.kts.tmpl

@@ -16,7 +16,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = "1.8"


Should this also be JavaVersion.VERSION_1_8.toString(), like the other instance? I'd also like to avoid hardcoded strings here

Yup you're right. I missed it. I'll fix it tomorrow.

Feel free to push to my branch though and merge it.

bartekpacia · 2024-10-18T19:09:51Z

Should be fixed. Hopefully I wrote that code in a way that's both valid Groovy and Kotlin.

gmackall · 2024-10-18T19:13:19Z

dev/devicelab/lib/framework/apk_utils.dart

@@ -256,18 +256,26 @@ class FlutterProject {
  String get rootPath => path.join(parent.path, name);
  String get androidPath => path.join(rootPath, 'android');
  String get iosPath => path.join(rootPath, 'ios');
+  File get appBuildFile {


Interesting that we have an independent FlutterProject here
(independent of

flutter/packages/flutter_tools/lib/src/project.dart

Line 95 in 88816ad

class FlutterProject {

).

I don't think I was aware of this

Do you think it's worth to create an issue to track this?

(I'm not sure)

I'll take a look to try to understand why it exists and make an issue if it doesn't seem to me like it should

bartekpacia · 2024-10-18T19:43:25Z

status: of course there were more tests that broke. Fixing them now.

auto-submit · 2024-10-18T20:34:05Z

auto label is removed for flutter/flutter/154061, due to - The status or check suite Mac dart_plugin_registry_test has failed. Please fix the issues identified (or deflake) before re-applying this label.

bartekpacia · 2024-10-18T20:45:45Z

auto label is removed for flutter/flutter/154061, due to - The status or check suite Mac dart_plugin_registry_test has failed. Please fix the issues identified (or deflake) before re-applying this label.

re-running fixed it ¯\_(ツ)_/¯

QuncCccccc · 2024-10-18T21:12:14Z

Reason for revert: might be the reason that cause Framework tree to red

This reverts commit d3c54a1.

…)" (#157194) Reverts: #154061 Initiated by: QuncCccccc Reason for reverting: might be the reason that cause Framework tree to red Original PR Author: bartekpacia Reviewed By: {gmackall, reidbaker} This change reverts the following previous change: This PR resolves #151166

gmackall · 2024-10-18T21:19:06Z

Oof, yes this test definition will need changing
https://github.com/flutter/flutter/blob/master/dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart#L112-L134

Perhaps these two tests
android_java17_dependency_smoke_tests and android_java11_dependency_smoke_tests should be marked with runIf logic to run on changes to android templates.

Also could have been avoided by #153399

bartekpacia · 2024-10-18T21:20:44Z

@gmackall I'm on it

gmackall · 2024-10-18T21:33:20Z

Perhaps these two tests android_java17_dependency_smoke_tests and android_java11_dependency_smoke_tests should be marked with runIf logic to run on changes to android templates.

Will attempt to do this in #157196

bartekpacia · 2024-10-18T21:37:47Z

good idea, thanks! much appreciated

) This PR resolves #151166 This PR relands #154061

…ter#157195) This PR resolves flutter#151166 This PR relands flutter#154061

…r/flutter#154061)

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Aug 24, 2024

bartekpacia changed the title ~~uUse Gradle KTS in new Android app projects by default~~ Use Gradle KTS in new Android app projects by default Aug 24, 2024

bartekpacia mentioned this pull request Aug 26, 2024

upgrade templates to use gradle dsl in android apps #154070

Closed

9 tasks

bartekpacia commented Sep 20, 2024

View reviewed changes

bartekpacia marked this pull request as ready for review September 20, 2024 21:43

bartekpacia requested review from gmackall and reidbaker September 20, 2024 21:43

reidbaker approved these changes Oct 7, 2024

View reviewed changes

bartekpacia added 13 commits October 18, 2024 01:09

use Gradle KTS in new Android app projects by default

4b0739a

add the changed KTS tmpl files to template_manifest.json

55050a8

fix mistakes

0f5b725

use build.gradle.kts for dependency checker tests

bce80df

remove redundant import

fce6ba1

fix failing android_plugin_example_app_build_test.dart

1729b57

fix failing commands.shard/permeable/create_test.dart

93adbdb

fix failing `test/android_preview_integration.shard/flutter_build_pre…

e44b41c

…view_sdk_test.dart`

fix failing `test/integration.shard/android_plugin_ndkversion_mismatc…

47cde8a

…h_test.dart`

fix failing `integration.shard/analyze_suggestions_integration_test.d…

b72ea0c

…art` flutter_tools will now correctly detect if the Android app uses Kotlin in more situations.

fix failing `test/integration.shard/android_plugin_compilesdkversion_…

35057ac

…mismatch_test.dart`

add examples of strings matched by regex _declarativeKotlinPluginPatt…

ce96270

…erns

use jvmTarget = JavaVersion.VERSION_1_8.toString()

abf7da5

bartekpacia added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 17, 2024

gmackall requested changes Oct 17, 2024

View reviewed changes

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 17, 2024

gmackall approved these changes Oct 18, 2024

View reviewed changes

gmackall reviewed Oct 18, 2024

View reviewed changes

fix engine_dependency_proxy_test

c411060

bartekpacia added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 18, 2024

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 18, 2024

bartekpacia added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 18, 2024

auto-submit bot merged commit d3c54a1 into flutter:master Oct 18, 2024
135 checks passed

bartekpacia deleted the gradle_kotlin_by_default branch October 18, 2024 20:47

QuncCccccc added the revert Autorevert PR (with "Reason for revert:" comment) label Oct 18, 2024

auto-submit bot pushed a commit that referenced this pull request Oct 18, 2024

Revert "Use Gradle KTS in new Android app projects by default (#154061)"

c54fd1e

This reverts commit d3c54a1.

auto-submit bot mentioned this pull request Oct 18, 2024

Reverts "Use Gradle KTS in new Android app projects by default (#154061)" #157194

Merged

9 tasks

auto-submit bot removed the revert Autorevert PR (with "Reason for revert:" comment) label Oct 18, 2024

bartekpacia mentioned this pull request Oct 18, 2024

Use Gradle KTS in new Android app projects by default (2nd try) #157195

Merged

9 tasks

auto-submit bot pushed a commit that referenced this pull request Oct 22, 2024

Use Gradle KTS in new Android app projects by default (2nd try) (#157195

eb5ef69

) This PR resolves #151166 This PR relands #154061

M97Chahboun pushed a commit to M97Chahboun/flutter that referenced this pull request Oct 30, 2024

Use Gradle KTS in new Android app projects by default (2nd try) (flut…

3a775e2

…ter#157195) This PR resolves flutter#151166 This PR relands flutter#154061

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2025

d3c54a1 Use Gradle KTS in new Android app projects by default (flutte…

861949c

…r/flutter#154061)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025

d3c54a1 Use Gradle KTS in new Android app projects by default (flutte…

2cb4634

…r/flutter#154061)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025

d3c54a1 Use Gradle KTS in new Android app projects by default (flutte…

618491f

…r/flutter#154061)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 6, 2025

d3c54a1 Use Gradle KTS in new Android app projects by default (flutte…

a4355c5

…r/flutter#154061)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 7, 2025

d3c54a1 Use Gradle KTS in new Android app projects by default (flutte…

5563134

…r/flutter#154061)

Use Gradle KTS in new Android app projects by default #154061

Use Gradle KTS in new Android app projects by default #154061

Uh oh!

Conversation

bartekpacia commented Aug 24, 2024

Pre-launch Checklist

Uh oh!

bartekpacia commented Aug 26, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bartekpacia commented Sep 20, 2024

Uh oh!

reidbaker commented Oct 1, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bkonyi commented Oct 17, 2024

Uh oh!

bartekpacia commented Oct 17, 2024

Uh oh!

bartekpacia commented Oct 17, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bartekpacia commented Oct 18, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bartekpacia commented Oct 18, 2024

Uh oh!

auto-submit bot commented Oct 18, 2024

Uh oh!

bartekpacia commented Oct 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

QuncCccccc commented Oct 18, 2024

Uh oh!

gmackall commented Oct 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bartekpacia commented Oct 18, 2024

Uh oh!

gmackall commented Oct 18, 2024

Uh oh!

bartekpacia commented Oct 18, 2024

Uh oh!

Uh oh!

bartekpacia commented Oct 18, 2024 •

edited

Loading

gmackall commented Oct 18, 2024 •

edited

Loading