From d6fad367fcb08050d1b0715ce0113866d67c2553 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Fri, 18 Jun 2021 17:58:03 +0200 Subject: [PATCH] Use OpenJFX JavaFX for compatibility with modern JREs Closes #97 --- CHANGELOG.md | 4 ++++ extras/EsotericSoftwareSpine/build.gradle.kts | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5dfafb..13516a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Version history +## Unreleased + +* **Changed** Rhubarb Lip Sync for Spine so that it works with any modern JRE ([issue #97](https://github.com/DanielSWolf/rhubarb-lip-sync/issues/97)) + ## Version 1.10.0 * **Added** switch data file exporter for Moho (formerly Anime Studio) and OpenToonz ([issue #69](https://github.com/DanielSWolf/rhubarb-lip-sync/issues/69)) diff --git a/extras/EsotericSoftwareSpine/build.gradle.kts b/extras/EsotericSoftwareSpine/build.gradle.kts index 64dda69..c30eab4 100644 --- a/extras/EsotericSoftwareSpine/build.gradle.kts +++ b/extras/EsotericSoftwareSpine/build.gradle.kts @@ -3,6 +3,7 @@ import java.io.File plugins { kotlin("jvm") version "1.3.41" + id("org.openjfx.javafxplugin") version "0.0.10" } fun getVersion(): String { @@ -22,17 +23,23 @@ version = getVersion() repositories { mavenCentral() jcenter() + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { implementation(kotlin("stdlib-jdk8")) implementation("com.beust:klaxon:5.0.1") implementation("org.apache.commons:commons-lang3:3.9") - implementation("no.tornado:tornadofx:1.7.19") + implementation("no.tornado:tornadofx:2.0.0-SNAPSHOT") testImplementation("org.junit.jupiter:junit-jupiter:5.5.0") testCompile("org.assertj:assertj-core:3.11.1") } +javafx { + version = "15.0.1" + modules("javafx.controls") +} + tasks.withType { kotlinOptions.jvmTarget = "1.8" }