Use experimental JavaFX 22 release

qzind · Dec 6, 2023 · 8c3948f · 8c3948f
1 parent d7636f1
commit 8c3948f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/ant/javafx.xml b/ant/javafx.xml
@@ -207,6 +207,18 @@
             </not>
         </condition>
 
+        <!-- FIXME:
+             - Temporary Google Drive URL
+             - Linux x86_64 only
+             - Experimental "headless" build which no longer requires "monocle"
+        -->
+        <condition property="fx.url" value="https://drive.google.com/uc?export=download&amp;id=1DEHDHmY-96xJdFT3Wjf3y2zo0slQiaoL&amp;confirm=yes">
+            <and>
+                <equals arg1="${fx.arch}" arg2="x86_64"/>
+                <equals arg1="${fx.os}" arg2="linux"/>
+            </and>
+        </condition>
+
         <property name="fx.url" value="${javafx.mirror}/${fx.majver}/openjfx-${fx.urlver}-${fx.os.fixed}-${fx.arch.fixed}_bin-sdk.zip"/>
         <property name="fx.zip" value="${out.dir}/${fx.id}.zip"/>
 

diff --git a/ant/project.properties b/ant/project.properties
@@ -30,7 +30,7 @@ separate.static.libs=true
 
 # See also qz.common.Constants.java
 javac.source=11
-javac.target=11
+javac.target=21
 java.download=https://bell-sw.com/pages/downloads/#/java-11-lts
 
 # Java vendor to bundle into software (e.g. "*BellSoft|Adoptium|Microsoft|Amazon|IBM")
@@ -48,7 +48,7 @@ jlink.java.gc.version="gc-ver-is-empty"
 # jre.skip=true
 
 # JavaFX version
-javafx.version=19_monocle
+javafx.version=21_monocle
 javafx.mirror=https://download2.gluonhq.com/openjfx
 
 # Mask tray toggle (Apple only)