diff options
| author | Joffrey Bion <joffrey.bion@booking.com> | 2020-03-27 17:22:44 +0100 |
|---|---|---|
| committer | Joffrey Bion <joffrey.bion@booking.com> | 2020-03-27 17:22:44 +0100 |
| commit | 5c27e486a2ffe71029880499df4bb279794e625c (patch) | |
| tree | 24e597ca2b3210fde93da25568e2477457fd21e7 | |
| parent | Rename isUser to isMe for clarity (diff) | |
| download | seven-wonders-5c27e486a2ffe71029880499df4bb279794e625c.tar.gz seven-wonders-5c27e486a2ffe71029880499df4bb279794e625c.tar.bz2 seven-wonders-5c27e486a2ffe71029880499df4bb279794e625c.zip | |
Upgrade to Kotlinx Serialization 0.20.0 and Krossbow 0.10.3
| -rw-r--r-- | sw-client/build.gradle.kts | 2 | ||||
| -rw-r--r-- | sw-client/src/commonMain/kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt | 4 | ||||
| -rw-r--r-- | sw-common-model/build.gradle.kts | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw-client/build.gradle.kts b/sw-client/build.gradle.kts index 42209833..0b74243d 100644 --- a/sw-client/build.gradle.kts +++ b/sw-client/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("org.jlleitschuh.gradle.ktlint") } -val krossbowVersion = "0.10.2" +val krossbowVersion = "0.10.3" kotlin { jvm() diff --git a/sw-client/src/commonMain/kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt b/sw-client/src/commonMain/kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt index 3cb2f6ee..84176e03 100644 --- a/sw-client/src/commonMain/kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt +++ b/sw-client/src/commonMain/kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt @@ -2,8 +2,8 @@ package org.luxons.sevenwonders.client import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.SerializationStrategy -import kotlinx.serialization.list -import kotlinx.serialization.serializer +import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.builtins.list import org.hildan.krossbow.stomp.StompClient import org.hildan.krossbow.stomp.StompSubscription import org.hildan.krossbow.stomp.conversions.kxserialization.StompSessionWithKxSerialization diff --git a/sw-common-model/build.gradle.kts b/sw-common-model/build.gradle.kts index a35ef0ff..ac1ad423 100644 --- a/sw-common-model/build.gradle.kts +++ b/sw-common-model/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("org.jlleitschuh.gradle.ktlint") } -val kotlinSerialization = "0.14.0" +val kotlinSerialization = "0.20.0" kotlin { jvm() @@ -15,7 +15,7 @@ kotlin { val commonMain by getting { dependencies { implementation(kotlin("stdlib-common")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlinSerialization") + api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlinSerialization") } } val commonTest by getting { @@ -27,7 +27,7 @@ kotlin { val jvmMain by getting { dependencies { implementation(kotlin("stdlib-jdk8")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinSerialization") + api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinSerialization") } } val jvmTest by getting { @@ -39,7 +39,7 @@ kotlin { val jsMain by getting { dependencies { implementation(kotlin("stdlib-js")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlinSerialization") + api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlinSerialization") } } val jsTest by getting { |