lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump JavaFX to 21.0.8/25 (#4454)

Browse Source
This commit is contained in:
Glavo
2025-09-18 17:09:48 +08:00
committed by GitHub
parent 66524613b4
commit a14a265986
5 changed files with 70 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXPlatform.java
View File

@@ -25,11 +25,8 @@ import java.util.*;
public final class JavaFXPlatform {
public static final String LEGACY_JAVAFX_VERSION = "19.0.2.1";
public static final String CLASSIC_JAVAFX_VERSION = "17.0.15";
public static final String MODERN_JAVAFX_VERSION = "24.0.1";
private static final int JAVA_11 = 11;
private static final int JAVA_22 = 22;
public static final String CLASSIC_JAVAFX_VERSION = "21.0.8";
public static final String MODERN_JAVAFX_VERSION = "25";
private static final String OFFICIAL_GROUP_ID = "org.openjfx";
private static final String GLAVO_GROUP_ID = "org.glavo.hmcl.openjfx";
@@ -52,7 +49,7 @@ public final class JavaFXPlatform {
ALL.put("linux-x86_64", new JavaFXPlatform("linux"));
ALL.put("linux-arm32", new JavaFXPlatform("linux-arm32-monocle", legacyVersions));
ALL.put("linux-arm64", new JavaFXPlatform("linux-aarch64", Map.of(
JavaFXVersionType.CLASSIC, LEGACY_JAVAFX_VERSION,
JavaFXVersionType.CLASSIC, "21.0.1",
JavaFXVersionType.MODERN, MODERN_JAVAFX_VERSION
)));
ALL.put("linux-loongarch64", new JavaFXPlatform("linux", GLAVO_GROUP_ID, "17.0.8-loongarch64"));

2
buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXUtils.java
View File

@@ -76,7 +76,7 @@ public final class JavaFXUtils {
int featureVersion = Runtime.version().feature();
String version;
if (featureVersion >= 22)
if (featureVersion >= 23)
version = platform.getVersions().getOrDefault(JavaFXVersionType.MODERN, platform.getVersions().get(JavaFXVersionType.CLASSIC));
else
version = platform.getVersions().get(JavaFXVersionType.CLASSIC);

4
buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXVersionType.java
View File

@@ -21,8 +21,8 @@ package org.jackhuang.hmcl.gradle.javafx;
* @author Glavo
*/
public enum JavaFXVersionType {
CLASSIC("classic", 11),
MODERN("modern", 22);
CLASSIC("classic", 17),
MODERN("modern", 23);
private final String name;
private final int javaVersion;