AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-18 00:10:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on JDK without JavaFX

Browse Source
This commit is contained in:
Glavo 2022-01-23 19:30:21 +08:00 committed by Yuhui Huang
parent 3a1f7a13a1
commit 65d4c9c8ee
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -2,10 +2,6 @@ plugins {
id("checkstyle") id("checkstyle")
} }
apply {
from("javafx.gradle.kts")
}
group = "org.jackhuang" group = "org.jackhuang"
version = "3.0" version = "3.0"
@ -95,4 +91,8 @@ tasks.create("checkTranslations") {
} }
} }
apply {
from("javafx.gradle.kts")
}
defaultTasks("clean", "build") defaultTasks("clean", "build")

4
javafx.gradle.kts
View File

@ -52,7 +52,7 @@ val jfxInClasspath =
if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) { if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
val os = System.getProperty("os.name").toLowerCase().let { osName -> val os = System.getProperty("os.name").toLowerCase().let { osName ->
when { when {
osName.contains("win") -> "win" osName.contains("win") -> "windows"
osName.contains("mac") -> "osx" osName.contains("mac") -> "osx"
osName.contains("linux") || osName.contains("unix") -> "linux" osName.contains("linux") || osName.contains("unix") -> "linux"
else -> null else -> null
@ -67,7 +67,7 @@ if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
} }
if (os != null && arch != null) { if (os != null && arch != null) {
val platform = jfxPlatforms.find { it.name == "$os-arch" } val platform = jfxPlatforms.find { it.name == "$os-$arch" }
if (platform != null) { if (platform != null) {
val groupId = platform.groupId val groupId = platform.groupId
val version = platform.version val version = platform.version