From 7e508804a334ef2f67e9b2ed2c15f687784d6222 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Sun, 26 Nov 2023 12:08:40 -0500
Subject: [PATCH 1/2] Initial support for OpenJDK 21

---
 .github/workflows/build.yaml    | 6 +++---
 .idea/misc.xml                  | 3 +--
 .idea/runConfigurations/App.xml | 2 +-
 ant/linux/linux.properties      | 2 ++
 ant/project.properties          | 8 ++++----
 ant/unix/unix-launcher.sh.in    | 2 ++
 src/qz/build/JLink.java         | 6 +++++-
 7 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 ant/linux/linux.properties

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 576091ee6..51099484e 100644
--- 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: [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: [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: [21]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 035c46ded..86eaf4790 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="4">
@@ -8,5 +7,5 @@
       <item index="3" class="java.lang.String" itemvalue="org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage" />
     </list>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="liberica-21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/App.xml b/.idea/runConfigurations/App.xml
index da7e24112..1f8e8173a 100644
--- a/.idea/runConfigurations/App.xml
+++ b/.idea/runConfigurations/App.xml
@@ -3,7 +3,7 @@
     <option name="MAIN_CLASS_NAME" value="qz.App" />
     <module name="tray" />
     <option name="PROGRAM_PARAMETERS" value="--steal" />
-    <option name="VM_PARAMETERS" value="--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-exports java.desktop/com.apple.laf=ALL-UNNAMED --add-exports java.desktop/sun.swing=ALL-UNNAMED" />
+    <option name="VM_PARAMETERS" value="--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-exports java.desktop/com.apple.laf=ALL-UNNAMED --add-exports java.desktop/sun.swing=ALL-UNNAMED -Dapple.awt.enableTemplateImages=true" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/ant/linux/linux.properties b/ant/linux/linux.properties
new file mode 100644
index 000000000..5f060324f
--- /dev/null
+++ b/ant/linux/linux.properties
@@ -0,0 +1,2 @@
+# Expose UNIXToolkit.getGtkVersion
+linux.launch.jigsaw=--add-opens java.desktop/sun.awt=ALL-UNNAMED
\ No newline at end of file
diff --git a/ant/project.properties b/ant/project.properties
index 29d758324..8524cdea0 100644
--- 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.20.1+1"
+# Java vendor to bundle into software (e.g. "21.0.1+12")
+jlink.java.version="21.0.1+12"
 # 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
index 92b31a9b3..b56ea5c0a 100644
--- 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
index de45f5482..a6e5a76a4 100644
--- a/src/qz/build/JLink.java
+++ b/src/qz/build/JLink.java
@@ -251,7 +251,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

From 0cfd0c5d2d46fa2022eb458f55bd5a07aefc7ff2 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Thu, 30 Nov 2023 18:31:17 -0500
Subject: [PATCH 2/2] Fix linux properties

---
 ant/linux/installer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ant/linux/installer.xml b/ant/linux/installer.xml
index e6327a4fe..08477c153 100644
--- 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"/>