restructure transport modules

* rename ktor-websocket to ktor-websocket-internal and make it an implementation dependency (not exposed)
* move all transports under `rsocket-transports` folder
* drop empty modules
* implement small DSL for including projects

build-settings/src/main/kotlin/rsocketsettings/ProjectsScope.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rsocketsettings
+
+import org.gradle.api.initialization.*
+
+fun Settings.projects(block: ProjectsScope.() -> Unit) {
+    ProjectsScope(settings, emptyList(), emptyList()).apply(block)
+}
+
+class ProjectsScope(
+    private val settings: Settings,
+    private val pathParts: List<String>,
+    private val prefixParts: List<String>,
+) {
+
+    fun module(name: String) {
+        val moduleName = (prefixParts + name).joinToString("-")
+        val modulePath = (pathParts + name).joinToString("/")
+
+        settings.include(moduleName)
+        settings.project(":$moduleName").projectDir = settings.rootDir.resolve(modulePath)
+    }
+
+    fun module(name: String, prefix: String = name, nested: ProjectsScope.() -> Unit = {}) {
+        module(name)
+        folder(name, prefix, nested)
+    }
+
+    fun folder(name: String, prefix: String = name, block: ProjectsScope.() -> Unit) {
+        ProjectsScope(settings, pathParts + name, prefixParts + prefix).apply(block)
+    }
+}

rsocket-ktor/rsocket-ktor-client/build.gradle.kts → rsocket-ktor/client/build.gradle.kts

@@ -29,7 +29,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketKtor)
+            implementation(projects.rsocketTransportKtorWebsocketInternal)
+            api(projects.rsocketCore)
             api(libs.ktor.client.websockets)
         }
     }

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

@@ -23,7 +23,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlin.coroutines.*
 
 public suspend fun HttpClient.rSocket(

rsocket-ktor/rsocket-ktor-server/build.gradle.kts → rsocket-ktor/server/build.gradle.kts

@@ -28,11 +28,12 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketKtor)
+            implementation(projects.rsocketTransportKtorWebsocketInternal)
+            api(projects.rsocketCore)
             api(libs.ktor.server.websockets)
         }
         commonTest.dependencies {
-            implementation(projects.rsocketKtor.rsocketKtorClient)
+            implementation(projects.rsocketKtorClient)
             implementation(projects.rsocketTransportTests) //port provider
             implementation(libs.ktor.client.cio)
             implementation(libs.ktor.server.cio)

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

@@ -21,7 +21,7 @@ import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlinx.coroutines.*
 
 public fun Route.rSocket(

rsocket-ktor/rsocket-ktor-server/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketConnectionTest.kt → rsocket-ktor/server/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketConnectionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-ktor/rsocket-transport-ktor-tcp/build.gradle.kts → rsocket-transports/ktor-tcp/build.gradle.kts

@@ -29,8 +29,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(projects.rsocketInternalIo)
-
-            api(projects.rsocketTransportKtor)
+            api(projects.rsocketCore)
             api(libs.ktor.network)
         }
         commonTest.dependencies {

rsocket-transport-ktor/rsocket-transport-ktor-tcp/src/jvmMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/defaultDispatcher.kt → rsocket-transports/ktor-tcp/src/jvmMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/defaultDispatcher.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-ktor/rsocket-transport-ktor-tcp/src/nativeMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/defaultDispatcher.kt → rsocket-transports/ktor-tcp/src/nativeMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/defaultDispatcher.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-ktor/rsocket-transport-ktor-websocket-client/build.gradle.kts → rsocket-transports/ktor-websocket-client/build.gradle.kts

@@ -29,7 +29,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketTransportKtor.rsocketTransportKtorWebsocket)
+            implementation(projects.rsocketTransportKtorWebsocketInternal)
+            api(projects.rsocketCore)
             api(libs.ktor.client.core)
             api(libs.ktor.client.websockets)
         }

rsocket-transport-ktor/rsocket-transport-ktor-websocket-client/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/client/WebSocketClientTransport.kt → rsocket-transports/ktor-websocket-client/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/client/WebSocketClientTransport.kt

@@ -26,7 +26,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 

rsocket-transport-ktor/rsocket-transport-ktor-websocket-client/src/jsTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/client/ClientWebSocketTransportTest.kt → rsocket-transports/ktor-websocket-client/src/jsTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/client/ClientWebSocketTransportTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-ktor/rsocket-transport-ktor-websocket/api/rsocket-transport-ktor-websocket.api → rsocket-transports/ktor-websocket-internal/api/rsocket-transport-ktor-websocket-internal.api

@@ -1,4 +1,4 @@
-public final class io/rsocket/kotlin/transport/ktor/websocket/WebSocketConnection : io/rsocket/kotlin/Connection, kotlinx/coroutines/CoroutineScope {
+public final class io/rsocket/kotlin/transport/ktor/websocket/internal/WebSocketConnection : io/rsocket/kotlin/Connection, kotlinx/coroutines/CoroutineScope {
 	public fun <init> (Lio/ktor/websocket/WebSocketSession;)V
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	public fun receive (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

rsocket-transport-ktor/rsocket-transport-ktor-websocket/build.gradle.kts → rsocket-transports/ktor-websocket-internal/build.gradle.kts

@@ -29,7 +29,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketTransportKtor)
+            api(projects.rsocketCore)
             api(libs.ktor.websockets)
         }
     }

rsocket-transport-ktor/rsocket-transport-ktor-websocket/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/WebSocketConnection.kt → rsocket-transports/ktor-websocket-internal/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/internal/WebSocketConnection.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.transport.ktor.websocket
+package io.rsocket.kotlin.transport.ktor.websocket.internal
 
 import io.ktor.utils.io.core.*
 import io.ktor.websocket.*

rsocket-transport-ktor/rsocket-transport-ktor-websocket-server/build.gradle.kts → rsocket-transports/ktor-websocket-server/build.gradle.kts

@@ -28,13 +28,14 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.rsocketTransportKtor.rsocketTransportKtorWebsocket)
+            implementation(projects.rsocketTransportKtorWebsocketInternal)
+            api(projects.rsocketCore)
             api(libs.ktor.server.host.common)
             api(libs.ktor.server.websockets)
         }
         commonTest.dependencies {
             implementation(projects.rsocketTransportTests)
-            implementation(projects.rsocketTransportKtor.rsocketTransportKtorWebsocketClient)
+            implementation(projects.rsocketTransportKtorWebsocketClient)
             implementation(libs.ktor.client.cio)
             implementation(libs.ktor.server.cio)
         }

rsocket-transport-ktor/rsocket-transport-ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketServerTransport.kt → rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketServerTransport.kt

@@ -22,7 +22,7 @@ import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.transport.*
-import io.rsocket.kotlin.transport.ktor.websocket.*
+import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 
 //TODO: will be reworked later with transport API rework
 

rsocket-transport-ktor/rsocket-transport-ktor-websocket-server/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/CIOWebSocketTransportTest.kt → rsocket-transports/ktor-websocket-server/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/CIOWebSocketTransportTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-ktor/rsocket-transport-ktor-websocket-server/src/jvmTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketTransportTests.kt → rsocket-transports/ktor-websocket-server/src/jvmTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/WebSocketTransportTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-nodejs-tcp/src/jsMain/kotlin/io/rsocket/kotlin/transport/nodejs/tcp/FrameWithLengthAssembler.kt → rsocket-transports/nodejs-tcp/src/jsMain/kotlin/io/rsocket/kotlin/transport/nodejs/tcp/FrameWithLengthAssembler.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-nodejs-tcp/src/jsMain/kotlin/io/rsocket/kotlin/transport/nodejs/tcp/internal/ext.kt → rsocket-transports/nodejs-tcp/src/jsMain/kotlin/io/rsocket/kotlin/transport/nodejs/tcp/internal/ext.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rsocket-transport-nodejs-tcp/src/jsMain/kotlin/io/rsocket/kotlin/transport/nodejs/tcp/internal/nodejs.net.kt → rsocket-transports/nodejs-tcp/src/jsMain/kotlin/io/rsocket/kotlin/transport/nodejs/tcp/internal/nodejs.net.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

settings.gradle.kts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import rsocketsettings.*
+
 pluginManagement {
     includeBuild("build-logic")
     includeBuild("build-settings")
@@ -25,30 +27,29 @@ plugins {
 
 rootProject.name = "rsocket-kotlin"
 
-//include("benchmarks")
+projects {
+    module("rsocket-internal-io")
+    module("rsocket-core")
 
-include("rsocket-internal-io")
+    module("rsocket-test")
+    module("rsocket-transport-tests")
 
-include("rsocket-core")
-include("rsocket-test")
+    // transports
+    folder("rsocket-transports", "rsocket-transport") {
+        module("local")
 
-include("rsocket-transport-tests")
-include("rsocket-transport-local")
+        module("ktor-tcp")
 
-//ktor transport modules
-include(
-    "rsocket-transport-ktor",
-    "rsocket-transport-ktor:rsocket-transport-ktor-tcp",
-    "rsocket-transport-ktor:rsocket-transport-ktor-websocket",
-    "rsocket-transport-ktor:rsocket-transport-ktor-websocket-client",
-    "rsocket-transport-ktor:rsocket-transport-ktor-websocket-server",
-)
+        module("ktor-websocket-client")
+        module("ktor-websocket-server")
+        module("ktor-websocket-internal")
 
-include("rsocket-transport-nodejs-tcp")
+        module("nodejs-tcp")
+    }
 
-//deep ktor integration module
-include(
-    "rsocket-ktor",
-    "rsocket-ktor:rsocket-ktor-client",
-    "rsocket-ktor:rsocket-ktor-server",
-)
+    // ktor integration module
+    folder("rsocket-ktor") {
+        module("client")
+        module("server")
+    }
+}