diff --git a/build.gradle.kts b/build.gradle.kts index 260d8a5..95d148c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,14 @@ -import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.load.kotlin.signatures +import org.openjfx.gradle.JavaFXOptions plugins { - kotlin("jvm") version "1.3.11" + kotlin("jvm") version "1.3.31" id("org.jetbrains.dokka") version "0.9.17" id("maven-publish") id("signing") + id("org.openjfx.javafxplugin") version "0.0.7" + id("maven") } group = "kfoenix" @@ -15,12 +16,16 @@ version = "0.1.4" repositories { mavenCentral() + maven { url = uri("https://jitpack.io") } + } + dependencies { compile(kotlin("stdlib-jdk8")) - compile("com.jfoenix:jfoenix:8.0.8") - compile("no.tornado:tornadofx:1.7.17") { + compile("com.jfoenix:jfoenix:9.0.8") + compile("com.github.GramDev1:tornadofx2:a6a2cf8bf3") + { exclude("org.jetbrains.kotlin") } } @@ -28,7 +33,7 @@ dependencies { with(tasks) { withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } withType { @@ -46,6 +51,10 @@ val javaDocJar by tasks.creating(Jar::class) { classifier = "javadoc" from("$buildDir/javadoc") } +configure +{ + modules("javafx.controls", "javafx.fxml") +} publishing { publications { @@ -100,9 +109,11 @@ publishing { val snapshotUrl = "https://oss.sonatype.org/content/repositories/snapshots" val releaseUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - if (version.endsWith("-SNAPSHOT")) { + if (version.endsWith("-SNAPSHOT")) + { setUrl(snapshotUrl) - } else { + } else + { setUrl(releaseUrl) } } diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..f78f664 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1 @@ +jdk: openjdk11 \ No newline at end of file