Add support for OpenJDK 21 (#1222)

Initial support for OpenJDK 21
qzind · Dec 10, 2024 · b576864 · b576864
1 parent 159eb92
commit b576864
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 21]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -24,7 +24,7 @@ jobs:
     runs-on: [macos-latest]
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 21]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -47,7 +47,7 @@ jobs:
     runs-on: [windows-latest]
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 21]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/App.xml b/.idea/runConfigurations/App.xml
diff --git a/ant/linux/installer.xml b/ant/linux/installer.xml
@@ -1,5 +1,6 @@
 <project name="linux-installer" basedir="../../">
     <property file="ant/project.properties"/>
+    <property file="ant/linux/linux.properties"/>
     <import file="${basedir}/ant/version.xml"/>
     <import file="${basedir}/ant/platform-detect.xml"/>
 

diff --git a/ant/linux/linux.properties b/ant/linux/linux.properties
@@ -0,0 +1,2 @@
+# Expose UNIXToolkit.getGtkVersion
+linux.launch.jigsaw=--add-opens java.desktop/sun.awt=ALL-UNNAMED
diff --git a/ant/project.properties b/ant/project.properties
@@ -29,14 +29,14 @@ jar.index=true
 separate.static.libs=true
 
 # See also qz.common.Constants.java
-javac.source=1.8
-javac.target=1.8
+javac.source=11
+javac.target=11
 java.download=https://bell-sw.com/pages/downloads/#/java-11-lts
 
 # Java vendor to bundle into software (e.g. "*BellSoft|Adoptium|Microsoft|Amazon|IBM")
 jlink.java.vendor="BellSoft"
 # Java vendor to bundle into software (e.g. "11.0.17+7")
-jlink.java.version="11.0.23+12"
+jlink.java.version="11.0.25+11"
 # Java garbage collector flavor to use (e.g. "hotspot|openj9")
 jlink.java.gc="hotspot"
 # Java garbage collector version to use (e.g. openj9: "0.35.0", zulu: "11.62.17")

diff --git a/ant/unix/unix-launcher.sh.in b/ant/unix/unix-launcher.sh.in
@@ -119,6 +119,8 @@ else
     LAUNCH_OPTS="$LAUNCH_OPTS ${launch.jigsaw}"
     if [[ "$OSTYPE" == "darwin"* ]]; then
         LAUNCH_OPTS="$LAUNCH_OPTS ${apple.launch.jigsaw}"
+    else
+        LAUNCH_OPTS="$LAUNCH_OPTS ${linux.launch.jigsaw}"
     fi
 fi
 

diff --git a/src/qz/build/JLink.java b/src/qz/build/JLink.java
@@ -255,7 +255,11 @@ private JLink deployJre() throws IOException {
                 Files.copy(jmodsPath.resolve("../../MacOS/libjli.dylib").normalize(), jliLib, StandardCopyOption.REPLACE_EXISTING);
             } catch(IOException ignore) {
                 // Fallback to flat format
-                Files.copy(jmodsPath.resolve("../lib/jli/libjli.dylib").normalize(), jliLib, StandardCopyOption.REPLACE_EXISTING);
+                String libjli = "../lib/jli/libjli.dylib";
+                if(javaSemver.getMajorVersion() >= 21) {
+                    libjli = "../lib/libjli.dylib";
+                }
+                Files.copy(jmodsPath.resolve(libjli).normalize(), jliLib, StandardCopyOption.REPLACE_EXISTING);
             }
 
             // Deploy Contents/Info.plist
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Expose UNIXToolkit.getGtkVersion
		linux.launch.jigsaw=--add-opens java.desktop/sun.awt=ALL-UNNAMED