Skip to content

Commit 5f29d02

Browse files
committed
Restructure transport modules by moving them under a single folder rsocket-transports
* additionally make rsocket-transport-ktor-websocket internal module
1 parent d5c1b35 commit 5f29d02

File tree

42 files changed

+34
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+34
-85
lines changed

rsocket-ktor/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ kotlin {
3030
sourceSets {
3131
commonMain.dependencies {
3232
api(projects.rsocketCore)
33-
api(projects.rsocketTransportKtorWebsocket)
33+
api(projects.rsocketTransportKtorWebsocketInternal)
3434
//TODO ContentNegotiation will be here later
3535
}
3636
}

rsocket-ktor/rsocket-ktor-client/src/commonMain/kotlin/io/rsocket/kotlin/ktor/client/Builders.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import io.ktor.client.request.*
2323
import io.ktor.http.*
2424
import io.rsocket.kotlin.*
2525
import io.rsocket.kotlin.transport.*
26-
import io.rsocket.kotlin.transport.ktor.websocket.*
26+
import io.rsocket.kotlin.transport.ktor.websocket.internal.*
2727
import kotlin.coroutines.*
2828

2929
public suspend fun HttpClient.rSocket(

rsocket-ktor/rsocket-ktor-server/src/commonMain/kotlin/io/rsocket/kotlin/ktor/server/Routing.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import io.ktor.server.routing.*
2121
import io.ktor.server.websocket.*
2222
import io.rsocket.kotlin.*
2323
import io.rsocket.kotlin.transport.*
24-
import io.rsocket.kotlin.transport.ktor.websocket.*
24+
import io.rsocket.kotlin.transport.ktor.websocket.internal.*
2525
import kotlinx.coroutines.*
2626

2727
public fun Route.rSocket(

rsocket-transport-ktor/api/rsocket-transport-ktor.api

Whitespace-only changes.

rsocket-transport-ktor/build.gradle.kts

Lines changed: 0 additions & 35 deletions
This file was deleted.

rsocket-transport-ktor/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/dummy.kt

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ kotlin {
2929
sourceSets {
3030
commonMain.dependencies {
3131
implementation(projects.rsocketInternalIo)
32-
33-
api(projects.rsocketTransportKtor)
32+
api(projects.rsocketCore)
3433
api(libs.ktor.network)
3534
}
3635
commonTest.dependencies {

0 commit comments

Comments
 (0)