Skip to content

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

Merged
auto-submit[bot] merged 10 commits into
flutter:masterfrom
andrewkolos:fix-jdk-search
Apr 21, 2023
Merged

When searching for the JDK bundled with an unrecognized version of Android Studio, assume the version to be the latest#125247
auto-submit[bot] merged 10 commits into
flutter:masterfrom
andrewkolos:fix-jdk-search

Conversation

@andrewkolos

@andrewkolos andrewkolos commented Apr 20, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

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.

@flutter-dashboard flutter-dashboard Bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Apr 20, 2023
@andrewkolos
andrewkolos marked this pull request as ready for review April 20, 2023 22:01
christopherfujino
christopherfujino reviewed Apr 20, 2023
View reviewed changes
Comment thread packages/flutter_tools/lib/src/android/android_studio.dart
@andrewkolos @christopherfujino
add doc for default case
df8d7ac 
Co-authored-by: Christopher Fujino <[email protected]>
christopherfujino
christopherfujino reviewed Apr 20, 2023
View reviewed changes

@christopherfujino christopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are you testing if version.major = 2023?

@andrewkolos

andrewkolos commented Apr 20, 2023

Copy link
Copy Markdown
Contributor Author

Are you testing if version.major = 2023?

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

christopherfujino
christopherfujino reviewed Apr 20, 2023
View reviewed changes
Comment thread packages/flutter_tools/test/general.shard/android/android_studio_test.dart Outdated
@andrewkolos @christopherfujino
nit
f28c1e6 
Co-authored-by: Christopher Fujino <[email protected]>
christopherfujino
christopherfujino reviewed Apr 20, 2023
View reviewed changes
Comment thread packages/flutter_tools/test/general.shard/android/android_studio_test.dart Outdated
christopherfujino
christopherfujino approved these changes Apr 21, 2023
View reviewed changes

@christopherfujino christopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@andrewkolos andrewkolos added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 21, 2023
@auto-submit
auto-submit Bot merged commit cf76b24 into flutter:master Apr 21, 2023
@andrewkolos
andrewkolos deleted the fix-jdk-search branch April 21, 2023 01:13
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 21, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 21, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
d39851a 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 21, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 21, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
eec307c 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 22, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 22, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
5d82f96 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 22, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 22, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
8a344a0 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 23, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 23, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
b7b3d0b 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 23, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 23, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
6708f12 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 24, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 24, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
f8d5c95 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 24, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 24, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
47a95d5 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 24, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 24, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
c32bdae 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 24, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 24, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
c270035 
…on 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 Apr 25, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
32f1e03 
…on 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 Apr 25, 2023
@engine-flutter-autoroll
cf76b24 When searching for the JDK bundled with an unrecognized versi…
0c47df4 
…on of Android Studio, assume the version to be the latest (flutter/flutter#125247)
@andrewkolos andrewkolos mentioned this pull request Apr 27, 2023
Merged
8 tasks done
auto-submit Bot pushed a commit that referenced this pull request May 1, 2023
@andrewkolos
[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 andrewkolos mentioned this pull request Jun 22, 2023
Closed
3 tasks done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@reidbaker reidbaker Awaiting requested review from reidbaker
1 more reviewer
@christopherfujino christopherfujino christopherfujino approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App 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.

[tools] Tool will likely not find the JDK bundled with the next major version of AndroidStudio (e.g. 2023)

2 participants

@andrewkolos @christopherfujino