Moved kRPC declarations from core to krpc-core. Updated runtime packages to be distinct between modules

Author: Mr3zee

core/build.gradle.kts

@@ -5,21 +5,17 @@
 plugins {
     alias(libs.plugins.conventions.kmp)
     alias(libs.plugins.atomicfu)
-    alias(libs.plugins.serialization)
 }
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
                 api(projects.utils)
-                implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
-
                 api(libs.coroutines.core)
+
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.reflect)
-
-                implementation(projects.krpc.krpcLogging)
             }
         }
 

core/src/commonMain/kotlin/kotlinx/rpc/internal/StreamScope.kt

@@ -5,8 +5,6 @@
 package util
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getValue
-import org.gradle.kotlin.dsl.getting
 import org.gradle.kotlin.dsl.invoke
 import java.io.File
 
@@ -15,7 +13,7 @@ fun Project.configureJs() {
 
     kotlin {
         sourceSets {
-            val jsTest by getting {
+            jsTest {
                 dependencies {
                     implementation(npm("puppeteer", "*"))
                 }

gradle-conventions-settings/src/main/kotlin/util/JsTarget.kt

@@ -12,11 +12,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(projects.core)
-                implementation(projects.utils)
-                implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
+                api(projects.krpc.krpcCore)
 
-                implementation(libs.coroutines.core)
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.reflect)
 

krpc/krpc-client/build.gradle.kts

@@ -2,21 +2,27 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package kotlinx.rpc.client
+package kotlinx.rpc.krpc.client
 
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.rpc.*
-import kotlinx.rpc.client.internal.FieldDataObject
-import kotlinx.rpc.client.internal.RPCClientConnector
-import kotlinx.rpc.client.internal.RPCFlow
-import kotlinx.rpc.internal.*
-import kotlinx.rpc.internal.logging.CommonLogger
+import kotlinx.rpc.RPCCall
+import kotlinx.rpc.RPCClient
+import kotlinx.rpc.RPCField
+import kotlinx.rpc.internal.InternalRPCApi
+import kotlinx.rpc.internal.SupervisedCompletableDeferred
+import kotlinx.rpc.internal.getOrNull
 import kotlinx.rpc.internal.map.ConcurrentHashMap
-import kotlinx.rpc.internal.transport.*
+import kotlinx.rpc.internal.serviceScopeOrNull
+import kotlinx.rpc.krpc.*
+import kotlinx.rpc.krpc.client.internal.FieldDataObject
+import kotlinx.rpc.krpc.client.internal.RPCClientConnector
+import kotlinx.rpc.krpc.client.internal.RPCFlow
+import kotlinx.rpc.krpc.internal.*
+import kotlinx.rpc.krpc.internal.logging.CommonLogger
 import kotlinx.serialization.BinaryFormat
 import kotlinx.serialization.SerialFormat
 import kotlinx.serialization.StringFormat

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/client/UninitializedRPCFieldException.kt

@@ -2,7 +2,7 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package kotlinx.rpc.client
+package kotlinx.rpc.krpc.client
 
 import kotlinx.rpc.RPC
 import kotlinx.rpc.RPCClient

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/client/awaitFieldInitialization.kt

@@ -2,7 +2,7 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package kotlinx.rpc.client.internal
+package kotlinx.rpc.krpc.client.internal
 
 import kotlinx.rpc.internal.RPCMethodClassArguments
 import kotlinx.serialization.Serializable

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/client/KRPCClient.kt renamed to krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/krpc/client/KRPCClient.kt

@@ -2,10 +2,10 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package kotlinx.rpc.client.internal
+package kotlinx.rpc.krpc.client.internal
 
-import kotlinx.rpc.RPCTransport
-import kotlinx.rpc.internal.transport.*
+import kotlinx.rpc.krpc.RPCTransport
+import kotlinx.rpc.krpc.internal.*
 import kotlinx.serialization.SerialFormat
 
 internal sealed interface CallSubscriptionId {