From 02a2e0fa290b7f2985fb6fda8b5985e200c042b3 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Thu, 9 Jun 2016 09:58:09 +0300
Subject: [PATCH] Min supported Java version check added

---
 lib/android-tools-info.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/android-tools-info.ts b/lib/android-tools-info.ts
index fec131c0c7..9dcd51d2f2 100644
--- a/lib/android-tools-info.ts
+++ b/lib/android-tools-info.ts
@@ -159,6 +159,13 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 
 	public validateJavacVersion(installedJavaVersion: string, options?: { showWarningsAsErrors: boolean }): IFuture<boolean> {
 		return ((): boolean => {
+			// Check for min supported Java version
+			let minJavaVersion = "1.8";
+			if (parseInt(installedJavaVersion.substr(0, 3).replace(".", "")) < parseInt(minJavaVersion.replace(".", ""))) {
+				this.printMessage(`Java version ${installedJavaVersion} is not supported. You have to install at least ${minJavaVersion}.`);
+				return false;
+			}
+
 			let hasProblemWithJavaVersion = false;
 			if (options) {
 				this.showWarningsAsErrors = options.showWarningsAsErrors;
@@ -170,7 +177,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			if (matchingVersion && matchingVersion[1]) {
 				if (semver.lt(matchingVersion[1], AndroidToolsInfo.MIN_JAVA_VERSION)) {
 					hasProblemWithJavaVersion = true;
-					this.printMessage(`Javac version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, additionalMessage);
+					this.printMessage(`Java version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, additionalMessage);
 				}
 			} else {
 				hasProblemWithJavaVersion = true;