From 7f94b792c890dc174cf65fc329c4f1b74285996b Mon Sep 17 00:00:00 2001
From: Brian Engert <lart2150@gmail.com>
Date: Sat, 16 Nov 2024 17:15:32 -0600
Subject: [PATCH] chore: bump javafx versions and app version

---
 .github/workflows/ant.yml           | 4 ++--
 build.xml                           | 2 +-
 src/com/tivo/kmttg/gui/JavaFX.java  | 9 ++++++---
 src/com/tivo/kmttg/main/config.java | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index a913c88f..05af9c52 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -30,11 +30,11 @@ jobs:
     - name: Install Dependencies
       if: steps.javafx-cache.outputs.cache-hit != 'true'
       run: |
-       curl -o javafx.zip https://download2.gluonhq.com/openjfx/21.0.4/openjfx-21.0.4_linux-x64_bin-sdk.zip
+       curl -o javafx.zip https://download2.gluonhq.com/openjfx/21.0.5/openjfx-21.0.5_linux-x64_bin-sdk.zip
        unzip javafx.zip
     - name: Build with Ant
       run: |
-        sed -i.bak 's/<property name="fxlib" value=".*"\/>/<property name="fxlib" value="javafx-sdk-21.0.4\/lib"\/>/g' build.xml
+        sed -i.bak 's/<property name="fxlib" value=".*"\/>/<property name="fxlib" value="javafx-sdk-21.0.5\/lib"\/>/g' build.xml
         ant -noinput -buildfile build.xml
     - uses: actions/upload-artifact@v3
       with:
diff --git a/build.xml b/build.xml
index 5859f0c4..0eada448 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="kmttg" basedir="." default="all">
-    <property name="rversion" value="v2.9-l-rc1"/>
+    <property name="rversion" value="v2.9-l"/>
     <tstamp/>
     <property name="bversion" value="${DSTAMP}-${TSTAMP}"/>
     <property name="lib" value="lib"/>
diff --git a/src/com/tivo/kmttg/gui/JavaFX.java b/src/com/tivo/kmttg/gui/JavaFX.java
index 55483cb9..a7e283db 100644
--- a/src/com/tivo/kmttg/gui/JavaFX.java
+++ b/src/com/tivo/kmttg/gui/JavaFX.java
@@ -66,10 +66,13 @@ private static boolean downloadJavaFX(File currentJar) throws IOException {
 		}
 		String zipName = currentJar.getParent() + "/openfx-sdk.zip";
 		String downloadLink = "";
-		if (getJreMajorVersion() < 17) {
-		   downloadLink = "https://download2.gluonhq.com/openjfx/17.0.12/openjfx-17.0.12_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
+		int majorVersion = getJreMajorVersion();
+		if (majorVersion < 17) {
+		   downloadLink = "https://download2.gluonhq.com/openjfx/17.0.13/openjfx-17.0.13_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
+		} else if (majorVersion < 21) {
+			downloadLink = "https://download2.gluonhq.com/openjfx/21.0.5/openjfx-21.0.5_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
 		} else {
-		   downloadLink = "https://download2.gluonhq.com/openjfx/21.0.4/openjfx-21.0.4_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
+		   downloadLink = "https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
 		}
 		String zipFile = update.downloadUrl(zipName, downloadLink);
 		if (zipFile != null) {
diff --git a/src/com/tivo/kmttg/main/config.java b/src/com/tivo/kmttg/main/config.java
index 1a4a837d..65a28246 100644
--- a/src/com/tivo/kmttg/main/config.java
+++ b/src/com/tivo/kmttg/main/config.java
@@ -42,7 +42,7 @@
 import com.tivo.kmttg.httpserver.kmttgServer;
 
 public class config {
-   public static String kmttg = "kmttg v2.9-l-rc1";
+   public static String kmttg = "kmttg v2.9-l";
    
    // encoding related
    public static String encProfDir = "";