Do not use project in do last #139325

reidbaker · 2023-11-30T21:04:11Z

Use copy task that branches for 8.3 and above to avoid using project.exec in a dolast block.

This PR does not test the 8.3 branch but instead builds the ability to write a branching gradle test.
After fixing this project.exec action there I discovered a second that needs to be removed or migrated in order for the build to work.

Related reading https://docs.gradle.org/8.0/userguide/configuration_cache.html#config_cache:requirements
https://docs.gradle.org/current/javadoc/org/gradle/process/ExecOperations.html (not used but considered)
https://docs.gradle.org/8.2/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:fileMode

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].
All existing and new tests are passing.

reidbaker · 2023-12-01T19:00:12Z

Replacement copy works and existing test verifying read only behavior works. I need to add a new test to cover the branching behavior of gradle 8.3 and ensure it does not regress. Thanks to stuart I know I do not need to copy module_test but instead can follow a pattern similar to dev/devicelab/bin/tasks/plugin_test.dart where there a set of tasks with parameters that runs and allows the test to make changes based on the inputs.

…es the gradle contract

christopherfujino · 2023-12-12T20:51:34Z

dev/devicelab/bin/tasks/module_test.dart

+final String platformLineSep = Platform.isWindows ? '\r\n' : '\n';
+
+/// Combines several TaskFunctions with trivial success value into one.
+TaskFunction combine(List<TaskFunction> tasks) {


I'm guessing in follow up PRs you will add more tasks here?

Yes once I can make them pass. Pr fatigue is setting in and I want to get this improvement landed to minimize conflicts.

christopherfujino · 2023-12-12T20:57:50Z

dev/integration_tests/android_host_app_v2_embedding/gradle/wrapper/gradle-wrapper.properties

 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-REPLACEME-all.zip


was REPLACEME a note to self to change? or are we interpolating this somehow?

It is the string we look for when trying to find what to replace.

christopherfujino · 2023-12-12T20:58:46Z

packages/flutter_tools/gradle/src/main/groovy/flutter.groovy

+                } else {
+                    // See https://docs.gradle.org/8.2/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:fileMode
+                    // See https://github.com/flutter/flutter/pull/50047
+                    fileMode 0644


this works from windows?

I believe so but dont have a windows machine to check. The test passes on windows, this is the gradle api for setting file mode which works on windows. There is not a windows specific api.

acknowledged. my understanding is windows' concept of permissions is much less granular than unix and thus there must be some primitive mapping of the octal codes to windows land inside gradle...

...but if the test passes that seems good enough :)

christopherfujino

LGTM

bartekpacia

LGTM, but... wow, these are some wild problems haha

flutter/flutter@11a9cb7...a51e33a 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 223f4b2465dd to caf33276468b (1 revision) (flutter/flutter#140156) 2023-12-14 engine-flutter-autoroll@skia.org Roll Packages from b5958e2 to 1151191 (10 revisions) (flutter/flutter#140154) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from a3f9393f9591 to 223f4b2465dd (1 revision) (flutter/flutter#140151) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 913446eca57c to a3f9393f9591 (2 revisions) (flutter/flutter#140144) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 923f9e29d4b5 to 913446eca57c (1 revision) (flutter/flutter#140132) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9f7004e3e30e to 923f9e29d4b5 (7 revisions) (flutter/flutter#140130) 2023-12-14 magder@google.com Add self back to CODEOWNERS (flutter/flutter#140080) 2023-12-14 git@reb0.org Adapt wording for required Android SDK for plugins (flutter/flutter#140043) 2023-12-14 andrewrkolos@gmail.com [reland] Support conditional bundling of assets based on `--flavor` (flutter/flutter#139834) 2023-12-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Flutter Engine from 9f7004e3e30e to 45b95f264d63 (1 revision)" (flutter/flutter#140123) 2023-12-14 dacoharkes@google.com [deps] update Android SDK to 34 (flutter/flutter#138183) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9f7004e3e30e to 45b95f264d63 (1 revision) (flutter/flutter#140108) 2023-12-14 31859944+LongCatIsLooong@users.noreply.github.com Catch `Stopwatch` with static analysis (flutter/flutter#140019) 2023-12-14 goderbauer@google.com Overlay supports unconstrained environments (flutter/flutter#139513) 2023-12-14 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 2.22.10 to 3.22.11 (flutter/flutter#140087) 2023-12-14 rmolivares@renzo-olivares.dev Remove deprecated `ThemeData.selectedRowColor` (flutter/flutter#139080) 2023-12-14 15619084+vashworth@users.noreply.github.com Unpin mac_toolchain version (flutter/flutter#139938) 2023-12-14 chingjun@google.com Optimize file transfer when using proxied devices. (flutter/flutter#139968) 2023-12-14 38378650+hgraceb@users.noreply.github.com Add commonly used parameter names (flutter/flutter#140027) 2023-12-13 engine-flutter-autoroll@skia.org Roll Flutter Engine from fc3267724e1b to 9f7004e3e30e (4 revisions) (flutter/flutter#140090) 2023-12-13 737941+loic-sharma@users.noreply.github.com [Windows] Remove header guard from generated key map (flutter/flutter#140082) 2023-12-13 reidbaker@google.com Do not use project in do last (flutter/flutter#139325) 2023-12-13 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#140024) 2023-12-13 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Warn when Gradle plugins are applied using the legacy "apply script method" way" (flutter/flutter#140102) 2023-12-13 58190796+MitchellGoodwin@users.noreply.github.com Swap iOS back button icon in Material app bar (flutter/flutter#134754) 2023-12-13 engine-flutter-autoroll@skia.org Roll Packages from 80aa46a to b5958e2 (10 revisions) (flutter/flutter#140069) 2023-12-13 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9039ac78cf03 to fc3267724e1b (26 revisions) (flutter/flutter#140084) 2023-12-13 barpac02@gmail.com Warn when Gradle plugins are applied using the legacy "apply script method" way (flutter/flutter#139690) 2023-12-13 magder@google.com Add self as bundler dependabot reviewer (flutter/flutter#140081) 2023-12-13 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Make tests more resilient to Skia gold failures and refactor flutter_goldens for extensive technical debt removal" (flutter/flutter#140085) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC dit@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

asaarnak · 2024-01-15T17:26:06Z

@reidbaker

There seems to be an issue when using flutter beta (1a9a60d)
For example i used gradle version 8.6-rc-2 in gradle-wrapper.properties:

distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-2-bin.zip

And got this error:

> Could not create task ':app:copyFlutterAssetsProductionDebug'.
  > For input string: "6-rc-2"

bartekpacia · 2024-01-15T17:47:44Z

I think that's because compareVersionStrings() doesn't handle 8.6-rc-2. Codepath for non-stable Gradle versions is not tested.

- handle number format exceptions and strip rc information from version compare - add test that handles rc format part 2/n #138523 Helpfully pointed out by [asaarnak](https://github.com/asaarnak) #139325 (comment)

reidbaker added 2 commits November 30, 2023 15:38

Use copy task that branches for 8.3 and above

3c20e63

Hardcode localLint parent task, needs cleanup

cbeef30

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Nov 30, 2023

reidbaker added 2 commits December 1, 2023 11:24

Make gradle version comparison a string compare

b6397bb

Remove nomalize file permissions task

e31c7f9

reidbaker requested review from bartekpacia, christopherfujino and gmackall and removed request for bartekpacia, christopherfujino and gmackall December 1, 2023 18:07

Failed attempt at gradle version replacement

f0ae691

github-actions bot removed the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 5, 2023

copy the correct content in to gradle wrapper file

faa9d67

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 5, 2023

reidbaker added 6 commits December 5, 2023 16:11

Merge branch 'master' into i138523-do-not-use-project-in-do-last

2639820

Remove duplicate import

6c57e52

Merge branch 'master' into i138523-do-not-use-project-in-do-last

6d61f12

Analyzer warnings and remove directory after test again

9f9167f

Remove do last block again, remove added code related to bundle aar

9909fed

Remove 8.3 test since there is a second project.exec call that violat…

26c33b5

…es the gradle contract

reidbaker requested a review from christopherfujino December 12, 2023 20:44

Merge branch 'master' into i138523-do-not-use-project-in-do-last

912b799

christopherfujino reviewed Dec 12, 2023

View reviewed changes

reidbaker requested review from a team and bartekpacia December 12, 2023 21:01

reidbaker marked this pull request as ready for review December 12, 2023 21:07

christopherfujino approved these changes Dec 12, 2023

View reviewed changes

bartekpacia approved these changes Dec 13, 2023

View reviewed changes

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 13, 2023

auto-submit bot merged commit 3c80cc7 into master Dec 13, 2023

auto-submit bot deleted the i138523-do-not-use-project-in-do-last branch December 13, 2023 23:48

engine-flutter-autoroll mentioned this pull request Dec 14, 2023

Roll Flutter from 11a9cb7029d7 to e1f954f4fd51 (27 revisions) flutter/packages#5676

Closed

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

3c80cc7 Do not use project in do last (flutter/flutter#139325)

9269180

engine-flutter-autoroll mentioned this pull request Dec 14, 2023

Roll Flutter from 11a9cb7029d7 to 625b8017cda3 (28 revisions) flutter/packages#5678

Closed

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

3c80cc7 Do not use project in do last (flutter/flutter#139325)

4c7c47e

engine-flutter-autoroll mentioned this pull request Dec 14, 2023

Roll Flutter from 11a9cb7029d7 to 3a20f9ca2ac4 (29 revisions) flutter/packages#5679

Closed

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

3c80cc7 Do not use project in do last (flutter/flutter#139325)

87a2dd5

engine-flutter-autoroll mentioned this pull request Dec 14, 2023

Roll Flutter from 11a9cb7029d7 to a51e33ac76e4 (30 revisions) flutter/packages#5680

Merged

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

3c80cc7 Do not use project in do last (flutter/flutter#139325)

740984c

reidbaker mentioned this pull request Jan 16, 2024

handle rc versions of gradle in version compare #141612

Merged

8 tasks

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

3c80cc7 Do not use project in do last (flutter/flutter#139325)

f953763

gmackall mentioned this pull request May 21, 2024

Cannot invoke method exec() on null object occured at flutter.groovy:1041 (Add to App Project, AGP 8.x.x) #138523

Closed

2 tasks

Do not use project in do last #139325

Do not use project in do last #139325

Uh oh!

Conversation

reidbaker commented Nov 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

reidbaker commented Dec 1, 2023

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!

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!

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!

christopherfujino left a comment

Choose a reason for hiding this comment

Uh oh!

bartekpacia left a comment

Choose a reason for hiding this comment

Uh oh!

asaarnak commented Jan 15, 2024

Uh oh!

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

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

reidbaker commented Nov 30, 2023 •

edited

Loading

bartekpacia commented Jan 15, 2024 •

edited

Loading