Skip to content

Commit a1800ef

Browse files
feat: Allow using JAVA 8+
Allow using JAVA 9 and 10 - remove the check for max version.
1 parent 1cf3633 commit a1800ef

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

lib/android-tools-info.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
1414
private static REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=23";
1515
private static VERSION_REGEX = /((\d+\.){2}\d+)/;
1616
private static MIN_JAVA_VERSION = "1.8.0";
17-
private static MAX_JAVA_VERSION = "1.9.0";
1817

1918
private toolsInfo: NativeScriptDoctor.IAndroidToolsInfoData;
2019
private androidHome = process.env["ANDROID_HOME"];
@@ -103,8 +102,6 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
103102

104103
if (semver.lt(installedJavaCompilerSemverVersion, AndroidToolsInfo.MIN_JAVA_VERSION)) {
105104
warning = `Javac version ${installedJavaCompilerVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`;
106-
} else if (semver.gte(installedJavaCompilerSemverVersion, AndroidToolsInfo.MAX_JAVA_VERSION)) {
107-
warning = `Javac version ${installedJavaCompilerVersion} is not supported. You have to install version ${AndroidToolsInfo.MIN_JAVA_VERSION}.`;
108105
}
109106

110107
if (warning) {

test/android-tools-info.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ describe("androidToolsInfo", () => {
3333
{
3434
javacVersion: "1.8.0_152"
3535
},
36-
{
37-
javacVersion: "9",
38-
warnings: ["Javac version 9 is not supported. You have to install version 1.8.0."]
39-
},
40-
{
41-
javacVersion: "9.0.1",
42-
warnings: ["Javac version 9.0.1 is not supported. You have to install version 1.8.0."]
43-
},
4436
{
4537
javacVersion: "1.7.0",
4638
warnings: ["Javac version 1.7.0 is not supported. You have to install at least 1.8.0."]

0 commit comments

Comments
 (0)