AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 01:16:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

gradle: remove javafx plugin

Browse Source
This commit is contained in:
Bixilon 2022-10-17 21:07:58 +02:00
parent c0a2dfa8cb
commit 573926371c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.gradle.kts
View File

@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") version "1.7.20" kotlin("jvm") version "1.7.20"
id("org.openjfx.javafxplugin") version "0.0.13"
`jvm-test-suite` `jvm-test-suite`
application application
} }
@ -203,7 +202,9 @@ tasks.named("check") {
} }
fun DependencyHandler.javafx(name: String) { fun DependencyHandler.javafx(name: String) {
implementation("org.openjfx", "javafx-$name", javafxVersion, classifier = javafxNatives) implementation("org.openjfx", "javafx-$name", javafxVersion, classifier = javafxNatives) {
version { strictly(javafxVersion) }
}
} }
fun DependencyHandler.ikonli(name: String) { fun DependencyHandler.ikonli(name: String) {
@ -242,10 +243,6 @@ dependencies {
implementation("it.unimi.dsi", "fastutil-core", "8.5.9") implementation("it.unimi.dsi", "fastutil-core", "8.5.9")
testImplementation("org.objenesis", "objenesis", "3.3") testImplementation("org.objenesis", "objenesis", "3.3")
// javafx
javafx("graphics")
javafx("controls")
javafx("fxml")
// ikonli // ikonli
ikonli("fontawesome5-pack") ikonli("fontawesome5-pack")
@ -261,7 +258,7 @@ dependencies {
implementation("de.bixilon", "jiibles", "1.1.1") implementation("de.bixilon", "jiibles", "1.1.1")
implementation("de.bixilon", "kotlin-glm", "0.9.9.1-6") implementation("de.bixilon", "kotlin-glm", "0.9.9.1-6")
implementation("de.bixilon", "mbf-kotlin", "0.2.1") { exclude("com.github.luben", "zstd-jni") } implementation("de.bixilon", "mbf-kotlin", "0.2.1") { exclude("com.github.luben", "zstd-jni") }
implementation("de.bixilon.javafx", "javafx-svg", "0.3") { exclude("org.openjfx", "javafx-controls") } implementation("de.bixilon.javafx", "javafx-svg", "0.3")
// netty // netty
netty("buffer") netty("buffer")
@ -294,6 +291,12 @@ dependencies {
} else { } else {
compileOnly("io.netty", "netty-transport-native-epoll", nettyVersion) compileOnly("io.netty", "netty-transport-native-epoll", nettyVersion)
} }
// javafx
javafx("base")
javafx("graphics")
javafx("controls")
javafx("fxml")
} }
tasks.test { tasks.test {
@ -313,11 +316,6 @@ application {
mainClass.set("de.bixilon.minosoft.Minosoft") mainClass.set("de.bixilon.minosoft.Minosoft")
} }
javafx {
version = javafxVersion
modules("javafx.controls", "javafx.fxml")
}
val fatJar = task("fatJar", type = Jar::class) { val fatJar = task("fatJar", type = Jar::class) {
archiveBaseName.set("${project.name}-fat") archiveBaseName.set("${project.name}-fat")
manifest { manifest {