choir: bump javafx versions

lart2150 · Sep 7, 2024 · 7160052 · 7160052
1 parent e234863
commit 7160052
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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.1/openjfx-21.0.1_linux-x64_bin-sdk.zip
+       curl -o javafx.zip https://download2.gluonhq.com/openjfx/21.0.4/openjfx-21.0.4_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.1\/lib"\/>/g' build.xml
+        sed -i.bak 's/<property name="fxlib" value=".*"\/>/<property name="fxlib" value="javafx-sdk-21.0.4\/lib"\/>/g' build.xml
         ant -noinput -buildfile build.xml
     - uses: actions/upload-artifact@v3
       with:

diff --git a/src/com/tivo/kmttg/gui/JavaFX.java b/src/com/tivo/kmttg/gui/JavaFX.java
@@ -67,10 +67,9 @@ 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/19.0.2.1/openjfx-19.0.2.1_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
+		   downloadLink = "https://download2.gluonhq.com/openjfx/17.0.12/openjfx-17.0.12_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
 		} else {
-		   //https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_windows-x64_bin-sdk.zip
-		   downloadLink = "https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
+		   downloadLink = "https://download2.gluonhq.com/openjfx/21.0.4/openjfx-21.0.4_" +downloadOs+ "-" + arch + "_bin-sdk.zip";
 		}
 		String zipFile = update.downloadUrl(zipName, downloadLink);
 		if (zipFile != null) {