Skip to content

Validate java version #703

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
merged 1 commit into from
Jul 27, 2015
Merged

Validate java version #703

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 1 files
+2 −1 sysinfo.ts
19 changes: 17 additions & 2 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import constants = require("../constants");
import helpers = require("../common/helpers");
import fs = require("fs");
import os = require("os");
import semver = require("semver");

import androidProjectPropertiesManagerLib = require("./android-project-properties-manager");
import projectServiceBaseLib = require("./platform-project-service-base");
Expand All @@ -21,7 +22,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
private static ANDROID_PLATFORM_NAME = "android";
private static LIBS_FOLDER_NAME = "libs";

private static MIN_JAVA_VERSION = "1.7.0";

private targetApi: string;
private _androidProjectPropertiesManagers: IDictionary<IAndroidProjectPropertiesManager>;
Expand All @@ -35,6 +36,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
private $options: IOptions,
private $projectData: IProjectData,
private $propertiesParser: IPropertiesParser,
private $sysInfo: ISysInfo,
$fs: IFileSystem) {
super($fs);
this._androidProjectPropertiesManagers = Object.create(null);
Expand Down Expand Up @@ -73,7 +75,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
this.validatePackageName(this.$projectData.projectId);
this.validateProjectName(this.$projectData.projectName);

this.checkAnt().wait() && this.checkAndroid().wait();
this.checkJava().wait() && this.checkAnt().wait() && this.checkAndroid().wait();
}).future<void>()();
}

Expand Down Expand Up @@ -478,6 +480,19 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
return this.targetApi;
}).future<string>()();
}

private checkJava(): IFuture<void> {
return (() => {
try {
let javaVersion = this.$sysInfo.getSysInfo().javaVer;
if(semver.lt(javaVersion, AndroidProjectService.MIN_JAVA_VERSION)) {
this.$errors.failWithoutHelp(`Your current java version is ${javaVersion}. NativeScript CLI needs at least ${AndroidProjectService.MIN_JAVA_VERSION} version to work correctly. Ensure that you have at least ${AndroidProjectService.MIN_JAVA_VERSION} java version installed and try again.`);
}
} catch(error) {
this.$errors.failWithoutHelp("Error executing command 'java'. Make sure you have java installed and added to your PATH.");
}
}).future<void>()();
}

private checkAnt(): IFuture<void> {
return (() => {
Expand Down