diff --git a/extras/EsotericSoftwareSpine/build.gradle b/extras/EsotericSoftwareSpine/build.gradle index 21e6aa7..c459cbb 100644 --- a/extras/EsotericSoftwareSpine/build.gradle +++ b/extras/EsotericSoftwareSpine/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.3.41' +} + def getVersion() { // Dynamically read version from CMake file String text = new File('../../appInfo.cmake').getText('UTF-8') @@ -12,29 +16,16 @@ def getVersion() { group 'com.rhubarb_lip_sync' version = getVersion() -buildscript { - ext.kotlin_version = '1.1.60' - - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -apply plugin: 'kotlin' - repositories { mavenCentral() jcenter() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" - compile 'com.beust:klaxon:0.30' - compile 'org.apache.commons:commons-lang3:3.7' - compile 'no.tornado:tornadofx:1.7.12' + implementation "org.jetbrains.kotlin: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' } compileKotlin { diff --git a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar b/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar index 27768f1..94336fc 100644 Binary files a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar and b/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar differ diff --git a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties b/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties index 62e1e30..b0acbdc 100644 --- a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties +++ b/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/AnimationFileModel.kt b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/AnimationFileModel.kt index 1f5c884..cb8edd5 100644 --- a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/AnimationFileModel.kt +++ b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/AnimationFileModel.kt @@ -6,6 +6,7 @@ import javafx.beans.property.SimpleListProperty import javafx.beans.property.SimpleObjectProperty import javafx.beans.property.SimpleStringProperty import javafx.collections.ObservableList +import tornadofx.asObservable import java.nio.file.Path import tornadofx.getValue import tornadofx.observable @@ -61,7 +62,7 @@ class AnimationFileModel(val parentModel: MainModel, animationFilePath: Path, pr audioFileModel = AudioFileModel(event, this, executor, reportResult) return@map audioFileModel } - .observable() + .asObservable() ) val audioFileModels: ObservableList by audioFileModelsProperty @@ -97,7 +98,7 @@ class AnimationFileModel(val parentModel: MainModel, animationFilePath: Path, pr } init { - slots = spineJson.slots.observable() + slots = spineJson.slots.asObservable() mouthSlot = spineJson.guessMouthSlot() } diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt index 7a67e91..abdd109 100644 --- a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt +++ b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt @@ -115,13 +115,13 @@ class MainView : View() { placeholder = Label("There are no events with associated audio files.") columnResizePolicy = SmartResize.POLICY column("Event", AudioFileModel::eventNameProperty) - .weigthedWidth(1.0) + .weightedWidth(1.0) column("Animation name", AudioFileModel::animationNameProperty) - .weigthedWidth(1.0) + .weightedWidth(1.0) column("Audio file", AudioFileModel::displayFilePathProperty) - .weigthedWidth(1.0) + .weightedWidth(1.0) column("Dialog", AudioFileModel::dialogProperty).apply { - weigthedWidth(3.0) + weightedWidth(3.0) // Make dialog column wrap setCellFactory { tableColumn -> return@setCellFactory TableCell().also { cell -> @@ -138,7 +138,7 @@ class MainView : View() { } } column("Status", AudioFileModel::audioFileStateProperty).apply { - weigthedWidth(1.0) + weightedWidth(1.0) setCellFactory { return@setCellFactory object : TableCell() { override fun updateItem(state: AudioFileState?, empty: Boolean) { @@ -176,7 +176,7 @@ class MainView : View() { } } column("", AudioFileModel::actionLabelProperty).apply { - weigthedWidth(1.0) + weightedWidth(1.0) // Show button setCellFactory { return@setCellFactory object : TableCell() { @@ -254,4 +254,4 @@ class MainView : View() { ) } } -} \ No newline at end of file +} diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/RhubarbTask.kt b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/RhubarbTask.kt index 0694e79..d615ef2 100644 --- a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/RhubarbTask.kt +++ b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/RhubarbTask.kt @@ -1,9 +1,6 @@ package com.rhubarb_lip_sync.rhubarb_for_spine import com.beust.klaxon.JsonObject -import com.beust.klaxon.array -import com.beust.klaxon.double -import com.beust.klaxon.string import com.beust.klaxon.Parser as JsonParser import org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS import java.io.* @@ -78,7 +75,7 @@ class RhubarbTask( } } - private val jsonParser = JsonParser() + private val jsonParser = JsonParser.default() private fun parseJsonObject(jsonString: String): JsonObject { return jsonParser.parse(StringReader(jsonString)) as JsonObject } diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/SpineJson.kt b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/SpineJson.kt index 2fe77b8..fbf6cae 100644 --- a/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/SpineJson.kt +++ b/extras/EsotericSoftwareSpine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/SpineJson.kt @@ -17,7 +17,7 @@ class SpineJson(private val filePath: Path) { throw EndUserException("File '$filePath' does not exist.") } try { - json = Parser().parse(filePath.toString()) as JsonObject + json = Parser.default().parse(filePath.toString()) as JsonObject } catch (e: Exception) { throw EndUserException("Wrong file format. This is not a valid JSON file.") }