fix: removed max java version limitation (#67)

Author: Ken Southerland

lib/android-tools-info.ts

@@ -41,7 +41,8 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 	private static REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=23";
 	private static VERSION_REGEX = /((\d+\.){2}\d+)/;
 	private static MIN_JAVA_VERSION = "1.8.0";
-	private static MAX_JAVA_VERSION = "13.0.0";
+	// If some java release breaks the code then set this version to the breaking release (e.g. "13.0.0")
+	private static MAX_JAVA_VERSION = null as string;
 
 	private toolsInfo: NativeScriptDoctor.IAndroidToolsInfoData;
 	public get androidHome(): string {
@@ -107,6 +108,16 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 		return errors;
 	}
 
+	public static unsupportedJavaMessage(installedJavaCompilerVersion: string): string {
+		return `Javac version ${installedJavaCompilerVersion} is not supported. You must install a java version greater than ${
+			AndroidToolsInfo.MIN_JAVA_VERSION
+		}${
+			AndroidToolsInfo.MAX_JAVA_VERSION
+				? ` and less than ${AndroidToolsInfo.MAX_JAVA_VERSION}`
+				: ""
+		}.`;
+	}
+
 	public validateJavacVersion(installedJavaCompilerVersion: string, projectDir?: string, runtimeVersion?: string): NativeScriptDoctor.IWarning[] {
 		const errors: NativeScriptDoctor.IWarning[] = [];
 
@@ -123,8 +134,8 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 				"^10.0.0": "4.1.0-2018.5.18.1"
 			};
 
-			if (semver.lt(installedJavaCompilerSemverVersion, AndroidToolsInfo.MIN_JAVA_VERSION) || semver.gte(installedJavaCompilerSemverVersion, AndroidToolsInfo.MAX_JAVA_VERSION)) {
-				warning = `Javac version ${installedJavaCompilerVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION} and below ${AndroidToolsInfo.MAX_JAVA_VERSION}.`;
+			if (semver.lt(installedJavaCompilerSemverVersion, AndroidToolsInfo.MIN_JAVA_VERSION) || (AndroidToolsInfo.MAX_JAVA_VERSION ? semver.gte(installedJavaCompilerSemverVersion, AndroidToolsInfo.MAX_JAVA_VERSION) : false)) {
+				warning = AndroidToolsInfo.unsupportedJavaMessage(installedJavaCompilerVersion);
 			} else {
 				runtimeVersion = this.getRuntimeVersion({ runtimeVersion, projectDir });
 				if (runtimeVersion) {

test/android-tools-info.ts

@@ -115,20 +115,19 @@ describe("androidToolsInfo", () => {
 			},
 			{
 				javacVersion: "1.7.0",
-				warnings: ["Javac version 1.7.0 is not supported. You have to install at least 1.8.0 and below 13.0.0."]
+				warnings: [AndroidToolsInfo.unsupportedJavaMessage("1.7.0")]
 			},
 			{
 				javacVersion: "1.7.0_132",
-				warnings: ["Javac version 1.7.0_132 is not supported. You have to install at least 1.8.0 and below 13.0.0."]
-			},
-			{
-				javacVersion: "13.0.0",
-				warnings: ["Javac version 13.0.0 is not supported. You have to install at least 1.8.0 and below 13.0.0."]
-			},
-			{
-				javacVersion: "14.1.0",
-				warnings: ["Javac version 14.1.0 is not supported. You have to install at least 1.8.0 and below 13.0.0."]
+				warnings: [AndroidToolsInfo.unsupportedJavaMessage("1.7.0_132")]
 			},
+			//
+			// Reinstate this test if there is some future max java version found to be not supported.
+			//
+			// {
+			// 	javacVersion: "14.1.0",
+			// 	warnings: [AndroidToolsInfo.unsupportedJavaMessage("14.1.0")]
+			// },
 			{
 				javacVersion: null,
 				warnings: ["Error executing command 'javac'. Make sure you have installed The Java Development Kit (JDK) and set JAVA_HOME environment variable."]