From c1f0ff828294798add6efd4cab026fc9dce69d4b Mon Sep 17 00:00:00 2001 From: Jp78 Date: Sat, 4 May 2019 20:43:01 -0700 Subject: [PATCH 1/8] Update TornadoFX and JavaFX to support Java 11+ --- build.gradle.kts | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 260d8a5..d0b7dfc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,13 @@ -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" id("org.jetbrains.dokka") version "0.9.17" id("maven-publish") id("signing") + id("org.openjfx.javafxplugin") version "0.0.7" } group = "kfoenix" @@ -15,12 +15,14 @@ version = "0.1.4" repositories { mavenCentral() + maven("https://oss.sonatype.org/content/repositories/snapshots") } + 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("no.tornado:tornadofx:2.0.0-SNAPSHOT") { exclude("org.jetbrains.kotlin") } } @@ -46,6 +48,10 @@ val javaDocJar by tasks.creating(Jar::class) { classifier = "javadoc" from("$buildDir/javadoc") } +configure +{ + modules("javafx.controls", "javafx.fxml") +} publishing { publications { @@ -100,9 +106,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) } } From d189e4d98bb328ada54a917f01914c68af3ee04e Mon Sep 17 00:00:00 2001 From: Jp78 Date: Sat, 4 May 2019 20:49:34 -0700 Subject: [PATCH 2/8] Support Jitpack --- build.gradle.kts | 1 + jitpack.yml | 1 + 2 files changed, 2 insertions(+) create mode 100644 jitpack.yml diff --git a/build.gradle.kts b/build.gradle.kts index d0b7dfc..aba0094 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,6 +8,7 @@ plugins { id("maven-publish") id("signing") id("org.openjfx.javafxplugin") version "0.0.7" + id("maven") } group = "kfoenix" 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 From ee05094aa9916def2d2503511d397d8f7b526f5b Mon Sep 17 00:00:00 2001 From: Jp78 Date: Sat, 4 May 2019 21:44:25 -0700 Subject: [PATCH 3/8] Update --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index aba0094..c0ec0b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { with(tasks) { withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } withType { From 90e555e08b9628a3dcaa4be7be0cae0ac133108d Mon Sep 17 00:00:00 2001 From: Jp78 Date: Sun, 30 Jun 2019 23:15:26 -0600 Subject: [PATCH 4/8] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c0ec0b8..3351ffb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile 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") From 811decb3f8b5fe2311311ddb59a2fd03539f07a2 Mon Sep 17 00:00:00 2001 From: Gram <12766834+GramDev1@users.noreply.github.com> Date: Mon, 30 Jun 2025 13:32:08 -0700 Subject: [PATCH 5/8] Update build.gradle.kts --- build.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3351ffb..69a9f1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,14 +16,16 @@ version = "0.1.4" repositories { mavenCentral() - maven("https://oss.sonatype.org/content/repositories/snapshots") + maven { url = uri("https://jitpack.io") } + } dependencies { compile(kotlin("stdlib-jdk8")) compile("com.jfoenix:jfoenix:9.0.8") - compile("no.tornado:tornadofx:2.0.0-SNAPSHOT") { + compile("com.github.edvin:tornadofx2:master-17c1da8285-1") + { exclude("org.jetbrains.kotlin") } } From ecdf62f23cd911fa1c847c108e7fbda9ee6eb3d3 Mon Sep 17 00:00:00 2001 From: Gram <12766834+GramDev1@users.noreply.github.com> Date: Mon, 30 Jun 2025 13:36:57 -0700 Subject: [PATCH 6/8] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 69a9f1e..b915984 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ repositories { dependencies { compile(kotlin("stdlib-jdk8")) compile("com.jfoenix:jfoenix:9.0.8") - compile("com.github.edvin:tornadofx2:master-17c1da8285-1") + compile("com.github.edvin:tornadofx2:master-SNAPSHOT") { exclude("org.jetbrains.kotlin") } From 772303bbac6a070d311d474eed7b72e073e01b3a Mon Sep 17 00:00:00 2001 From: Gram <12766834+GramDev1@users.noreply.github.com> Date: Tue, 6 Jan 2026 22:28:56 +0700 Subject: [PATCH 7/8] Update TornadoFX dependency to specific commit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b915984..8b82515 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ repositories { dependencies { compile(kotlin("stdlib-jdk8")) compile("com.jfoenix:jfoenix:9.0.8") - compile("com.github.edvin:tornadofx2:master-SNAPSHOT") + compile("com.github.GramDev1:tornadofx2:a6a2cf8bf3")") { exclude("org.jetbrains.kotlin") } From 3e9af85822911007efcb9991c8389fe7a0bdfed1 Mon Sep 17 00:00:00 2001 From: Gram <12766834+GramDev1@users.noreply.github.com> Date: Tue, 6 Jan 2026 22:35:37 +0700 Subject: [PATCH 8/8] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8b82515..95d148c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ repositories { dependencies { compile(kotlin("stdlib-jdk8")) compile("com.jfoenix:jfoenix:9.0.8") - compile("com.github.GramDev1:tornadofx2:a6a2cf8bf3")") + compile("com.github.GramDev1:tornadofx2:a6a2cf8bf3") { exclude("org.jetbrains.kotlin") }