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.

Sign up for GitHub

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

Jump to bottom

When searching for the JDK bundled with an unrecognized version of Android Studio, assume the version to be the latest #125247

Merged

auto-submit merged 10 commits into flutter:master from andrewkolos:fix-jdk-search

Apr 21, 2023

Contributor

andrewkolos commented Apr 20, 2023 •

edited

Fixes #125246 by restoring the intended behavior of #101862. That is, when searching for a JDK and we encounter an Android Studio version we don't recognize, assume it to be the latest version flutter is aware of.

Also does some light refactoring in the tests, like using test objects instead of referencing globals.

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 added 4 commits

April 20, 2023 00:23

fix

9a2d6b9


          add tests

96dd8a5


          refactor (test): reference test objects instead of globals where poss…

c9f1692

…ible


          refactor: normalize new test names

ae137ff

flutter-dashboard bot added the tool label


          lint

35600cc

andrewkolos marked this pull request as ready for review

April 20, 2023 22:01

andrewkolos requested review from reidbaker and christopherfujino

April 20, 2023 22:02

christopherfujino reviewed

View reviewed changes

packages/flutter_tools/lib/src/android/android_studio.dart Show resolved Hide resolved


          add doc for default case

df8d7ac

Co-authored-by: Christopher Fujino <fujino@google.com>

christopherfujino reviewed

View reviewed changes

Member

christopherfujino left a comment

Are you testing if version.major = 2023?

Contributor Author

andrewkolos commented Apr 20, 2023

Are you testing if version.major = 2023?

No. Instead of this, I could add a "version next" case (e.g. version 999999).


          add tests for brand-new releases of android studio

f97f61b

christopherfujino reviewed

View reviewed changes

packages/flutter_tools/test/general.shard/android/android_studio_test.dart Outdated Show resolved Hide resolved

christopherfujino reviewed

View reviewed changes

packages/flutter_tools/test/general.shard/android/android_studio_test.dart Outdated Show resolved Hide resolved

nit

f28c1e6

Co-authored-by: Christopher Fujino <fujino@google.com>

christopherfujino reviewed

View reviewed changes

packages/flutter_tools/test/general.shard/android/android_studio_test.dart Outdated Show resolved Hide resolved

andrewkolos added 2 commits

April 20, 2023 16:37


          exact match on version in test

8fafd2a


          Merge branch 'fix-jdk-search' of https://github.com/andrewkolos/flutter…

fea9e70

… into fix-jdk-search

christopherfujino approved these changes

View reviewed changes

Member

christopherfujino left a comment

LGTM

andrewkolos added the autosubmit label

auto-submit bot merged commit cf76b24 into flutter:master

122 checks passed

andrewkolos deleted the fix-jdk-search branch

April 21, 2023 01:13

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 8784eb1d8e30 (46 revisions) flutter/packages#3788

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

d39851a

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to c9004ff822cf (47 revisions) flutter/packages#3790

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

eec307c

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to d2646cf87d64 (63 revisions) flutter/packages#3796

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

5d82f96

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to d2646cf87d64 (63 revisions) flutter/packages#3797

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

8a344a0

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 60077ff97946 (66 revisions) flutter/packages#3801

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

b7b3d0b

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 60077ff97946 (66 revisions) flutter/packages#3802

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

6708f12

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 3ab8cd261597 (68 revisions) flutter/packages#3806

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

f8d5c95

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 98aaf00a096d (69 revisions) flutter/packages#3808

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

47a95d5

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 3b4ac4d5cc59 (73 revisions) flutter/packages#3810

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

c32bdae

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll mentioned this pull request

Roll Flutter from 3476b966524f to 624bdd38b08b (74 revisions) flutter/packages#3811

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

c270035

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

32f1e03

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request


          cf76b24df When searching for the JDK bundled with an unrecognized ver…

0c47df4

…sion of Android Studio, assume the version to be the latest (flutter/flutter#125247)

andrewkolos mentioned this pull request

[tools] Apply Android Studio version detection logic to explicitly configured installation directory (flutter config --android-studio-dir) #125596

Merged

8 tasks

auto-submit bot pushed a commit that referenced this pull request


          [tools] Apply Android Studio version detection logic to explicitly co…

9dbd6e6

…nfigured installation directory (`flutter config --android-studio-dir`) (#125596)

Fixes #121468 (when considered along with #125247).

This applies the pre-existing Android Studio version detection logic to the install configured with `flutter config android-studio-dir`.

andrewkolos mentioned this pull request

[tool] ☂️ Improve correctness, consistency, and maintainability of Java-finding logic across the tool #126126

Closed

3 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment