Skip to content

fix for tns-doctor command #2382

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
Plamen5kov merged 1 commit into from
Jan 4, 2017
Merged

fix for tns-doctor command #2382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/android-tools-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
private $hostInfo: IHostInfo,
private $logger: ILogger,
private $options: IOptions,
private $adb: Mobile.IAndroidDebugBridge) { }
private $adb: Mobile.IAndroidDebugBridge,
protected $staticConfig: Config.IStaticConfig) { }

public getPathToAndroidExecutable(options?: { showWarningsAsErrors: boolean }): IFuture<string> {
return ((): string => {
Expand Down Expand Up @@ -163,7 +164,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
}
let additionalMessage = "You will not be able to build your projects for Android." + EOL
+ "To be able to build for Android, verify that you have installed The Java Development Kit (JDK) and configured it according to system requirements as" + EOL +
" described in https://github.com/NativeScript/nativescript-cli#system-requirements.";
" described in " + this.$staticConfig.SYS_REQUIREMENTS_LINK;
let matchingVersion = (installedJavaVersion || "").match(AndroidToolsInfo.VERSION_REGEX);
if (matchingVersion && matchingVersion[1]) {
if (semver.lt(matchingVersion[1], AndroidToolsInfo.MIN_JAVA_VERSION)) {
Expand Down