Skip to content

Commit

Permalink
chore: bump javafx versions and app version
Browse files Browse the repository at this point in the history
  • Loading branch information
lart2150 committed Nov 16, 2024
1 parent 041b177 commit 7f94b79
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down
9 changes: 6 additions & 3 deletions src/com/tivo/kmttg/gui/JavaFX.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/com/tivo/kmttg/main/config.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand Down

0 comments on commit 7f94b79

Please sign in to comment.