Upgrade DemoBench to TornadoFX 1.7.15 (for Kotlin 1.2). (#2998)

This commit is contained in:
Chris Rankin 2018-04-24 19:50:43 +01:00 committed by GitHub
parent 03fb9d4be2
commit 3fb3371d52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.tornadofx_version = '1.7.10' ext.tornadofx_version = '1.7.15'
ext.jna_version = '4.1.0' ext.jna_version = '4.1.0'
ext.purejavacomm_version = '0.0.18' ext.purejavacomm_version = '0.0.18'
ext.controlsfx_version = '8.40.12' ext.controlsfx_version = '8.40.12'
@ -39,6 +39,15 @@ repositories {
} }
} }
configurations.all {
resolutionStrategy {
// Force TornadoFX to use the same version of Kotlin as Corda.
force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
}
}
dependencies { dependencies {
// TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's. // TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's.
compile "no.tornado:tornadofx:$tornadofx_version" compile "no.tornado:tornadofx:$tornadofx_version"