From 61bcba7b0a3fe28fb523455d46eab1bd212c1d04 Mon Sep 17 00:00:00 2001 From: joffrey-bion Date: Mon, 1 Feb 2021 00:34:15 +0100 Subject: Upgrade Krossbow to 1.1.5 --- sw-client/build.gradle.kts | 4 ++-- .../kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sw-client/build.gradle.kts b/sw-client/build.gradle.kts index 13546c72..421b58dd 100644 --- a/sw-client/build.gradle.kts +++ b/sw-client/build.gradle.kts @@ -11,8 +11,8 @@ kotlin { val commonMain by getting { dependencies { api(project(":sw-common-model")) - api("org.hildan.krossbow:krossbow-stomp-kxserialization:1.1.2") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0") + api("org.hildan.krossbow:krossbow-stomp-kxserialization:1.1.5") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1") } } val commonTest by getting { 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 5e627ecd..68026888 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 @@ -3,7 +3,6 @@ package org.luxons.sevenwonders.client import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.builtins.serializer import org.hildan.krossbow.stomp.StompClient import org.hildan.krossbow.stomp.config.HeartBeat @@ -29,7 +28,6 @@ class SevenWondersClient { heartBeatTolerance = HeartBeatTolerance(0, 10000) // wide margin to account for heroku cold start } - @OptIn(ExperimentalSerializationApi::class) suspend fun connect(serverUrl: String): SevenWondersSession { val session = stompClient.connect("$serverUrl$SEVEN_WONDERS_WS_ENDPOINT").withJsonConversions() return SevenWondersSession(session) -- cgit