Skip to content

Commit 02a2e0f

Browse files
author
Vladimir Enchev
committed
Min supported Java version check added
1 parent 0c5570d commit 02a2e0f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

lib/android-tools-info.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,13 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
159159

160160
public validateJavacVersion(installedJavaVersion: string, options?: { showWarningsAsErrors: boolean }): IFuture<boolean> {
161161
return ((): boolean => {
162+
// Check for min supported Java version
163+
let minJavaVersion = "1.8";
164+
if (parseInt(installedJavaVersion.substr(0, 3).replace(".", "")) < parseInt(minJavaVersion.replace(".", ""))) {
165+
this.printMessage(`Java version ${installedJavaVersion} is not supported. You have to install at least ${minJavaVersion}.`);
166+
return false;
167+
}
168+
162169
let hasProblemWithJavaVersion = false;
163170
if (options) {
164171
this.showWarningsAsErrors = options.showWarningsAsErrors;
@@ -170,7 +177,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
170177
if (matchingVersion && matchingVersion[1]) {
171178
if (semver.lt(matchingVersion[1], AndroidToolsInfo.MIN_JAVA_VERSION)) {
172179
hasProblemWithJavaVersion = true;
173-
this.printMessage(`Javac version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, additionalMessage);
180+
this.printMessage(`Java version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, additionalMessage);
174181
}
175182
} else {
176183
hasProblemWithJavaVersion = true;

0 commit comments

Comments
 (0)