From df83c7cb14ee46d73743c1fd053d47a9b0e79e2a Mon Sep 17 00:00:00 2001
From: Joffrey Bion <joffrey.bion@booking.com>
Date: Thu, 20 Aug 2020 16:05:20 +0200
Subject: Upgrade to Kotlin 1.4 and corresponding library versions

- Kotlinx Serialization 1.0.0-RC
- Coroutines 1.3.9
- Krossbow 0.30.1
---
 .../kotlin/org/luxons/sevenwonders/client/SevenWondersClient.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sw-client/src')

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 f438e236..86831b13 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
@@ -4,8 +4,9 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 import org.hildan.krossbow.stomp.StompClient
 import org.hildan.krossbow.stomp.config.HeartBeat
@@ -33,6 +34,7 @@ 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)
@@ -71,7 +73,7 @@ class SevenWondersSession(private val stompSession: StompSessionWithKxSerializat
     )
 
     fun watchGames(): Flow<List<LobbyDTO>> =
-        stompSession.subscribe("/topic/games", LobbyDTO.serializer().list)
+        stompSession.subscribe("/topic/games", ListSerializer(LobbyDTO.serializer()))
 
     suspend fun createGame(gameName: String): LobbyDTO = stompSession.request(
         sendDestination = "/app/lobby/create",
-- 
cgit