Update gradle lockfiles template #140115

bartekpacia · 2023-12-14T01:08:03Z

This PR updates almost* all Gradle buildscripts in the Flutter repo the example and dev (in particular, in dev/integration_tests and in dev/benchmarks) directories to apply Flutter's Gradle plugins using the declarative plugins {} block.

*almost, because:

add-to-app (aka hybrid) apps are not migrated (related Convert "module loader plugin" Gradle script into a proper Gradle plugin #138756)
apps that purposefully use build files to ensure backward compatibility (e.g. gradle_deprecated_settings)

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.

bartekpacia · 2024-01-01T14:40:02Z

Linux analyze is failing with a strange error. Rebasing multiple times didn't help.

bartekpacia · 2024-01-09T18:08:33Z

Rebasing again, let's see.

reidbaker · 2024-01-11T15:44:47Z

I am for this but I don't think we can just remove dependency locking as a feature in the framework.

bartekpacia · 2024-01-11T18:27:58Z

The dependency lockfiles that are removed by this PR are all buildscript-gradle.lockfile – that is, lockfiles that were locking only the buildscript dependencies. In other words, these lockfiles locked state of the buildscript.classpath configuration.

And since we're not using buildscript.classpath anymore, those lockfiles are not needed. I was searching the web for a way to create lockfiles for dependencies specified in the plugins {} block and found these 2 issues:

Plugin dependency locks aren't generated for plugin block gradle/gradle#10437
Dependency locking of settings classpath isn't properly persisted gradle/gradle#16593

bartekpacia · 2024-01-11T18:29:24Z

We'll need to generate settings-gradle.lockfile instead (e.g. with ./gradlew dependencies --write-locks?).

Investigating this now.

…ains.kotlin.android see #141400

…larative plugin apply

… of `kotlin-android`

…larative plugin apply

auto-submit · 2024-02-04T13:49:24Z

A reason for requesting a revert of flutter/flutter/140115 could
not be found or the reason was not properly formatted. Begin a comment with 'Reason for revert:' to tell the bot why
this issue is being reverted.

bartekpacia · 2024-02-04T14:26:27Z

Reason for revert: broke the tree

This reverts commit 85888bc.

Reverts #140115 Initiated by: bartekpacia Reason for reverting: broke the tree - [`Linux firebase_abstract_method_smoke_test`](https://ci.chromium.org/ui/p/flutter/builders/prod/Linux%20firebase_abstract_method_smoke_test/15844/overview) - [`Linux_android android_view_scroll_perf__timeline_summary`](https://ci.chromium.org/ui/p/flutter/builders/prod/Linux_android%20android_view_scroll_perf__timeline_summary/13453/overview) - [`Linux_android platform_views Original PR Author: bartekpacia Reviewed By: {gmackall} This change reverts the following previous change: Original Description: This PR updates almost* all Gradle buildscripts in the Flutter repo the `example` and `dev` (in particular, in `dev/integration_tests` and in `dev/benchmarks`) directories to apply Flutter's Gradle plugins using the declarative `plugins {}` block. *almost, because: - add-to-app (aka hybrid) apps are not migrated (related #138756) - apps that purposefully use build files to ensure backward compatibility (e.g. [`gradle_deprecated_settings`](https://github.com/flutter/flutter/tree/3.16.0/dev/integration_tests/gradle_deprecated_settings))

Manual roll Flutter from e02e207 to 0b5cd50 (46 revisions) Manual roll requested by [email protected] flutter/flutter@e02e207...0b5cd50 2024-02-05 [email protected] fix AppBar docs for backgroundColor & foregroundColor (flutter/flutter#142430) 2024-02-04 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Update gradle lockfiles template" (flutter/flutter#142889) 2024-02-04 [email protected] Update gradle lockfiles template (flutter/flutter#140115) 2024-02-04 [email protected] Roll Flutter Engine from 20742e37e54e to f34c658b9600 (1 revision) (flutter/flutter#142876) 2024-02-03 [email protected] Roll Flutter Engine from 23763db72272 to 20742e37e54e (1 revision) (flutter/flutter#142850) 2024-02-03 [email protected] Roll Flutter Engine from fee02145da8c to 23763db72272 (3 revisions) (flutter/flutter#142848) 2024-02-03 [email protected] Roll Flutter Engine from 9869d47a2736 to fee02145da8c (2 revisions) (flutter/flutter#142847) 2024-02-03 [email protected] Roll Flutter Engine from 78c63d3c2c68 to 9869d47a2736 (1 revision) (flutter/flutter#142842) 2024-02-02 [email protected] Roll Flutter Engine from 266d5d0b5588 to 78c63d3c2c68 (1 revision) (flutter/flutter#142836) 2024-02-02 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.23.2 to 3.24.0 (flutter/flutter#142839) 2024-02-02 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 3.1.6 to 4.0.1 (flutter/flutter#142838) 2024-02-02 [email protected] Update TextSelectionOverlay (flutter/flutter#142463) 2024-02-02 [email protected] Roll Flutter Engine from e29263212bfd to 266d5d0b5588 (5 revisions) (flutter/flutter#142832) 2024-02-02 [email protected] Fix CupertinoTextSelectionToolbar clipping (flutter/flutter#138195) 2024-02-02 [email protected] Reland "Add support for Gradle Kotlin DSL (#140744)" (flutter/flutter#142752) 2024-02-02 [email protected] Support navigation during a Cupertino back gesture (flutter/flutter#142248) 2024-02-02 [email protected] Avoid depending on files from build_system/targets other than from top level entrypoints in flutter_tools. (flutter/flutter#142760) 2024-02-02 [email protected] Roll Packages from 5b48c44 to d37fb0a (14 revisions) (flutter/flutter#142812) 2024-02-02 [email protected] Add a link the different possible Android virtual device configs (flutter/flutter#142765) 2024-02-02 [email protected] Allow all iOS tests to use either iOS 16 or 17 (flutter/flutter#142714) 2024-02-02 [email protected] Roll Flutter Engine from b35153d00b2e to e29263212bfd (2 revisions) (flutter/flutter#142799) 2024-02-02 [email protected] Roll Flutter Engine from dd4c79a6c864 to b35153d00b2e (10 revisions) (flutter/flutter#142783) 2024-02-02 [email protected] Wasm/JS Dual Compile with the flutter tool (flutter/flutter#141396) 2024-02-02 [email protected] Reland: Added ButtonStyle.foregroundBuilder and ButtonStyle.backgroundBuilder (flutter/flutter#142762) 2024-02-01 [email protected] Use proto name for emulator version and show cipd package version (flutter/flutter#142262) 2024-02-01 [email protected] [github actions] ping actor of workflow on cherry pick pr creation (flutter/flutter#142676) 2024-02-01 [email protected] Marks Linux_android_emu android views to be unflaky (flutter/flutter#142590) 2024-02-01 [email protected] Implement `switch` expressions in `lib/src/material/` (flutter/flutter#142634) 2024-02-01 [email protected] Roll Flutter Engine from 9beb7e82e081 to dd4c79a6c864 (1 revision) (flutter/flutter#142749) 2024-02-01 [email protected] Write Tests for API Example of `form.0.dart` (flutter/flutter#142635) 2024-02-01 [email protected] Make leak_tracking bots sticked to the left even if bot thinks they are non-flacky. (flutter/flutter#142744) 2024-02-01 [email protected] Upload DerivedData logs in CI (flutter/flutter#142643) 2024-02-01 [email protected] Test codesigning xcframeworks in artifacts (flutter/flutter#142666) 2024-02-01 [email protected] Fix gen_defaults test randomness (flutter/flutter#142743) 2024-02-01 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Added ButtonStyle.foregroundBuilder and ButtonStyle.backgroundBuilder" (flutter/flutter#142748) 2024-02-01 [email protected] Roll Flutter Engine from 39415c3eed42 to 9beb7e82e081 (5 revisions) (flutter/flutter#142745) 2024-02-01 [email protected] Remove unused deprecated autoroll mirror-remote flag (flutter/flutter#142738) 2024-02-01 [email protected] Fix leaks in tests. (flutter/flutter#142677) 2024-02-01 [email protected] Roll Flutter Engine from 8c43332c6ffc to 39415c3eed42 (1 revision) (flutter/flutter#142740) 2024-02-01 [email protected] Remove verbose-system-logs on iOS perf tests (flutter/flutter#142739) 2024-02-01 [email protected] Remove outdated arm64_armv7 check (flutter/flutter#142737) 2024-02-01 [email protected] fix CupertinoTabView's Android back button handling with PopScope (flutter/flutter#141604) 2024-02-01 [email protected] Roll Flutter Engine from 68943afd62d1 to 8c43332c6ffc (8 revisions) (flutter/flutter#142726) 2024-02-01 [email protected] Unpin test (flutter/flutter#141427) ...

* master: (45 commits) Reverts "Update gradle lockfiles template" (flutter#142889) Update gradle lockfiles template (flutter#140115) Roll Flutter Engine from 20742e37e54e to f34c658b9600 (1 revision) (flutter#142876) Roll Flutter Engine from 23763db72272 to 20742e37e54e (1 revision) (flutter#142850) Roll Flutter Engine from fee02145da8c to 23763db72272 (3 revisions) (flutter#142848) Roll Flutter Engine from 9869d47a2736 to fee02145da8c (2 revisions) (flutter#142847) Roll Flutter Engine from 78c63d3c2c68 to 9869d47a2736 (1 revision) (flutter#142842) Roll Flutter Engine from 266d5d0b5588 to 78c63d3c2c68 (1 revision) (flutter#142836) Bump github/codeql-action from 3.23.2 to 3.24.0 (flutter#142839) Bump codecov/codecov-action from 3.1.6 to 4.0.1 (flutter#142838) Update TextSelectionOverlay (flutter#142463) Roll Flutter Engine from e29263212bfd to 266d5d0b5588 (5 revisions) (flutter#142832) Fix CupertinoTextSelectionToolbar clipping (flutter#138195) Reland "Add support for Gradle Kotlin DSL (flutter#140744)" (flutter#142752) Support navigation during a Cupertino back gesture (flutter#142248) Avoid depending on files from build_system/targets other than from top level entrypoints in flutter_tools. (flutter#142760) Roll Packages from 5b48c44 to d37fb0a (14 revisions) (flutter#142812) Add a link the different possible Android virtual device configs (flutter#142765) Allow all iOS tests to use either iOS 16 or 17 (flutter#142714) Roll Flutter Engine from b35153d00b2e to e29263212bfd (2 revisions) (flutter#142799) ...

Trying to reland #140115 which I had to revert in #142889 because [it broke the tree](#140115 (comment)). In this PR I fixed the post-submit following tests:

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin labels Dec 14, 2023

HansMuller requested a review from a team December 15, 2023 22:37

bartekpacia mentioned this pull request Jan 8, 2024

Add support for Gradle Kotlin DSL #140744

Merged

8 tasks

bartekpacia added 3 commits January 9, 2024 19:08

generate_gradle_lockfiles.dart: update to use latest template

67e8a3b

run lockfile regeneration

3d2f87f

dev/integration_tests/gradle_deprecated_settings: revert changes

0f9fa9d

bartekpacia mentioned this pull request Jan 9, 2024

Update gradle lockfiles template (another try) #141212

Closed

8 tasks

revert changes to dev/benchmarks/test_apps/stocks i18n files

0c4c652

bartekpacia marked this pull request as ready for review January 10, 2024 13:44

bartekpacia requested review from christopherfujino and reidbaker January 10, 2024 13:44

bartekpacia added 3 commits January 11, 2024 19:55

generate_gradle_lockfiles: lock state of plugins {} block

143293a

examples: activate locking plugins {} dependencies

53b738e

examples: fully migrate to declarative plugins {} apply

db0aba0

github-actions bot added the d: api docs Issues with https://api.flutter.dev/ label Jan 11, 2024

bartekpacia added 8 commits January 11, 2024 20:47

generate_gradle_lockfiles: use kotlin-android instead of `org.jetbr…

24c3e46

…ains.kotlin.android see #141400

packages: activate locking plugins {} dependencies and migrate to dec…

7d92f00

…larative plugin apply

examples: fix

a1da2fc

generate_gradle_lockfiles: use org.jetbrains.kotlin.android instead…

e283df9

… of `kotlin-android`

fix build of hello_world

0b42daf

packages: activate locking plugins {} dependencies and migrate to dec…

78e63af

…larative plugin apply

more minor fixes

0fb703a

fix builds by regenerating some rogue lockfiles

9e32bae

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

auto-submit bot merged commit 85888bc into flutter:master Feb 4, 2024

bartekpacia deleted the update_gradle_lockfiles_template branch February 4, 2024 13:12

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

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

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

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

Revert "Update gradle lockfiles template (#140115)"

1778f47

This reverts commit 85888bc.

auto-submit bot mentioned this pull request Feb 4, 2024

Reverts "Update gradle lockfiles template" #142889

Merged

8 tasks

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

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

Roll Flutter from e02e2079bea7 to f8a77225f360 (45 revisions) flutter/packages#6047

Closed

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

0b8a255

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

Roll Flutter from e02e2079bea7 to f8a77225f360 (45 revisions) flutter/packages#6048

Closed

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

c688c94

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

Roll Flutter from e02e2079bea7 to 0b5cd5073a3b (46 revisions) flutter/packages#6052

Closed

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

426eeda

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

Manual roll Flutter from e02e2079bea7 to 0b5cd5073a3b (46 revisions) flutter/packages#6053

Merged

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

734b233

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

Roll Flutter from e02e2079bea7 to 0b5cd5073a3b (46 revisions) flutter/packages#6054

Closed

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

812b357

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

Roll Flutter from e02e2079bea7 to cbc18b2c51ca (47 revisions) flutter/packages#6055

Closed

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

df94323

bartekpacia mentioned this pull request Feb 7, 2024

Reland "Update gradle lockfiles template (#140115)" #143081

Merged

13 tasks

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

85888bc Update gradle lockfiles template (flutter/flutter#140115)

48e10d5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update gradle lockfiles template #140115

Update gradle lockfiles template #140115

Uh oh!

bartekpacia commented Dec 14, 2023 •

edited

Loading

Uh oh!

bartekpacia commented Jan 1, 2024

Uh oh!

bartekpacia commented Jan 9, 2024

Uh oh!

reidbaker commented Jan 11, 2024

Uh oh!

bartekpacia commented Jan 11, 2024 •

edited

Loading

Uh oh!

bartekpacia commented Jan 11, 2024

Uh oh!

auto-submit bot commented Feb 4, 2024

Uh oh!

bartekpacia commented Feb 4, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Update gradle lockfiles template #140115

Update gradle lockfiles template #140115

Uh oh!

Conversation

bartekpacia commented Dec 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

bartekpacia commented Jan 1, 2024

Uh oh!

bartekpacia commented Jan 9, 2024

Uh oh!

reidbaker commented Jan 11, 2024

Uh oh!

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

Uh oh!

Uh oh!

bartekpacia commented Jan 11, 2024

Uh oh!

auto-submit bot commented Feb 4, 2024

Uh oh!

bartekpacia commented Feb 4, 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!

3 participants

bartekpacia commented Dec 14, 2023 •

edited

Loading

bartekpacia commented Jan 11, 2024 •

edited

Loading

bartekpacia commented Feb 4, 2024 •

edited

Loading