Add AndroidSdk.sdkManagerPath, sdkManagerVersion #14247
Merged
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
a36919b to
733b238
Compare
tvolkert
reviewed
Jan 24, 2018
| @@ -285,6 +286,24 @@ class AndroidSdk { | |||
| _latestVersion = _sdkVersions.isEmpty ? null : _sdkVersions.last; | |||
| } | |||
|
|
|||
| /// Returns the filesystem path of the Android SDK manager tool or null if not found. | |||
| String get sdkManagerPath { | |||
| final String toolPath = fs.path.join(directory, 'tools', 'bin', 'sdkmanager'); | |||
There was a problem hiding this comment.
What about the Windows check we had previously where we were adding .bat?
There was a problem hiding this comment.
You should only be executing this with processManager, which automatically figures out the correct ending.
There was a problem hiding this comment.
Right, but we'll return null from this method on Windows, unless I'm missing something -- we check fs.isFileSync(toolPath) immediately below here.
There was a problem hiding this comment.
Switched to canRun, which handles the platform differences. Also got rid of the check in the path getter for consistency with other path getters in this file. Moved it to the version check.
733b238 to
c2be7f0
Compare
Convenience getters for the the path to the Android SDK manager and the currently installed version of the tool. Pre-factoring to support better checks around the --android-licenses command, which uses a feature of the SDK manager that is unsupported in older versions of the tool.
c2be7f0 to
de51636
Compare
DaveShuckerow
pushed a commit
to DaveShuckerow/flutter
that referenced
this pull request
May 14, 2018
Convenience getters for the the path to the Android SDK manager and the currently installed version of the tool. Pre-factoring to support better checks around the --android-licenses command, which uses a feature of the SDK manager that is unsupported in older versions of the tool.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Convenience getters for the the path to the Android SDK manager and the
currently installed version of the tool.
Pre-factoring to support better checks around the --android-licenses
command, which uses a feature of the SDK manager that is unsupported in
older versions of the tool.