Skip to content

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.

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

Merged
thymikee merged 6 commits into from
Sep 8, 2019
Merged

Doctor/windows #675

Changes from 1 commit
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 Sep 4, 2019
087ce37
[Doctor] Handle Android SDK not installed
jmeistrich Sep 4, 2019
0775c3e
[Doctor] Fix Android SDK check not working on Windows
jmeistrich Sep 4, 2019
be74e70
[Doctor] Improve manual fix message for Android SDK
jmeistrich Sep 4, 2019
4bc9a5b
Change style of ANDROID_SDK check to reject
jmeistrich Sep 7, 2019
0fc832d
Change to use execa instead of exec
jmeistrich Sep 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Doctor] Handle Android SDK not installed
  • Loading branch information
@jmeistrich
jmeistrich committed Sep 4, 2019
commit 087ce37e6bf3fc8bbf5fbbedacdedd9f81e19323
18 changes: 11 additions & 7 deletions packages/cli/src/commands/doctor/healthchecks/androidSDK.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@ import {logManualInstallation} from './common';
import versionRanges from '../versionRanges';
import {doesSoftwareNeedToBeFixed} from '../checkInstallation';

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,
}),
needsToBeFixed:
(SDKs['Android SDK'] === 'Not Found' && installMessage) ||
doesSoftwareNeedToBeFixed({
version: SDKs['Android SDK']['Build Tools'][0],
versionRange: versionRanges.ANDROID_NDK,
}),
}),
runAutomaticFix: async ({loader, environmentInfo}) => {
const version = environmentInfo.SDKs['Android SDK'][0];
Expand All @@ -19,9 +25,7 @@ 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,
});
}

Expand Down