Migrate integration_test plugin to Gradle Kotlin DSL #142008

bartekpacia · 2024-01-22T22:26:31Z

We already have a simple app in this repo that fully uses Gradle Kotlin DSL (see #141541). The next small step is to have at least one plugin that also uses Gradle Kotlin DSL. Let's use integration_test for that, since it's versioned with Flutter SDK.

bartekpacia · 2024-01-22T22:28:03Z

Currently it only supports AGP v8+ and Gradle v8+. I'll try to get down to v7+ for both. Related #142000

bartekpacia · 2024-01-22T23:42:11Z

packages/integration_test/android/build.gradle

PR #142000 will start enforcing Gradle 7, so this checks won't make sense anymore

Heads up that the linked PR actually won't start enforcing anything until a full release later. I'm starting with only "warning" versions, so when it lands we will start warning that anything <7 will soon be unsupported

ah okay, thanks! So I'll make sure we support older Gradle/AGP as well in this PR

reidbaker · 2024-01-23T19:12:09Z

The last migration was just reverted. Please dont land this pr until we know why the previous one broke the tree.
#142018 (comment)

gmackall · 2024-02-08T17:59:46Z

The last migration was just reverted. Please dont land this pr until we know why the previous one broke the tree. #142018 (comment)

I see the migration which was reverted was relanded in #142752, but I can't see why it was reverted or what the fix was - can you add any more context @bartekpacia ? Just in case it is relevant here as well

gmackall

LGTM but just holding off on approving till I know why the previous migration was reverted

bartekpacia · 2024-02-09T15:20:51Z

@gmackall The reason for reverting the original "Add support Gradle Kotlin DSL" PR (#140744) is because a a different PR (#137115) had to be reverted, and it was easiest to do it by also reverting my original "Add support Gradle Kotlin DSL" PR (#140744).

Now the situation is sorted out, and the new "Add support Gradle Kotlin DSL" PR (#142752)has been merged for a few days and tree is still green.

gmackall · 2024-02-09T17:31:23Z

Got it, thanks!

bartekpacia · 2024-02-09T18:07:17Z

I've got a bad feeling that something will break post-submit, haha.

…/flutter#142008)

auto-submit · 2024-02-12T20:56:55Z

Time to revert pull request flutter/flutter/142008 has elapsed.
You need to open the revert manually and process as a regular pull request.

…#142008)" This reverts commit 60f30a6.

…" (#143329) This reverts #142008 because it broke the Flutter --> packages roller.

…/flutter#142008)

@reidbaker

… versions (#143341) This is a direct revert of (the revert of (the reland of (the policy pr))): #143132. The only change is: 1. to put a conditional all on one line, because the packages repository has a test that uses an old flutter project to make sure nothing regresses. The old project uses an old gradle version, and the old gradle version bundles an old groovy version, and the old groovy version has a bug where lines that start with `&&` don't always work: https://issues.apache.org/jira/browse/GROOVY-7218 (I enjoy that the revert reason ends up providing another strong justification to go forward with the policy). Also thanks to @reidbaker for pointing out this bug. 2. I also made a slight formatting change to the messages that print when out of the support bounds, which I think looks slightly better. I tested this with on a branch that included a revert of #142008, and was able to recreate the failure and verify that it was resolved by 1).

…/flutter#142008)

Roll Flutter from eb5d0a4 to a628814 (72 revisions) flutter/flutter@eb5d0a4...a628814 2024-02-13 [email protected] Allow deprecated members from the Dart SDK and Flutter Engine to roll in (flutter/flutter#143347) 2024-02-13 [email protected] [Re-re-land] Enforce a policy on supported Gradle, Java, AGP, and KGP versions (flutter/flutter#143341) 2024-02-13 [email protected] Roll Packages from 0a69259 to 9385bbb (7 revisions) (flutter/flutter#143366) 2024-02-13 [email protected] Fix `InputDecorator`s `suffix` and `prefix` widgets are tappable when hidden (flutter/flutter#143308) 2024-02-13 [email protected] Pass-Through `inputFormatters` in `DropdownMenu` (flutter/flutter#143250) 2024-02-13 [email protected] Fix `insetPadding` parameter nullability for dialogs (flutter/flutter#143305) 2024-02-12 [email protected] Revert "Migrate integration_test plugin to Gradle Kotlin DSL (#142008)" (flutter/flutter#143329) 2024-02-12 [email protected] Badge class doc typo - missing [ (flutter/flutter#143318) 2024-02-12 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Flutter Engine from 1c3ecee77350 to a19077503a0c (8 revisions) (#143322)" (flutter/flutter#143338) 2024-02-12 [email protected] Roll Flutter Engine from 1c3ecee77350 to a19077503a0c (8 revisions) (flutter/flutter#143322) 2024-02-12 [email protected] [web] Move JS interop to extension types (flutter/flutter#143274) 2024-02-12 [email protected] Add documentation for best practices for `StreamBuilder` like `FutureBuilder` (flutter/flutter#143295) 2024-02-12 [email protected] Roll Flutter Engine from 8806987182a3 to 1c3ecee77350 (1 revision) (flutter/flutter#143315) 2024-02-12 [email protected] Fix dual focus issue in CheckboxListTile, RadioListTile and SwitchListTile (flutter/flutter#143213) 2024-02-12 [email protected] Revert "[Re-land] Enforce a policy on supported Gradle, Java, AGP, and KGP versions" (flutter/flutter#143314) 2024-02-12 [email protected] Update integration_test iOS FTL README script to remove targeted version (flutter/flutter#143248) 2024-02-12 [email protected] Remove unnecessary 'debugLabel: null'. (flutter/flutter#143253) 2024-02-12 [email protected] Introduce `iconAlignment` for the buttons with icon (flutter/flutter#137348) 2024-02-12 [email protected] Roll Packages from 11152d2 to 0a69259 (4 revisions) (flutter/flutter#143306) 2024-02-12 [email protected] Roll Flutter Engine from 4f119619dfa8 to 8806987182a3 (1 revision) (flutter/flutter#143304) 2024-02-12 [email protected] Roll Flutter Engine from b0753c0e25f8 to 4f119619dfa8 (1 revision) (flutter/flutter#143291) 2024-02-11 [email protected] Roll Flutter Engine from 936495d94cc6 to b0753c0e25f8 (1 revision) (flutter/flutter#143282) 2024-02-11 [email protected] Roll Flutter Engine from b06b3e0d75ad to 936495d94cc6 (1 revision) (flutter/flutter#143280) 2024-02-11 [email protected] Roll Flutter Engine from 1478f4e75dd9 to b06b3e0d75ad (1 revision) (flutter/flutter#143275) 2024-02-10 [email protected] Fix text painter longest line resizing logic for `TextWidthBasis.longestLine` (flutter/flutter#143024) 2024-02-10 [email protected] Roll Flutter Engine from e6ceb3504f50 to 1478f4e75dd9 (1 revision) (flutter/flutter#143273) 2024-02-10 [email protected] Move Windows arm64 tests to bringup true (flutter/flutter#143272) 2024-02-10 [email protected] Roll Flutter Engine from 3c5149ccde38 to e6ceb3504f50 (1 revision) (flutter/flutter#143267) 2024-02-10 [email protected] Roll Flutter Engine from c587bd69985f to 3c5149ccde38 (2 revisions) (flutter/flutter#143266) 2024-02-10 [email protected] Roll Flutter Engine from e08b6c899c42 to c587bd69985f (1 revision) (flutter/flutter#143265) 2024-02-10 [email protected] Roll Flutter Engine from 1b8f23bbd099 to e08b6c899c42 (2 revisions) (flutter/flutter#143264) 2024-02-10 [email protected] Roll Flutter Engine from 41daa5b913b9 to 1b8f23bbd099 (2 revisions) (flutter/flutter#143261) 2024-02-10 [email protected] Roll Flutter Engine from f969c52f133a to 41daa5b913b9 (1 revision) (flutter/flutter#143258) 2024-02-10 [email protected] Roll Flutter Engine from 6a3b0216ff5b to f969c52f133a (3 revisions) (flutter/flutter#143256) 2024-02-09 [email protected] Roll Flutter Engine from 8c521eb24171 to 6a3b0216ff5b (4 revisions) (flutter/flutter#143251) 2024-02-09 [email protected] Upgrade leak_tracker. (flutter/flutter#143236) 2024-02-09 [email protected] Fix: performance improvement on golden test comparison (flutter/flutter#142913) 2024-02-09 [email protected] Implementing `switch` expressions in `lib/src/material/` (flutter/flutter#142793) 2024-02-09 [email protected] Add position data to `OnDragEnd` callback (flutter/flutter#140378) 2024-02-09 [email protected] Roll Flutter Engine from 1232d598f7c4 to 8c521eb24171 (2 revisions) (flutter/flutter#143237) 2024-02-09 [email protected] Roll Flutter Engine from 7a5390c6b3bd to 1232d598f7c4 (1 revision) (flutter/flutter#143235) 2024-02-09 [email protected] Set plugin template minimum iOS version to 12.0 (flutter/flutter#143167) 2024-02-09 [email protected] Roll Flutter Engine from 7a241130fcf8 to 7a5390c6b3bd (1 revision) (flutter/flutter#143231) 2024-02-09 [email protected] Migrate integration_test plugin to Gradle Kotlin DSL (flutter/flutter#142008) 2024-02-09 [email protected] Roll Flutter Engine from dcac9863a1fc to 7a241130fcf8 (1 revision) (flutter/flutter#143222) 2024-02-09 [email protected] Roll Flutter Engine from 1508b11bf791 to dcac9863a1fc (1 revision) (flutter/flutter#143220) ...

…/flutter#142008)

Attempt to reland #142008 half a year later. Benefit: this will be the first plugin in Flutter repo that uses Gradle KTS for Android buildscripts. Once it works fine, we can follow up with migration of more plugins later. [The previous error message](#142008 (comment)) was: ``` e: /b/s/w/ir/cache/gradle/caches/jars-8/42139b5be0c79e133a7b5c5c5d5bf731/gradle-7.3.1.jar!/com/android/build/gradle/LibraryExtension.class: Class 'com/android/build/gradle/LibraryExtension' was compiled with an incompatible version of Kotlin. The binary version of its bytecode is unknown, expected version is 1.0.3 e: /b/s/w/ir/cache/gradle/caches/jars-8/043c0d54e2c1bb39208ec4477607cdf5/gradle-api-7.3.1.jar!/com/android/build/api/dsl/LibraryVariantDimension.class: Class 'com/android/build/api/dsl/LibraryVariantDimension' was compiled with an incompatible version of Kotlin. The binary version of its bytecode is unknown, expected version is 1.0.3 FAILURE: Build failed with an exception. * Where: Build file '/b/s/w/ir/x/w/flutter/packages/integration_test/android/build.gradle.kts' line: 36 * What went wrong: com.android.build.gradle.LibraryExtension.setNamespace(Ljava/lang/String;)V ``` The `integration_test` plugin now puts `com.android.tools.build:gradle:8.1.0` on its classpath since #153795. This makes me take an optimistic bet that it won't kill the autoroller now ð�¤�

…56087) Reverts: #154125 Initiated by: bartekpacia Reason for reverting: broke postsubmit Original PR Author: bartekpacia Reviewed By: {reidbaker, gmackall} This change reverts the following previous change: Attempt to reland #142008 half a year later. Benefit: this will be the first plugin in Flutter repo that uses Gradle KTS for Android buildscripts. Once it works fine, we can follow up with migration of more plugins later. [The previous error message](#142008 (comment)) was: ``` e: /b/s/w/ir/cache/gradle/caches/jars-8/42139b5be0c79e133a7b5c5c5d5bf731/gradle-7.3.1.jar!/com/android/build/gradle/LibraryExtension.class: Class 'com/android/build/gradle/LibraryExtension' was compiled with an incompatible version of Kotlin. The binary version of its bytecode is unknown, expected version is 1.0.3 e: /b/s/w/ir/cache/gradle/caches/jars-8/043c0d54e2c1bb39208ec4477607cdf5/gradle-api-7.3.1.jar!/com/android/build/api/dsl/LibraryVariantDimension.class: Class 'com/android/build/api/dsl/LibraryVariantDimension' was compiled with an incompatible version of Kotlin. The binary version of its bytecode is unknown, expected version is 1.0.3 FAILURE: Build failed with an exception. * Where: Build file '/b/s/w/ir/x/w/flutter/packages/integration_test/android/build.gradle.kts' line: 36 * What went wrong: com.android.build.gradle.LibraryExtension.setNamespace(Ljava/lang/String;)V ``` The `integration_test` plugin now puts `com.android.tools.build:gradle:8.1.0` on its classpath since #153795. This makes me take an optimistic bet that it won't kill the autoroller now 🤞

This PR is yet another attempt (after #154125) to reland #142008. Benefit: this will be the first plugin in Flutter repo that uses Gradle KTS for Android buildscripts. Once it works fine, we can follow up with migration of more plugins later. [The previous error message](#142008 (comment)) was: ``` e: /b/s/w/ir/cache/gradle/caches/jars-8/42139b5be0c79e133a7b5c5c5d5bf731/gradle-7.3.1.jar!/com/android/build/gradle/LibraryExtension.class: Class 'com/android/build/gradle/LibraryExtension' was compiled with an incompatible version of Kotlin. The binary version of its bytecode is unknown, expected version is 1.0.3 e: /b/s/w/ir/cache/gradle/caches/jars-8/043c0d54e2c1bb39208ec4477607cdf5/gradle-api-7.3.1.jar!/com/android/build/api/dsl/LibraryVariantDimension.class: Class 'com/android/build/api/dsl/LibraryVariantDimension' was compiled with an incompatible version of Kotlin. The binary version of its bytecode is unknown, expected version is 1.0.3 FAILURE: Build failed with an exception. * Where: Build file '/b/s/w/ir/x/w/flutter/packages/integration_test/android/build.gradle.kts' line: 36 * What went wrong: com.android.build.gradle.LibraryExtension.setNamespace(Ljava/lang/String;)V ``` The `integration_test` plugin now puts `com.android.tools.build:gradle:8.1.0` on its classpath since #153795. This makes me take an optimistic bet that it won't kill the autoroller now ð�¤�

github-actions bot added a: tests "flutter test", flutter_test, or one of our tests framework flutter/packages/flutter repository. See also f: labels. f: integration_test The flutter/packages/integration_test plugin labels Jan 22, 2024

bartekpacia changed the title ~~Migrate integration_test plugin to Gradl Kotlin DSL~~ Migrate integration_test plugin to Gradle Kotlin DSL Jan 22, 2024

bartekpacia requested a review from reidbaker January 22, 2024 23:41

bartekpacia commented Jan 22, 2024

View reviewed changes

bartekpacia marked this pull request as ready for review January 22, 2024 23:42

goderbauer added the platform-android Android applications specifically label Jan 26, 2024

bartekpacia added the t: gradle "flutter build" and "flutter run" on Android label Jan 26, 2024

bartekpacia added 4 commits February 8, 2024 15:49

integration_test plugin: migrate to Gradle Kotlin DSL

5d61917

downgrade to AGP v7

db07e77

fix integration_test/example app build

4b1e94c

bring back conditional assignment of namespace

2820b04

bartekpacia requested review from camsim99 and gmackall February 8, 2024 17:50

gmackall reviewed Feb 8, 2024

View reviewed changes

bartekpacia requested a review from gmackall February 9, 2024 17:22

gmackall approved these changes Feb 9, 2024

View reviewed changes

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

auto-submit bot merged commit 60f30a6 into flutter:master Feb 9, 2024

bartekpacia deleted the migrate_integration_test_plugin_to_gradle_kotlin_dsl branch February 9, 2024 18:08

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 60f30a65b468 (29 revisions) flutter/packages#6084

Closed

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

6ea8485

…/flutter#142008)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 2207a3077b9a (30 revisions) flutter/packages#6085

Closed

camsim99 added the revert Autorevert PR (with "Reason for revert:" comment) label Feb 12, 2024

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

camsim99 added a commit to camsim99/flutter that referenced this pull request Feb 12, 2024

Revert "Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

c1ed8ac

…#142008)" This reverts commit 60f30a6.

camsim99 mentioned this pull request Feb 12, 2024

Revert "Migrate integration_test plugin to Gradle Kotlin DSL (#142008)" #143329

Merged

8 tasks

gmackall mentioned this pull request Feb 12, 2024

[Re-re-land] Enforce a policy on supported Gradle, Java, AGP, and KGP versions #143341

Merged

8 tasks

auto-submit bot pushed a commit that referenced this pull request Feb 12, 2024

Revert "Migrate integration_test plugin to Gradle Kotlin DSL (#142008)…

0650b76

…" (#143329) This reverts #142008 because it broke the Flutter --> packages roller.

engine-flutter-autoroll mentioned this pull request Feb 13, 2024

Roll Flutter from eb5d0a434ef1 to 1f8d110b8f3a (69 revisions) flutter/packages#6113

Closed

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

f9a5838

…/flutter#142008)

engine-flutter-autoroll mentioned this pull request Feb 13, 2024

Roll Flutter from eb5d0a434ef1 to 634fcc716509 (70 revisions) flutter/packages#6114

Closed

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

697fe22

…/flutter#142008)

engine-flutter-autoroll mentioned this pull request Feb 13, 2024

Roll Flutter from eb5d0a434ef1 to 8ba086a2777c (71 revisions) flutter/packages#6115

Closed

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

458ee49

…/flutter#142008)

engine-flutter-autoroll mentioned this pull request Feb 13, 2024

Roll Flutter from eb5d0a434ef1 to 8ba086a2777c (71 revisions) flutter/packages#6117

Closed

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

4998216

…/flutter#142008)

engine-flutter-autoroll mentioned this pull request Feb 13, 2024

Roll Flutter from eb5d0a434ef1 to a628814ebd25 (72 revisions) flutter/packages#6118

Merged

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

eef25aa

…/flutter#142008)

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

c562a8f

…/flutter#142008)

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

df38133

…/flutter#142008)

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

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

56d2894

…/flutter#142008)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 14, 2024

60f30a6 Migrate integration_test plugin to Gradle Kotlin DSL (flutter…

9e9c5d9

…/flutter#142008)

bartekpacia mentioned this pull request Aug 26, 2024

integration_test: migrate to build.gradle.kts #154125

Merged

9 tasks

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

Reverts "integration_test: migrate to build.gradle.kts (#154125)" #156087

Merged

9 tasks

bartekpacia mentioned this pull request Oct 6, 2024

integration_test: migrate to build.gradle.kts #156291

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Migrate integration_test plugin to Gradle Kotlin DSL #142008

Migrate integration_test plugin to Gradle Kotlin DSL #142008

Uh oh!

bartekpacia commented Jan 22, 2024

Uh oh!

bartekpacia commented Jan 22, 2024

Uh oh!

bartekpacia Jan 22, 2024

Uh oh!

gmackall Jan 23, 2024

Uh oh!

bartekpacia Jan 23, 2024 •

edited

Loading

Uh oh!

reidbaker commented Jan 23, 2024 •

edited

Loading

Uh oh!

gmackall commented Feb 8, 2024

Uh oh!

gmackall left a comment

Uh oh!

bartekpacia commented Feb 9, 2024 •

edited

Loading

Uh oh!

gmackall commented Feb 9, 2024

Uh oh!

bartekpacia commented Feb 9, 2024

Uh oh!

auto-submit bot commented Feb 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Migrate integration_test plugin to Gradle Kotlin DSL #142008

Migrate integration_test plugin to Gradle Kotlin DSL #142008

Uh oh!

Conversation

bartekpacia commented Jan 22, 2024

Uh oh!

bartekpacia commented Jan 22, 2024

Uh oh!

bartekpacia Jan 22, 2024

Choose a reason for hiding this comment

Uh oh!

gmackall Jan 23, 2024

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

reidbaker commented Jan 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gmackall commented Feb 8, 2024

Uh oh!

gmackall left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

gmackall commented Feb 9, 2024

Uh oh!

bartekpacia commented Feb 9, 2024

Uh oh!

auto-submit bot commented Feb 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bartekpacia Jan 23, 2024 •

edited

Loading

reidbaker commented Jan 23, 2024 •

edited

Loading

bartekpacia commented Feb 9, 2024 •

edited

Loading