-
Notifications
You must be signed in to change notification settings - Fork 933
Doctor/windows #675
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
Merged
thymikee
merged 6 commits into
react-native-community:master
from
jmeistrich:doctor/windows
Sep 8, 2019
Merged
Doctor/windows #675
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
346a14d
[Doctor] Don't check for watchman on Windows
jmeistrich 087ce37
[Doctor] Handle Android SDK not installed
jmeistrich 0775c3e
[Doctor] Fix Android SDK check not working on Windows
jmeistrich be74e70
[Doctor] Improve manual fix message for Android SDK
jmeistrich 4bc9a5b
Change style of ANDROID_SDK check to reject
jmeistrich 0fc832d
Change to use execa instead of exec
jmeistrich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,15 +2,60 @@ import chalk from 'chalk'; | |
| import {logManualInstallation} from './common'; | ||
| import versionRanges from '../versionRanges'; | ||
| import {doesSoftwareNeedToBeFixed} from '../checkInstallation'; | ||
| import {exec} from 'child_process'; | ||
|
|
||
| const installMessage = `Read more about how to update Android SDK at ${chalk.dim( | ||
| 'https://developer.android.com/studio', | ||
| )}`; | ||
|
|
||
| export default { | ||
| label: 'Android SDK', | ||
| getDiagnosticsAsync: async ({SDKs}) => ({ | ||
| needsToBeFixed: doesSoftwareNeedToBeFixed({ | ||
| version: SDKs['Android SDK']['Build Tools'][0], | ||
| versionRange: versionRanges.ANDROID_NDK, | ||
| }), | ||
| }), | ||
| getDiagnosticsAsync: async ({SDKs}) => { | ||
| let sdks = SDKs['Android SDK']; | ||
|
|
||
| // This is a workaround for envinfo's Android SDK check not working on | ||
| // Windows. This can be removed when envinfo fixes it. | ||
| // See the PR: https://github.com/tabrindle/envinfo/pull/119 | ||
| if (sdks === 'Not Found' && process.platform !== 'darwin') { | ||
| try { | ||
| sdks = await new Promise((resolve, reject) => { | ||
| exec( | ||
| process.env.ANDROID_HOME | ||
| ? `${process.env.ANDROID_HOME}/tools/bin/sdkmanager --list` | ||
| : 'sdkmanager --list', | ||
| (err, stdout) => { | ||
| if (err) { | ||
| reject(); | ||
| } else { | ||
| const matches = []; | ||
| const regex = /build-tools;([\d|.]+)[\S\s]/g; | ||
| let match = null; | ||
| while ((match = regex.exec(stdout)) !== null) { | ||
| matches.push(match[1]); | ||
| } | ||
| matches.length > 0 | ||
| ? resolve({ | ||
| 'Build Tools': matches, | ||
| }) | ||
| : reject(); | ||
| } | ||
| }, | ||
| ); | ||
| }); | ||
| } catch { | ||
| sdks = 'Not Found'; | ||
| } | ||
| } | ||
|
|
||
| return { | ||
| needsToBeFixed: | ||
| (sdks === 'Not Found' && installMessage) || | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we make |
||
| doesSoftwareNeedToBeFixed({ | ||
| version: sdks['Build Tools'][0], | ||
| versionRange: versionRanges.ANDROID_NDK, | ||
| }), | ||
| }; | ||
| }, | ||
| runAutomaticFix: async ({loader, environmentInfo}) => { | ||
| const version = environmentInfo.SDKs['Android SDK'][0]; | ||
| const isNDKInstalled = version !== 'Not Found'; | ||
|
|
@@ -19,15 +64,13 @@ export default { | |
|
|
||
| if (isNDKInstalled) { | ||
| return logManualInstallation({ | ||
| message: `Read more about how to update Android SDK at ${chalk.dim( | ||
| 'https://developer.android.com/studio', | ||
| )}`, | ||
| message: installMessage, | ||
| }); | ||
| } | ||
|
|
||
| return logManualInstallation({ | ||
| healthcheck: 'Android SDK', | ||
| url: 'https://developer.android.com/studio', | ||
| url: 'https://facebook.github.io/react-native/docs/getting-started', | ||
| }); | ||
| }, | ||
| }; | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.