Skip to content

fix: build jvm was broken #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
florent37 merged 3 commits into from
Jan 25, 2026
Merged

fix: build jvm was broken #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
820a73c
fix: build jvm was broken
Jan 25, 2026
4210119
removed wildcard import
Jan 25, 2026
8329205
Merge branch 'main' into fix-build-jvm
florent37 Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...d/flocon/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconHttpClient.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +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.http.*
import io.ktor.client.request.header
Comment thread
florent37 marked this conversation as resolved.
import io.ktor.http.HttpHeaders
import io.ktor.serialization.kotlinx.json.json
import kotlinx.serialization.json.Json

Expand Down
21 changes: 16 additions & 5 deletions ...con/src/iosMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +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.http.*
import io.ktor.websocket.*
import kotlinx.coroutines.*
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
Comment thread
florent37 marked this conversation as resolved.
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()
Expand Down
23 changes: 16 additions & 7 deletions ...con/src/jvmMain/kotlin/io/github/openflocon/flocon/websocket/FloconWebSocketClient.jvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +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.http.*
import io.ktor.websocket.*
import kotlinx.coroutines.*
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
Comment thread
florent37 marked this conversation as resolved.
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()
Expand Down