From 820a73c405a354aca2953ce80023a084d5240989 Mon Sep 17 00:00:00 2001 From: Florent Champigny Date: Sun, 25 Jan 2026 10:33:24 +0100 Subject: [PATCH 1/2] fix: build jvm was broken --- .../openflocon/flocon/websocket/FloconHttpClient.ios.kt | 1 + .../openflocon/flocon/websocket/FloconWebSocketClient.ios.kt | 4 ++++ .../openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt | 1 + 3 files changed, 6 insertions(+) diff --git a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt index 45acf66b4..b07cb6c4b 100644 --- a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt +++ b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt @@ -8,6 +8,7 @@ import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.logging.LogLevel import io.ktor.client.plugins.logging.Logging import io.ktor.client.plugins.* +import io.ktor.client.request.header import io.ktor.http.* import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.json.Json diff --git a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt index a4a497283..79efd69e3 100644 --- a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt +++ b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt @@ -5,6 +5,10 @@ import io.github.openflocon.flocon.FloconLogger import io.ktor.client.* import io.ktor.client.engine.darwin.Darwin import io.ktor.client.plugins.* +import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession +import io.ktor.client.plugins.websocket.WebSockets +import io.ktor.client.plugins.websocket.webSocketSession +import io.ktor.client.request.header import io.ktor.http.* import io.ktor.websocket.* import kotlinx.coroutines.* diff --git a/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt b/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt index b9478c03f..e00dd7759 100644 --- a/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt +++ b/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt @@ -6,6 +6,7 @@ import io.ktor.client.* import io.ktor.client.engine.cio.CIO import io.ktor.client.plugins.websocket.* import io.ktor.client.plugins.* +import io.ktor.client.request.header import io.ktor.http.* import io.ktor.websocket.* import kotlinx.coroutines.* From 421011996b08d45e09459e87438a69e5c0fdfb57 Mon Sep 17 00:00:00 2001 From: Florent Champigny Date: Sun, 25 Jan 2026 10:37:05 +0100 Subject: [PATCH 2/2] removed wildcard import --- .../flocon/websocket/FloconHttpClient.ios.kt | 4 ++-- .../websocket/FloconWebSocketClient.ios.kt | 17 +++++++++----- .../websocket/FloconWebSocketClient.jvm.kt | 22 +++++++++++++------ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt index b07cb6c4b..cd9fa5333 100644 --- a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt +++ b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt @@ -5,11 +5,11 @@ import io.github.openflocon.flocon.model.FloconFileInfo import io.ktor.client.HttpClient import io.ktor.client.engine.darwin.Darwin import io.ktor.client.plugins.contentnegotiation.ContentNegotiation +import io.ktor.client.plugins.defaultRequest import io.ktor.client.plugins.logging.LogLevel import io.ktor.client.plugins.logging.Logging -import io.ktor.client.plugins.* import io.ktor.client.request.header -import io.ktor.http.* +import io.ktor.http.HttpHeaders import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.json.Json diff --git a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt index 79efd69e3..b61edad10 100644 --- a/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt +++ b/FloconAndroid/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt @@ -2,16 +2,23 @@ package io.github.openflocon.flocon.websocket import io.github.openflocon.flocon.FloconLogger -import io.ktor.client.* +import io.ktor.client.HttpClient import io.ktor.client.engine.darwin.Darwin -import io.ktor.client.plugins.* +import io.ktor.client.plugins.defaultRequest import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession import io.ktor.client.plugins.websocket.WebSockets import io.ktor.client.plugins.websocket.webSocketSession import io.ktor.client.request.header -import io.ktor.http.* -import io.ktor.websocket.* -import kotlinx.coroutines.* +import io.ktor.http.HttpHeaders +import io.ktor.http.HttpMethod +import io.ktor.websocket.CloseReason +import io.ktor.websocket.Frame +import io.ktor.websocket.close +import io.ktor.websocket.readReason +import io.ktor.websocket.readText +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch internal actual fun buildFloconWebSocketClient(): FloconWebSocketClient { return FloconWebSocketClientIOs() diff --git a/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt b/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt index e00dd7759..cf03ab0e1 100644 --- a/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt +++ b/FloconAndroid/flocon/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt @@ -1,15 +1,23 @@ package io.github.openflocon.flocon.websocket - import io.github.openflocon.flocon.FloconLogger -import io.ktor.client.* import io.ktor.client.engine.cio.CIO -import io.ktor.client.plugins.websocket.* -import io.ktor.client.plugins.* +import io.ktor.client.HttpClient +import io.ktor.client.plugins.defaultRequest +import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession +import io.ktor.client.plugins.websocket.WebSockets +import io.ktor.client.plugins.websocket.webSocketSession import io.ktor.client.request.header -import io.ktor.http.* -import io.ktor.websocket.* -import kotlinx.coroutines.* +import io.ktor.http.HttpHeaders +import io.ktor.http.HttpMethod +import io.ktor.websocket.CloseReason +import io.ktor.websocket.Frame +import io.ktor.websocket.close +import io.ktor.websocket.readReason +import io.ktor.websocket.readText +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch internal actual fun buildFloconWebSocketClient(): FloconWebSocketClient { return FloconWebSocketClientJvm()