Add Java 17 support

ballerina-platform · Jul 18, 2023 · 28fe19b · 28fe19b
1 parent 45f64bd
commit 28fe19b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group=org.ballerinalang
 version=1.3.16-SNAPSHOT
 ballerinaJreVersion=1.1.0
-jreVersion=11.0.18+10
+jreVersion=17.0.7+7
 
 # For test purpose
 swan-lake-version=2201.2.0

diff --git a/resources/bin/bal b/resources/bin/bal
@@ -23,11 +23,13 @@
   fi
 
   JAVA_COMMAND=java
-  if test -d "$CURRENT_PATH/../dependencies/jdk-11.0.18+10-jre";then
+  if test -d "$CURRENT_PATH/../dependencies/jdk-17.0.7+7-jre"; then
+    JAVA_COMMAND="$CURRENT_PATH/../dependencies/jdk-17.0.7+7-jre/bin/java"
+  elif test -d "$CURRENT_PATH/../dependencies/jdk-11.0.18+10-jre"; then
     JAVA_COMMAND="$CURRENT_PATH/../dependencies/jdk-11.0.18+10-jre/bin/java"
-  elif test -d "$CURRENT_PATH/../dependencies/jdk-11.0.15+10-jre";then
+  elif test -d "$CURRENT_PATH/../dependencies/jdk-11.0.15+10-jre"; then
     JAVA_COMMAND="$CURRENT_PATH/../dependencies/jdk-11.0.15+10-jre/bin/java"
-  elif test -d "$CURRENT_PATH/../dependencies/jdk-11.0.8+10-jre";then
+  elif test -d "$CURRENT_PATH/../dependencies/jdk-11.0.8+10-jre"; then
     JAVA_COMMAND="$CURRENT_PATH/../dependencies/jdk-11.0.8+10-jre/bin/java"
   elif test -d "$CURRENT_PATH/../dependencies/jdk8u265-b01-jre"; then
     JAVA_COMMAND="$CURRENT_PATH/../dependencies/jdk8u265-b01-jre/bin/java"

diff --git a/resources/bin/bal.bat b/resources/bin/bal.bat
@@ -35,27 +35,31 @@ if "%1" == "update" set update=true
 if "%1" == "build" set build=true
 SetLocal EnableDelayedExpansion
 
-if exist %CURRENT_PATH%..\dependencies\jdk-11.0.18+10-jre (
-   set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-11.0.18+10-jre\bin\java
+if exist %CURRENT_PATH%..\dependencies\jdk-17.0.7+7-jre (
+    set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-17.0.7+7-jre\bin\java
 ) else (
-    if exist %CURRENT_PATH%..\dependencies\jdk-11.0.15+10-jre (
-       set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-11.0.15+10-jre\bin\java
+    if exist %CURRENT_PATH%..\dependencies\jdk-11.0.18+10-jre (
+        set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-11.0.18+10-jre\bin\java
     ) else (
-        if exist %CURRENT_PATH%..\dependencies\jdk-11.0.8+10-jre (
-           set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-11.0.8+10-jre\bin\java
+        if exist %CURRENT_PATH%..\dependencies\jdk-11.0.15+10-jre (
+            set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-11.0.15+10-jre\bin\java
         ) else (
-            if exist %CURRENT_PATH%..\dependencies\jdk8u332-b09-jre (
-               set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk8u332-b09-jre\bin\java
+            if exist %CURRENT_PATH%..\dependencies\jdk-11.0.8+10-jre (
+                set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk-11.0.8+10-jre\bin\java
             ) else (
-                if exist %CURRENT_PATH%..\dependencies\jdk8u265-b01-jre (
-                   set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk8u265-b01-jre\bin\java
+                if exist %CURRENT_PATH%..\dependencies\jdk8u332-b09-jre (
+                    set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk8u332-b09-jre\bin\java
                 ) else (
-                    if exist %CURRENT_PATH%..\dependencies\jdk8u202-b08-jre (
-                       set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk8u202-b08-jre\bin\java
+                    if exist %CURRENT_PATH%..\dependencies\jdk8u265-b01-jre (
+                        set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk8u265-b01-jre\bin\java
                     ) else (
-                        if not exist "%JAVA_HOME%" (
-                            echo Compatible JRE not found. Please follow the instructions in ^<BALLERINA_HOME^>\INSTALL.txt to install and setup Ballerina.
-                            exit /b
+                        if exist %CURRENT_PATH%..\dependencies\jdk8u202-b08-jre (
+                            set JAVA_CMD=%CURRENT_PATH%..\dependencies\jdk8u202-b08-jre\bin\java
+                        ) else (
+                            if not exist "%JAVA_HOME%" (
+                                echo Compatible JRE not found. Please follow the instructions in ^<BALLERINA_HOME^>\INSTALL.txt to install and setup Ballerina.
+                                exit /b
+                            )
                         )
                     )
                 )