From 5a02fa22206971344f08f0871c08adcfc674d299 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Wed, 15 Jun 2022 14:32:03 -0400 Subject: [PATCH] Update dependencies --- build.gradle.kts | 32 +++++++++---------- .../kotlin/net/starshipfights/server_conf.kt | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c958039..847448d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,27 +75,27 @@ kotlin { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3") - implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.5") } } val jvmMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.2") - implementation("io.ktor:ktor-server-netty:1.6.7") - implementation("io.ktor:ktor-html-builder:1.6.7") - implementation("io.ktor:ktor-auth:1.6.7") - implementation("io.ktor:ktor-serialization:1.6.7") - implementation("io.ktor:ktor-websockets:1.6.7") - implementation("io.ktor:ktor-client-apache:1.6.7") + implementation("io.ktor:ktor-server-netty:1.6.8") + implementation("io.ktor:ktor-html-builder:1.6.8") + implementation("io.ktor:ktor-auth:1.6.8") + implementation("io.ktor:ktor-serialization:1.6.8") + implementation("io.ktor:ktor-websockets:1.6.8") + implementation("io.ktor:ktor-client-apache:1.6.8") - implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.5") implementation("org.slf4j:slf4j-api:1.7.32") implementation("ch.qos.logback:logback-classic:1.2.10") @@ -116,10 +116,10 @@ kotlin { val jsMain by getting { dependencies { - implementation("io.ktor:ktor-client-js:1.6.7") - implementation("io.ktor:ktor-client-websockets:1.6.7") + implementation("io.ktor:ktor-client-js:1.6.8") + implementation("io.ktor:ktor-client-websockets:1.6.8") - implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.5") implementation("com.juul.indexeddb:core:0.2.3") } diff --git a/src/jvmMain/kotlin/net/starshipfights/server_conf.kt b/src/jvmMain/kotlin/net/starshipfights/server_conf.kt index 64166e2..b2002b8 100644 --- a/src/jvmMain/kotlin/net/starshipfights/server_conf.kt +++ b/src/jvmMain/kotlin/net/starshipfights/server_conf.kt @@ -50,7 +50,7 @@ val CurrentConfiguration: Configuration val json = JsonConfigCodec.encodeToString(Configuration.serializer(), DEFAULT_CONFIG) file.writeText(json, Charsets.UTF_8) - return DEFAULT_CONFIG + return DEFAULT_CONFIG.also { currentConfig = it } } val json = file.readText() -- 2.25.1