Skip to content

Migrate Gradle#90642

Merged
blasten merged 17 commits intoflutter:masterfrom
TahaTesser:migrate_gradle
Oct 7, 2021
Merged

Migrate Gradle#90642
blasten merged 17 commits intoflutter:masterfrom
TahaTesser:migrate_gradle

Conversation

@TahaTesser
Copy link
Contributor

@TahaTesser TahaTesser commented Sep 23, 2021 •
edited
Loading

  • Migrated tools to Gradle 7.0.2 and AGP 7.0.1 (updated tests too).
  • Migrated templates to Gradle 7.0.2 and AGP 7.0.1.
  • Migrated flutter/dev samples to Gradle 7.0.2 and AGP 7.0.1.
  • Migrated flutter/examples to Gradle 7.0.2 and AGP 7.0.1.
  • Migrated packages/integration_test & packages/integration_test/example to Gradle 7.0.2 and AGP 7.0.1.
  • Update ci.yaml

Fixes #87649

A fresh take on #87761

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.

@flutter-dashboard flutter-dashboard bot added a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) d: examples Sample code and demos c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Sep 23, 2021
@google-cla google-cla bot added the cla: yes label Sep 23, 2021
@TahaTesser
Copy link
Contributor Author

TahaTesser commented Sep 24, 2021

@blasten
This is a cleaner and updated PR for #87761
For some reason ci.yaml validation is failing again

@TahaTesser TahaTesser requested a review from blasten September 24, 2021 11:04
@blasten
Copy link

blasten commented Sep 24, 2021

Thanks. Are the changes in stock_strings.dart intended?

@CaseyHillers is the ci.yaml issue real?

@CaseyHillers
Copy link
Contributor

CaseyHillers commented Sep 24, 2021

@CaseyHillers is the ci.yaml issue real?

This is an open issue i'm about to send a fix for (anyone sending PRs right when cocoon deploys is seeing this). Pushing an empty commit should fix it.

@guidezpl
Copy link
Member

guidezpl commented Sep 24, 2021

I saw activity on a related issue #81095 this morning, is it going to be a problem?

@TahaTesser
Copy link
Contributor Author

TahaTesser commented Sep 27, 2021 •
edited
Loading

@blasten
stock_strings.dart changes were intended, reversed those changes.

@TahaTesser
Copy link
Contributor Author

TahaTesser commented Sep 27, 2021

@blasten
All green

@blasten
Copy link

blasten commented Oct 5, 2021

sorry for the wait. Feel free to merge after fixing the conflict

blasten
blasten approved these changes Oct 5, 2021
View reviewed changes
Copy link

@blasten blasten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@blasten blasten mentioned this pull request Oct 5, 2021
Merged
@TahaTesser
Copy link
Contributor Author

TahaTesser commented Oct 6, 2021 •
edited
Loading

@blasten
Update ci.yaml but however there is a new failure

@TahaTesser
Copy link
Contributor Author

TahaTesser commented Oct 6, 2021

@blasten
I want to migrate to 7.0.1 while we're at it since it includes some fixes, please see the note here and this was suggested here too
Let me update this asap

@blasten
Copy link

blasten commented Oct 6, 2021

👍 let me know if it needs another review

@flutter-dashboard flutter-dashboard bot added the f: integration_test The flutter/packages/integration_test plugin label Oct 6, 2021
@TahaTesser
Copy link
Contributor Author

TahaTesser commented Oct 6, 2021 •
edited
Loading

@blasten
Completed AGP 7.0.1 updates
Let's get this merged so Greg Spencer can merge his PR :)

@TahaTesser TahaTesser requested a review from blasten October 6, 2021 22:52
@TahaTesser
Copy link
Contributor Author

TahaTesser commented Oct 6, 2021

Looks like I didn't break anything during another round of changes but requested review to be sure and cuz of slight change in files count

@TahaTesser TahaTesser changed the title [Reland] Migrate Gradle Migrate Gradle Oct 6, 2021
@blasten blasten merged commit b6459f9 into flutter:master Oct 7, 2021
@GaryQian
Copy link
Contributor

GaryQian commented Oct 7, 2021

This seems to have made the tree entirely red.

GaryQian added a commit that referenced this pull request Oct 7, 2021
@GaryQian
Revert "Migrate to Gradle 7.0.2 / AGP 7.0.1 (#90642)"
cf10ada 
This reverts commit b6459f9.
@GaryQian GaryQian mentioned this pull request Oct 7, 2021
Closed
@gspencergoog gspencergoog mentioned this pull request Oct 7, 2021
Closed
@blasten blasten mentioned this pull request Oct 7, 2021
Closed
@godofredoc godofredoc mentioned this pull request Oct 8, 2021
Merged
8 tasks
godofredoc added a commit that referenced this pull request Oct 8, 2021
@godofredoc
Move all the passing tests back to prod. (#91452)
9870880 
All these tests were moved to staging when marked as bringup
in this PR #90642
@zanderso zanderso mentioned this pull request Oct 8, 2021
Closed
godofredoc pushed a commit that referenced this pull request Oct 8, 2021
@zanderso
Revert gradle roll (#91459)
5188df0 
* Revert "Mark last failing test after gradle update as flaky. (#91423)"

This reverts commit 46a52d0.

* Revert "fix android template for Gradle 7 (#91411)"

This reverts commit 51d06d5.

* Revert "Add explicit version for mac and windows openjdk. (#91408)"

This reverts commit bf429f2.

* Revert "Update the openjdk version used by linux android tests. (#91405)"

This reverts commit 2144ab8.

* Revert "Migrate to Gradle 7.0.2 / AGP 7.0.1 (#90642)"

This reverts commit b6459f9.
clocksmith pushed a commit to clocksmith/flutter that referenced this pull request Oct 29, 2021
@TahaTesser @clocksmith
Migrate to Gradle 7.0.2 / AGP 7.0.1 (flutter#90642)
86f5e85
clocksmith pushed a commit to clocksmith/flutter that referenced this pull request Oct 29, 2021
@godofredoc @clocksmith
Move all the passing tests back to prod. (flutter#91452)
2f95c45 
All these tests were moved to staging when marked as bringup
in this PR flutter#90642
clocksmith pushed a commit to clocksmith/flutter that referenced this pull request Oct 29, 2021
@zanderso @clocksmith
Revert gradle roll (flutter#91459)
550db1f 
* Revert "Mark last failing test after gradle update as flaky. (flutter#91423)"

This reverts commit 46a52d0.

* Revert "fix android template for Gradle 7 (flutter#91411)"

This reverts commit 51d06d5.

* Revert "Add explicit version for mac and windows openjdk. (flutter#91408)"

This reverts commit bf429f2.

* Revert "Update the openjdk version used by linux android tests. (flutter#91405)"

This reverts commit 2144ab8.

* Revert "Migrate to Gradle 7.0.2 / AGP 7.0.1 (flutter#90642)"

This reverts commit b6459f9.
@andrijailic andrijailic mentioned this pull request Jan 7, 2022
Closed
@TahaTesser TahaTesser deleted the migrate_gradle branch January 1, 2023 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@blasten blasten blasten approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) c: contributor-productivity Team-specific productivity, code health, technical debt. d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[flutter_tools] Support for Android Gradle Plugin 7.0.0

5 participants

@TahaTesser @blasten @CaseyHillers @guidezpl @GaryQian