[tools] allow explicitly specifying the JDK to use via a new config setting #128264
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewkolos
added
platform-android
flutter-dashboard
bot
added
the
a: text input
andrewkolos
commented
Jun 5, 2023
Comment on lines
25
to
29
| argParser.addOption('jdk-dir', help: 'The Java Development Kit (JDK) install/home directory. ' | ||
| 'If unset, flutter will search for one in the following order:\n' | ||
| ' 1) the JDK bundled with the latest installation of Android Studio,\n' | ||
| ' 2) the JDK found at the directory found in the JAVA_HOME environment variable, and\n' | ||
| " 3) the directory containing the java binary found in the user's path."); |
Contributor
Author
There was a problem hiding this comment.
I'd like to get this ordered list to be indented, but I couldn't find a way to do this. Indenting with spaces or using \t doesn't seem to work as this seems to get removed in the output. (The spaces currently here are there to satisfy args_test.dart). Here is the output from flutter config:
--android-sdk The Android SDK directory.
--android-studio-dir The Android Studio install directory. If unset, flutter will search for valid installs at well-known locations.
--jdk-dir The Java Development Kit (JDK) install/home directory. If unset, flutter will search for one in the following order:
1) the JDK bundled with the latest installation of Android Studio,
2) the JDK found at the directory found in the JAVA_HOME environment variable, and
3) the directory containing the java binary found in the user's path.
--build-dir=<out/> The relative path to override a projects build directory.
--[no-]enable-web Enable or disable Flutter for web.
andrewkolos
commented
Jun 5, 2023
| }) { | ||
| final Object? configured = config.getValue('jdk-dir'); | ||
| if (configured != null) { | ||
| return configured as String; |
Contributor
There was a problem hiding this comment.
nit, doesn't need to be in this PR, but should we move these casts to be methods on the Config class? That way it will be easier and more obvious how to refactor.
Contributor
Author
There was a problem hiding this comment.
Co-authored-by: Christopher Fujino <[email protected]>
| _updateConfig('android-studio-dir', stringArg('android-studio-dir')!); | ||
| } | ||
|
|
||
| if (argResults?.wasParsed('jdk-dir') ?? false) { |
Contributor
There was a problem hiding this comment.
I think here (and throughout this function) we should just cast argResults to a non-nullable value and get rid of all the nullable fallbacks.
Contributor
Author
There was a problem hiding this comment.
Done. I used non-null assertions. See commit within ConfigCommand.runCommand, assert argResults in non-null [sic.]
| } | ||
| final Java? java = globals.java; | ||
| if (results['jdk-dir'] == null && java != null) { | ||
| results['jdk-dir'] = java.javaHome; |
Contributor
There was a problem hiding this comment.
this is actually surprising to me, but I suppose we shouldn't break this.
| expect(jsonObject['android-sdk'], isNotNull); | ||
|
|
||
| expect(jsonObject.containsKey('jdk-dir'), true); | ||
| expect(jsonObject['jdk-dir'], isNotNull); |
Contributor
There was a problem hiding this comment.
for these and the other isNotNull expectations in this test, can we expect on the actual value, to verify we're not letting the real implementations leak through?
Contributor
Author
There was a problem hiding this comment.
Done with commit make machine flag test more precise.
This made me realize the inconsistency with some of these fields. AndroidStudio.directory is a string, AndroidSdk.directory is a Directory, and Java.javaHome doesn't fit into the <class>.directory scheme.
| }, | ||
| ); | ||
|
|
||
| final Java? java = Java.find( |
Contributor
There was a problem hiding this comment.
Can you actually call Java.find() twice in this test, once before config.setValue('jdk-dir', ...) and once after, expecting the results are different?
Contributor
Author
There was a problem hiding this comment.
Isn't this already implicitly covered by the other tests?
Contributor
There was a problem hiding this comment.
We can only rely on other tests verifying the exact setup of this test if we know that now and forever this test and the dependent test are set up in exactly the same way. Also that that other test is never deleted.
In other words, I would say that this test is not completely verifying that Java.find() is finding java.javaHome via the Config (it could be now or in the future across refactors accidentally getting the right answer from the local configuration).
andrewkolos
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jun 7, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jun 7, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jun 7, 2023
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Jun 7, 2023
Roll Flutter from 0b74153 to 8a5c22e (46 revisions) flutter/flutter@0b74153...8a5c22e 2023-06-07 [email protected] Super tiny MediaQuery doc update (flutter/flutter#127904) 2023-06-07 [email protected] Revert "Make inspector weakly referencing the inspected objects." (flutter/flutter#128436) 2023-06-07 [email protected] Update menu API docs to help developers migrate to m3 (flutter/flutter#128351) 2023-06-07 [email protected] [tools] allow explicitly specifying the JDK to use via a new config setting (flutter/flutter#128264) 2023-06-07 [email protected] Roll Flutter Engine from 6f9df0f988c1 to 59d5444cf06c (3 revisions) (flutter/flutter#128376) 2023-06-07 [email protected] Do not try to load main/default asset image if only higher-res variants exist (flutter/flutter#128143) 2023-06-07 [email protected] Addressed Ambiguity in transform.scale constructor docs (flutter/flutter#128182) 2023-06-07 [email protected] Super tiny fix of dead link (flutter/flutter#128160) 2023-06-07 [email protected] Refactor tests (flutter/flutter#128371) 2023-06-07 [email protected] Make inspector weakly referencing the inspected objects. (flutter/flutter#128095) 2023-06-07 [email protected] Add viewId to PointerEvents (flutter/flutter#128287) 2023-06-07 [email protected] Show error message in release mode when box is not laid out without losing performance (flutter/flutter#126302) 2023-06-06 [email protected] Roll Flutter Engine from ca499463ec2e to 6f9df0f988c1 (1 revision) (flutter/flutter#128363) 2023-06-06 [email protected] Update Draggable YouTube video link (flutter/flutter#128078) 2023-06-06 [email protected] Remove more rounding hacks from TextPainter (flutter/flutter#127826) 2023-06-06 [email protected] Roll Flutter Engine from 4571695f9e76 to ca499463ec2e (1 revision) (flutter/flutter#128356) 2023-06-06 [email protected] [Android] Update plugin and module templates to use Flutter constant for `compileSdkVersion` (flutter/flutter#128073) 2023-06-06 [email protected] handleSelectWord in MultiSelectableSelectionContainerDelegate should handle rects inside of rects (flutter/flutter#127478) 2023-06-06 [email protected] [flutter_tools] never tree shake 0x20 (space) font codepoints on web (flutter/flutter#128302) 2023-06-06 [email protected] Remove `textScaleFactor` dependent logic from `AppBar` (flutter/flutter#128112) 2023-06-06 [email protected] Roll Flutter Engine from b6d37f8f74ad to 4571695f9e76 (6 revisions) (flutter/flutter#128350) 2023-06-06 [email protected] Fix `Null check operator used on a null value` on TextField with contextMenuBuilder (flutter/flutter#128114) 2023-06-06 [email protected] Roll Packages from db4e5c2 to da72219 (10 revisions) (flutter/flutter#128348) 2023-06-06 [email protected] Updating cirrus docker image to ubuntu focal. (flutter/flutter#128291) 2023-06-06 [email protected] Adding example for migrating to navigation drawer (flutter/flutter#128295) 2023-06-06 [email protected] Roll Flutter Engine from 722aad83e5fe to b6d37f8f74ad (2 revisions) (flutter/flutter#128341) 2023-06-06 [email protected] Clean-up viewId casts in flutter_test (flutter/flutter#128256) 2023-06-06 [email protected] Update cherry-pick issue template to more uniform labels. (flutter/flutter#128333) 2023-06-06 [email protected] Use Material3 in the 2D viewport tests (flutter/flutter#128155) 2023-06-06 [email protected] Use a `show` over a `hide` for `test_api` exports (flutter/flutter#128298) 2023-06-06 [email protected] Roll Flutter Engine from aaa7574375a6 to 722aad83e5fe (1 revision) (flutter/flutter#128307) 2023-06-06 [email protected] Migration guide for moving from BottomNavigationBar to NavigationBar (flutter/flutter#128263) 2023-06-06 [email protected] [web] Use 'Uri' instead of 'dart:html' to extract pathname (flutter/flutter#127983) 2023-06-06 [email protected] Roll Flutter Engine from 2b353ae90731 to aaa7574375a6 (4 revisions) (flutter/flutter#128301) 2023-06-05 [email protected] Roll Flutter Engine from 220ece4d9faa to 2b353ae90731 (1 revision) (flutter/flutter#128293) 2023-06-05 49699333+dependabot[bot]@users.noreply.github.com Bump actions/labeler from 4.0.4 to 4.1.0 (flutter/flutter#128290) 2023-06-05 [email protected] Roll Flutter Engine from 7f12e3497428 to 220ece4d9faa (6 revisions) (flutter/flutter#128282) 2023-06-05 [email protected] [framework] attempt non-key solution (flutter/flutter#128273) 2023-06-05 [email protected] [labeler] Fix adding labels when name is directory (flutter/flutter#128243) 2023-06-05 [email protected] Remove scrollbar deprecations isAlwaysShown and hoverThickness (flutter/flutter#127351) 2023-06-05 [email protected] Fix update drag error that made NestedScrollView un-scrollable (flutter/flutter#127718) 2023-06-05 [email protected] Roll Flutter Engine from f9f72388a4da to 7f12e3497428 (4 revisions) (flutter/flutter#128271) 2023-06-05 [email protected] Migrate SemanticsBinding to onSemanticsActionEvent (flutter/flutter#128254) 2023-06-05 [email protected] Roll Flutter Engine from c838a1b05924 to f9f72388a4da (19 revisions) (flutter/flutter#128252) 2023-06-05 [email protected] [framework] force flexible space background to rebuild. (flutter/flutter#128138) 2023-06-05 [email protected] Roll Packages from 75085ed to db4e5c2 (4 revisions) (flutter/flutter#128246) ...
3 tasks
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 16, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 17, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 17, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #106416.
This PR adds a new
flutter configsetting namedjdk-dir. When set, the tool will use the JDK found at this location for all Java-dependent tool operations such as building Android apps via gradle and running Android SDK tools.Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.