Migrate to Gradle 7.0.2 and AGP 7.0.0 #87761

TahaTesser · 2021-08-05T22:13:57Z

Migrated tools to Gradle 7.0.2 and AGP 7.0.0 (updated tests too).
Migrated templates to Gradle 7.0.2 and AGP 7.0.0.
Migrated flutter/dev samples to Gradle 7.0.2 and AGP 7.0.0.
Migrated flutter/examples to Gradle 7.0.2 and AGP 7.0.0.
Migrated packages/integration_test & packages/integration_test/example to Gradle 7.0.2 and AGP 7.0.0.

Fixes #87649

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 feature I am adding, or Hixie said the PR is test-exempt.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

TahaTesser · 2021-08-05T22:36:58Z

@blasten
Tests fails as Java 11 is required for AGP 7.0.0+ 😅

blasten · 2021-08-06T20:52:48Z

@TahaTesser perfect timing.

cc @CaseyHillers @godofredoc . Would it be possible to prioritize the work needed to get flutter_deps working on a PR like this? e.g. parse .ci.yaml in LUCI and set the JAVA_HOME & PATH based on the content of this file.

CaseyHillers · 2021-08-06T21:11:01Z

cc @CaseyHillers @godofredoc . Would it be possible to prioritize the work needed to get flutter_deps working on a PR like this? e.g. parse .ci.yaml in LUCI and set the JAVA_HOME & PATH based on the content of this file.

I could send a PR that changes it so presubmit uses the latest presubmit dependencies from ci.yaml. However, it would temporarily break tip of tree until the luci config change has propagated into prod. @blasten what is the current process for updating deps like this? Is it expected to be a hard break?

godofredoc · 2021-08-06T21:13:55Z

t be possible to prio

@TahaTesser perfect timing.

cc @CaseyHillers @godofredoc . Would it be possible to prioritize the work needed to get flutter_deps working on a PR like this? e.g. parse .ci.yaml in LUCI and set the JAVA_HOME & PATH based on the content of this file.

The only change required from the infra point of view is to update the version of the cipd dependency. @blasten are the new cipd packages ready?

blasten · 2021-08-06T21:15:43Z

It's not a breaking change. This change primarily affects someone who creates a new app using flutter create. Ideally, we keep a test that uses the current version of Gradle and JAVA version.

blasten · 2021-08-06T21:18:28Z

are the new cipd packages ready?

Yes. However, @CaseyHillers mentioned that changes like this cannot be tested in the PR

godofredoc · 2021-08-06T21:19:03Z

t be possible to prio

@TahaTesser perfect timing.
cc @CaseyHillers @godofredoc . Would it be possible to prioritize the work needed to get flutter_deps working on a PR like this? e.g. parse .ci.yaml in LUCI and set the JAVA_HOME & PATH based on the content of this file.

The only change required from the infra point of view is to update the version of the cipd dependency. @blasten are the new cipd packages ready?

Actually took a look and it seems like the new versions are there. The only change needed is to set "version": "version:11" in all the places using openjdk e.g. https://github.com/flutter/flutter/blob/master/.ci.yaml#L102 here is an example: https://github.com/flutter/engine/blob/master/.ci.yaml#L25

blasten · 2021-08-06T21:23:48Z

The only change needed is to set "version": "version:11" in all the places using openjdk

@godofredoc I thought that changes aren't propagated automatically in the PR. Is that the case? PRs like this that also have dependencies on the environment cannot be landed easily unless everything is pushed atomically.

godofredoc · 2021-08-06T21:38:42Z

The only change needed is to set "version": "version:11" in all the places using openjdk

@godofredoc I thought that changes aren't propagated automatically in the PR. Is that the case? PRs like this that also have dependencies on the environment cannot be landed easily unless everything is pushed atomically.

Post-submit like device lab won't be tested but as long as presubmit ones + manual executions of 1 linux, 1 mac and 1 windows device lab tests are successful we can have high confidence the new jdk will work properly.

CaseyHillers · 2021-08-06T22:00:46Z

I added some documentation in flutter/cocoon#1321

From an infra perspective, it's easier to support bring up builders intended to validate new versions like this. There's a few race conditions that require more extensive work to iron out to support this functionality in presubmit.

christopherfujino · 2021-08-12T21:10:05Z

@CaseyHillers, @godofredoc, @blasten
So what is the way forward to land this?

blasten · 2021-08-12T21:38:18Z

The current solution is described in https://github.com/CaseyHillers/cocoon/blob/1f1fa81e2588904908d613111a9d72e784cc6e24/CI_YAML.md#upgrading-dependencies

I wanted to try this by myself, and send a PR to see

blasten · 2021-08-23T18:40:06Z

@TahaTesser I migrated the complex_layout tests to Gradle/AGP 7.0. You can see the PR here: #88540

Steps

Bump the AGP version in android/build.gradle
Bump the Gradle version in android/gradle/wrapper/gradle-wrapper.properties
Cd into android and run ./gradlew generateLockfiles
Add the dependencies to each task in .ci.yaml See Reland: Bump to Gradle 7 and use Open JDK 11 #88540 for reference.
Mark each test as flaky. (add bringup: true)
Get LGTM, and merge.
Check the status of each task on https://flutter-dashboard.appspot.com/
If the tree got red because one of the task is not passing, then revert, fix, and reland.
If the tree is green, but one of the task flagged as flaky is not passing, then fix forward. (Send another PR with the fix)
Once all the tasks are passing, send another PR to remove bringup: true from the tasks in .ci.yaml.

…gp_7_0_0

TahaTesser · 2021-08-24T20:39:20Z

@blasten
I have all updated samples, updated Gradle lock files, ci.yaml for all the ci tasks that I could find under flutter/dev and all the ci tasks that were failing here

Now only ci_yaml flutter roller fails for some reason, I cannot figure out why.

.ci.yaml

CaseyHillers · 2021-08-24T21:20:54Z

Several of the blocks in ci.yaml have to be json parseable, so Linux ci_yaml flutter roller is ensuring all properties are json encoded. Usually this means an unnecessary trailing comma. I reviewed the file and didn't find any other issues.

TahaTesser · 2021-08-24T22:45:36Z

@blasten
All green, thanks to @CaseyHillers ci_yaml flutter roller is resolved

blasten

LGTM

TahaTesser · 2021-08-31T13:18:29Z

@blasten
I'm not sure if I can proceed with other steps without supervision
Feel to merge it for me, if changes are needed, please revert, I'm happy to help with further changes

blasten · 2021-09-20T20:43:10Z

@TahaTesser please fix the conflict, and I will merge once all checks are green.

…gp_7_0_0

…ate_to_agp_7_0_0" This reverts commit 1fd7178, reversing changes made to 4c33b64.

christopherfujino · 2021-09-21T16:10:56Z

@TahaTesser I'm guessing bad merge due to the size of the diff?

TahaTesser · 2021-09-22T14:38:00Z

Closing this for a new PR, I will file in a day or two

TahaTesser added 6 commits August 6, 2021 00:20

Migrate tools to AGP 7.0.0 and update templates

840182d

migrate dev samples to AGP 7.0.0

a985c7f

migrate flutter/examples to AGP 7.0.0

b977ff4

update gradle_test.dart

801eb82

update integration/example to AGP 7.0.0

86abda1

migrate packages/integration to AGP 3.0.0

eee5cb6

TahaTesser requested a review from blasten August 5, 2021 22:14

google-cla bot added the cla: yes label Aug 5, 2021

minor fix

de7641b

blasten mentioned this pull request Aug 12, 2021

Bump to Gradle 7 and use Open JDK 11 #88133

Merged

TahaTesser added 3 commits August 23, 2021 23:02

Merge branch 'master' of github.com:flutter/flutter into migrate_to_a…

e7333ac

…gp_7_0_0

update benchmarks

3c096a0

update manual_tests, flutter/examples, integration_test/example

3d86bb8

TahaTesser added 6 commits August 24, 2021 21:49

update ci.yaml

2bb9cf9

update ci.yaml

ea77583

update ci.yaml

7a13d87

update ci.yaml

e9948f1

update ci.yaml

c344d1d

update ci.yaml

4e79a11

CaseyHillers reviewed Aug 24, 2021

View reviewed changes

update ci.yaml

1571bdf

This comment has been minimized.

Sign in to view

one more trailing command

4c33b64

This comment has been minimized.

Sign in to view

blasten approved these changes Aug 24, 2021

View reviewed changes

TahaTesser added 2 commits September 21, 2021 16:23

Merge branch 'master' of github.com:flutter/flutter into migrate_to_a…

1fd7178

…gp_7_0_0

Revert "Merge branch 'master' of github.com:flutter/flutter into migr…

8767c24

…ate_to_agp_7_0_0" This reverts commit 1fd7178, reversing changes made to 4c33b64.

TahaTesser requested review from christopherfujino and Piinks as code owners September 21, 2021 13:32

TahaTesser removed the request for review from Piinks September 21, 2021 17:09

blasten mentioned this pull request Sep 21, 2021

Allow Gradle invocations to use Java SDK besides Android Studio bundle JRE #81974

Closed

TahaTesser closed this Sep 22, 2021

TahaTesser deleted the migrate_to_agp_7_0_0 branch September 22, 2021 14:38

TahaTesser mentioned this pull request Sep 23, 2021

Migrate Gradle #90642

Merged

8 tasks

Migrate to Gradle 7.0.2 and AGP 7.0.0 #87761

Migrate to Gradle 7.0.2 and AGP 7.0.0 #87761

Uh oh!

Conversation

TahaTesser commented Aug 5, 2021

Pre-launch Checklist

Uh oh!

TahaTesser commented Aug 5, 2021

Uh oh!

blasten commented Aug 6, 2021

Uh oh!

CaseyHillers commented Aug 6, 2021

Uh oh!

godofredoc commented Aug 6, 2021

Uh oh!

blasten commented Aug 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blasten commented Aug 6, 2021

Uh oh!

godofredoc commented Aug 6, 2021

Uh oh!

blasten commented Aug 6, 2021

Uh oh!

godofredoc commented Aug 6, 2021

Uh oh!

CaseyHillers commented Aug 6, 2021

Uh oh!

christopherfujino commented Aug 12, 2021

Uh oh!

blasten commented Aug 12, 2021

Uh oh!

blasten commented Aug 23, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Steps

Uh oh!

TahaTesser commented Aug 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CaseyHillers commented Aug 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

TahaTesser commented Aug 24, 2021

Uh oh!

blasten left a comment

Choose a reason for hiding this comment

Uh oh!

TahaTesser commented Aug 31, 2021

Uh oh!

blasten commented Sep 20, 2021

Uh oh!

christopherfujino commented Sep 21, 2021

Uh oh!

TahaTesser commented Sep 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

blasten commented Aug 6, 2021 •

edited

Loading

blasten commented Aug 23, 2021 •

edited

Loading

TahaTesser commented Aug 24, 2021 •

edited

Loading

CaseyHillers commented Aug 24, 2021 •

edited

Loading

TahaTesser commented Sep 22, 2021 •

edited

Loading