Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected (and 2 others) #126081

Closed
wants to merge 3 commits into from

Conversation

gmackall
Copy link
Member

@gmackall gmackall commented May 4, 2023

This is a cherry pick of the following three PRs (the first one depends on changes made in the latter two).

  1. [Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected #125836
  2. [flutter_tools] Remove Version.unknown #124771
  3. Add vmservice for android build options #123034

For the first PR,
Original issue: #122376
Cherry-pick issue: #125693

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

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.

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

andrewkolos and others added 3 commits May 4, 2023 10:37
Fixes flutter#124756 by removing the concept of `Version.unknown`.

`Version` fields that needed the ability to represent an unknown version have been made nullable. Assigning `null` to them represents an unknown version.
…droid Studio bundled Java version is detected (flutter#125836)

This is an attempt to reland flutter#124085.

Differences from this attempt and the last:
1. Adds a check for null android studio versions and a test for this case.
2. Wraps the migrate code in a try-catch [per the suggestion here](https://github.com/flutter/flutter/pull/125728/files#r1181747899).

Old PR description:
This PR adds an android project migrator that checks the version of android studio and the version of gradle for conflicts, and upgrades to 7.4 if a conflict is detected. For more detail about the particular conflict, see flutter#122376.

The PR also upgrades older gradle versions being used in integration testing to 7.4.

Fixes/related to: flutter#122376 and flutter#123636
@flutter-dashboard flutter-dashboard bot closed this May 4, 2023
@flutter-dashboard
Copy link

This pull request is trying merge the branch beta, which is the name of a release branch. This is usually a mistake. See Tree Hygiene for detailed instructions on how to contribute to the Flutter project. In particular, ensure that before you start coding, you create your feature branch off of master.

This PR has been closed. If you are sure you want to merge beta, you may re-open this issue.

@flutter-dashboard flutter-dashboard bot added a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) a: text input Entering text in a text field or keyboard related problems framework flutter/packages/flutter repository. See also f: labels. f: integration_test The flutter/packages/integration_test plugin team Infra upgrades, team productivity, code health, technical debt. See also team: labels. tool Affects the "flutter" command-line tool. See also t: labels. labels May 4, 2023
@gmackall
Copy link
Member Author

gmackall commented May 4, 2023

Remaking against the correct flutter-3.10-candidate.1 instead of beta, disregard this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) a: text input Entering text in a text field or keyboard related problems f: integration_test The flutter/packages/integration_test plugin framework flutter/packages/flutter repository. See also f: labels. team Infra upgrades, team productivity, code health, technical debt. See also team: labels. tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants