Skip to content

Commit 65d4c9c

Browse files
Glavohuanghongxun
authored andcommitted
Fix build on JDK without JavaFX
1 parent 3a1f7a1 commit 65d4c9c

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ plugins {
22
id("checkstyle")
33
}
44

5-
apply {
6-
from("javafx.gradle.kts")
7-
}
8-
95
group = "org.jackhuang"
106
version = "3.0"
117

@@ -95,4 +91,8 @@ tasks.create("checkTranslations") {
9591
}
9692
}
9793

94+
apply {
95+
from("javafx.gradle.kts")
96+
}
97+
9898
defaultTasks("clean", "build")

javafx.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ val jfxInClasspath =
5252
if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
5353
val os = System.getProperty("os.name").toLowerCase().let { osName ->
5454
when {
55-
osName.contains("win") -> "win"
55+
osName.contains("win") -> "windows"
5656
osName.contains("mac") -> "osx"
5757
osName.contains("linux") || osName.contains("unix") -> "linux"
5858
else -> null
@@ -67,7 +67,7 @@ if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
6767
}
6868

6969
if (os != null && arch != null) {
70-
val platform = jfxPlatforms.find { it.name == "$os-arch" }
70+
val platform = jfxPlatforms.find { it.name == "$os-$arch" }
7171
if (platform != null) {
7272
val groupId = platform.groupId
7373
val version = platform.version

0 commit comments

Comments
 (0)