Skip to content

Commit c9c6d03

Browse files
Mr3zeeMr3zee
authored
Move kRPC declarations from core (#186)
1 parent c1215f4 commit c9c6d03

File tree

119 files changed

+472
-535
lines changed

Some content is hidden

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

119 files changed

+472
-535
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ object Const {
2626

2727
apiValidation {
2828
ignoredPackages.add("kotlinx.rpc.internal")
29+
ignoredPackages.add("kotlinx.rpc.krpc.internal")
2930

3031
ignoredProjects.addAll(
3132
listOf(

‎core/api/core.api‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -45,62 +45,6 @@ public abstract interface class kotlinx/rpc/RPCClient : kotlinx/coroutines/Corou
4545
public abstract fun registerStateFlowField (Lkotlinx/coroutines/CoroutineScope;Lkotlinx/rpc/RPCField;)Lkotlinx/coroutines/flow/StateFlow;
4646
}
4747

48-
public abstract interface class kotlinx/rpc/RPCConfig {
49-
public abstract fun getSerialFormatInitializer ()Lkotlinx/rpc/serialization/RPCSerialFormatBuilder;
50-
public abstract fun getSharedFlowBuilder ()Lkotlin/jvm/functions/Function0;
51-
public abstract fun getWaitForServices ()Z
52-
}
53-
54-
public final class kotlinx/rpc/RPCConfig$Client : kotlinx/rpc/RPCConfig {
55-
public fun getSerialFormatInitializer ()Lkotlinx/rpc/serialization/RPCSerialFormatBuilder;
56-
public fun getSharedFlowBuilder ()Lkotlin/jvm/functions/Function0;
57-
public fun getWaitForServices ()Z
58-
}
59-
60-
public final class kotlinx/rpc/RPCConfig$Server : kotlinx/rpc/RPCConfig {
61-
public fun getSerialFormatInitializer ()Lkotlinx/rpc/serialization/RPCSerialFormatBuilder;
62-
public fun getSharedFlowBuilder ()Lkotlin/jvm/functions/Function0;
63-
public fun getWaitForServices ()Z
64-
}
65-
66-
public abstract class kotlinx/rpc/RPCConfigBuilder {
67-
protected final fun getSharedFlowBuilder ()Lkotlin/jvm/functions/Function0;
68-
public final fun getWaitForServices ()Z
69-
protected final fun rpcSerialFormat ()Lkotlinx/rpc/serialization/RPCSerialFormatBuilder;
70-
public final fun serialization (Lkotlin/jvm/functions/Function1;)V
71-
protected final fun setSharedFlowBuilder (Lkotlin/jvm/functions/Function0;)V
72-
public final fun setWaitForServices (Z)V
73-
public final fun sharedFlowParameters (Lkotlin/jvm/functions/Function1;)V
74-
}
75-
76-
public final class kotlinx/rpc/RPCConfigBuilder$Client : kotlinx/rpc/RPCConfigBuilder {
77-
public fun <init> ()V
78-
public final fun build ()Lkotlinx/rpc/RPCConfig$Client;
79-
}
80-
81-
public final class kotlinx/rpc/RPCConfigBuilder$Server : kotlinx/rpc/RPCConfigBuilder {
82-
public fun <init> ()V
83-
public final fun build ()Lkotlinx/rpc/RPCConfig$Server;
84-
}
85-
86-
public final class kotlinx/rpc/RPCConfigBuilder$SharedFlowParametersBuilder {
87-
public static final field DEFAULT_EXTRA_BUFFER_CAPACITY I
88-
public static final field DEFAULT_REPLAY I
89-
public final fun getExtraBufferCapacity ()I
90-
public final fun getOnBufferOverflow ()Lkotlinx/coroutines/channels/BufferOverflow;
91-
public final fun getReplay ()I
92-
public final fun setExtraBufferCapacity (I)V
93-
public final fun setOnBufferOverflow (Lkotlinx/coroutines/channels/BufferOverflow;)V
94-
public final fun setReplay (I)V
95-
}
96-
97-
public final class kotlinx/rpc/RPCConfigKt {
98-
public static final fun rpcClientConfig (Lkotlin/jvm/functions/Function1;)Lkotlinx/rpc/RPCConfig$Client;
99-
public static synthetic fun rpcClientConfig$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/rpc/RPCConfig$Client;
100-
public static final fun rpcServerConfig (Lkotlin/jvm/functions/Function1;)Lkotlinx/rpc/RPCConfig$Server;
101-
public static synthetic fun rpcServerConfig$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/rpc/RPCConfig$Server;
102-
}
103-
10448
public abstract interface annotation class kotlinx/rpc/RPCEagerField : java/lang/annotation/Annotation {
10549
}
10650

@@ -125,35 +69,6 @@ public abstract interface class kotlinx/rpc/RPCServer : kotlinx/coroutines/Corou
12569
public abstract fun registerService (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
12670
}
12771

128-
public abstract interface class kotlinx/rpc/RPCTransport : kotlinx/coroutines/CoroutineScope {
129-
public abstract fun receive (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
130-
public abstract fun receiveCatching-IoAF18A (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
131-
public abstract fun send (Lkotlinx/rpc/RPCTransportMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
132-
}
133-
134-
public final class kotlinx/rpc/RPCTransport$DefaultImpls {
135-
public static fun receiveCatching-IoAF18A (Lkotlinx/rpc/RPCTransport;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
136-
}
137-
138-
public abstract interface class kotlinx/rpc/RPCTransportMessage {
139-
}
140-
141-
public final class kotlinx/rpc/RPCTransportMessage$BinaryMessage : kotlinx/rpc/RPCTransportMessage {
142-
public fun <init> ([B)V
143-
public final fun getValue ()[B
144-
}
145-
146-
public final class kotlinx/rpc/RPCTransportMessage$StringMessage : kotlinx/rpc/RPCTransportMessage {
147-
public fun <init> (Ljava/lang/String;)V
148-
public final fun getValue ()Ljava/lang/String;
149-
}
150-
151-
public final class kotlinx/rpc/StreamScopeKt {
152-
public static final fun invokeOnStreamScopeCompletion (ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
153-
public static synthetic fun invokeOnStreamScopeCompletion$default (ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
154-
public static final fun streamScoped (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
155-
}
156-
15772
public final class kotlinx/rpc/UninitializedRPCFieldException : java/lang/Exception {
15873
public fun <init> (Ljava/lang/String;Lkotlin/reflect/KProperty;)V
15974
public fun getMessage ()Ljava/lang/String;

‎core/build.gradle.kts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
plugins {
66
alias(libs.plugins.conventions.kmp)
77
alias(libs.plugins.atomicfu)
8-
alias(libs.plugins.serialization)
98
}
109

1110
kotlin {
1211
sourceSets {
1312
commonMain {
1413
dependencies {
1514
api(projects.utils)
16-
implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
17-
1815
api(libs.coroutines.core)
16+
1917
implementation(libs.serialization.core)
2018
implementation(libs.kotlin.reflect)
21-
22-
implementation(projects.krpc.krpcLogging)
2319
}
2420
}
2521

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

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

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package util
66

77
import org.gradle.api.Project
8-
import org.gradle.kotlin.dsl.getValue
9-
import org.gradle.kotlin.dsl.getting
108
import org.gradle.kotlin.dsl.invoke
119
import java.io.File
1210

@@ -15,7 +13,7 @@ fun Project.configureJs() {
1513

1614
kotlin {
1715
sourceSets {
18-
val jsTest by getting {
16+
jsTest {
1917
dependencies {
2018
implementation(npm("puppeteer", "*"))
2119
}

‎krpc/krpc-client/api/krpc-client.api‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
1-
public final class kotlinx/rpc/client/AwaitFieldInitializationKt {
2-
public static final fun awaitFieldInitialization (Lkotlinx/rpc/RPC;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
3-
public static final fun awaitFieldInitialization (Lkotlinx/rpc/RPC;Lkotlin/reflect/KClass;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
4-
}
5-
6-
public abstract class kotlinx/rpc/client/KRPCClient : kotlinx/rpc/internal/transport/RPCServiceHandler, kotlinx/rpc/RPCClient, kotlinx/rpc/internal/transport/RPCEndpoint {
7-
public fun <init> (Lkotlinx/rpc/RPCConfig$Client;Lkotlinx/rpc/RPCTransport;)V
1+
public abstract class kotlinx/rpc/krpc/client/KRPCClient : kotlinx/rpc/krpc/internal/RPCServiceHandler, kotlinx/rpc/RPCClient, kotlinx/rpc/krpc/internal/RPCEndpoint {
2+
public fun <init> (Lkotlinx/rpc/krpc/RPCConfig$Client;Lkotlinx/rpc/krpc/RPCTransport;)V
83
public final fun call (Lkotlinx/rpc/RPCCall;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
9-
protected final fun getConfig ()Lkotlinx/rpc/RPCConfig$Client;
10-
public synthetic fun getConfig ()Lkotlinx/rpc/RPCConfig;
4+
protected final fun getConfig ()Lkotlinx/rpc/krpc/RPCConfig$Client;
5+
public synthetic fun getConfig ()Lkotlinx/rpc/krpc/RPCConfig;
116
public final fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
12-
protected fun getLogger ()Lkotlinx/rpc/internal/logging/CommonLogger;
7+
protected fun getLogger ()Lkotlinx/rpc/krpc/internal/logging/CommonLogger;
138
public final fun registerPlainFlowField (Lkotlinx/coroutines/CoroutineScope;Lkotlinx/rpc/RPCField;)Lkotlinx/coroutines/flow/Flow;
149
public final fun registerSharedFlowField (Lkotlinx/coroutines/CoroutineScope;Lkotlinx/rpc/RPCField;)Lkotlinx/coroutines/flow/SharedFlow;
1510
public final fun registerStateFlowField (Lkotlinx/coroutines/CoroutineScope;Lkotlinx/rpc/RPCField;)Lkotlinx/coroutines/flow/StateFlow;
1611
}
1712

18-
public final class kotlinx/rpc/client/RPCClientUtilsKt {
13+
public final class kotlinx/rpc/krpc/client/RPCClientUtilsKt {
1914
public static final fun withService (Lkotlinx/rpc/RPCClient;Lkotlin/reflect/KClass;)Lkotlinx/rpc/RPC;
2015
public static final fun withService (Lkotlinx/rpc/RPCClient;Lkotlin/reflect/KType;)Lkotlinx/rpc/RPC;
2116
}
2217

23-
public final class kotlinx/rpc/client/UninitializedRPCFieldException : java/lang/Exception {
24-
public fun <init> (Ljava/lang/String;Lkotlin/reflect/KProperty;)V
25-
public fun getCause ()Ljava/lang/Throwable;
26-
public fun getMessage ()Ljava/lang/String;
27-
}
28-

‎krpc/krpc-client/build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ kotlin {
1212
sourceSets {
1313
commonMain {
1414
dependencies {
15-
api(projects.core)
16-
implementation(projects.utils)
17-
implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
15+
api(projects.krpc.krpcCore)
1816

19-
implementation(libs.coroutines.core)
2017
implementation(libs.serialization.core)
2118
implementation(libs.kotlin.reflect)
2219

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

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

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

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

‎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‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5-
package kotlinx.rpc.client
5+
package kotlinx.rpc.krpc.client
66

77
import kotlinx.atomicfu.atomic
88
import kotlinx.coroutines.*
99
import kotlinx.coroutines.flow.Flow
1010
import kotlinx.coroutines.flow.SharedFlow
1111
import kotlinx.coroutines.flow.StateFlow
12-
import kotlinx.rpc.*
13-
import kotlinx.rpc.client.internal.FieldDataObject
14-
import kotlinx.rpc.client.internal.RPCClientConnector
15-
import kotlinx.rpc.client.internal.RPCFlow
16-
import kotlinx.rpc.internal.*
17-
import kotlinx.rpc.internal.logging.CommonLogger
12+
import kotlinx.rpc.RPCCall
13+
import kotlinx.rpc.RPCClient
14+
import kotlinx.rpc.RPCField
15+
import kotlinx.rpc.internal.InternalRPCApi
16+
import kotlinx.rpc.internal.SupervisedCompletableDeferred
17+
import kotlinx.rpc.internal.getOrNull
1818
import kotlinx.rpc.internal.map.ConcurrentHashMap
19-
import kotlinx.rpc.internal.transport.*
19+
import kotlinx.rpc.internal.serviceScopeOrNull
20+
import kotlinx.rpc.krpc.*
21+
import kotlinx.rpc.krpc.client.internal.FieldDataObject
22+
import kotlinx.rpc.krpc.client.internal.RPCClientConnector
23+
import kotlinx.rpc.krpc.client.internal.RPCFlow
24+
import kotlinx.rpc.krpc.internal.*
25+
import kotlinx.rpc.krpc.internal.logging.CommonLogger
2026
import kotlinx.serialization.BinaryFormat
2127
import kotlinx.serialization.SerialFormat
2228
import kotlinx.serialization.StringFormat

0 commit comments

Comments
 (0)