From 8f595fcee22de4d688a0466b35674045e1a5fa9b Mon Sep 17 00:00:00 2001 From: Salomon BRYS Date: Fri, 27 Nov 2020 19:31:07 +0100 Subject: [PATCH] Updated dependencies versions. --- .../build.gradle.kts | 2 +- .../ktor/kodein-di-framework-ktor-server-jvm/build.gradle.kts | 2 +- .../kodein-di-framework-tornadofx-jvm/build.gradle.kts | 3 ++- .../src/main/kotlin/org/kodein/di/jxinject/jxInjectorModule.kt | 2 +- settings.gradle.kts | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/framework/ktor/kodein-di-framework-ktor-server-controller-jvm/build.gradle.kts b/framework/ktor/kodein-di-framework-ktor-server-controller-jvm/build.gradle.kts index 5a636836..5571bbd5 100644 --- a/framework/ktor/kodein-di-framework-ktor-server-controller-jvm/build.gradle.kts +++ b/framework/ktor/kodein-di-framework-ktor-server-controller-jvm/build.gradle.kts @@ -1,4 +1,4 @@ -val ktorVersion = "1.1.1" +val ktorVersion = "1.4.2" val logbackVersion = "1.2.3" plugins { diff --git a/framework/ktor/kodein-di-framework-ktor-server-jvm/build.gradle.kts b/framework/ktor/kodein-di-framework-ktor-server-jvm/build.gradle.kts index 65e545e9..f104d185 100644 --- a/framework/ktor/kodein-di-framework-ktor-server-jvm/build.gradle.kts +++ b/framework/ktor/kodein-di-framework-ktor-server-jvm/build.gradle.kts @@ -1,4 +1,4 @@ -val ktorVersion = "1.1.1" +val ktorVersion = "1.4.2" val logbackVersion = "1.2.3" plugins { diff --git a/framework/tornadofx/kodein-di-framework-tornadofx-jvm/build.gradle.kts b/framework/tornadofx/kodein-di-framework-tornadofx-jvm/build.gradle.kts index 31b3d41a..9a2145ef 100644 --- a/framework/tornadofx/kodein-di-framework-tornadofx-jvm/build.gradle.kts +++ b/framework/tornadofx/kodein-di-framework-tornadofx-jvm/build.gradle.kts @@ -26,7 +26,8 @@ tasks.withType { dependencies { api(project(":kodein-di")) - implementation("no.tornado:tornadofx:1.7.19") + implementation("no.tornado:tornadofx:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-reflect:${kodeinVersions.kotlin}") testImplementation("org.testfx:testfx-core:4.0.4-alpha") testImplementation("org.junit.jupiter:junit-jupiter:5.4.2") } diff --git a/kodein-di-jxinject-jvm/src/main/kotlin/org/kodein/di/jxinject/jxInjectorModule.kt b/kodein-di-jxinject-jvm/src/main/kotlin/org/kodein/di/jxinject/jxInjectorModule.kt index b364489a..40dee760 100644 --- a/kodein-di-jxinject-jvm/src/main/kotlin/org/kodein/di/jxinject/jxInjectorModule.kt +++ b/kodein-di-jxinject-jvm/src/main/kotlin/org/kodein/di/jxinject/jxInjectorModule.kt @@ -14,7 +14,7 @@ public val jxInjectorModule: DI.Module = DI.Module("JX Injector") { Bind() from SetBinding(TypeToken.Any, erased(), erasedSet()) jxQualifier(Named::class.java) { it.value } - bind() with Singleton(NoScope(), erased(), erased()) { JxInjectorContainer(Instance(erasedSet())) } + bind() with Singleton(NoScope(), erased(), false, erased()) { JxInjectorContainer(Instance(erasedSet())) } } /** diff --git a/settings.gradle.kts b/settings.gradle.kts index 05205953..3b34acc5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ buildscript { maven(url = "https://dl.bintray.com/kodein-framework/Kodein-Internal-Gradle") } dependencies { - classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:5.2.0") + classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:5.2.1") } }