From ce5ddbcf7ad2d127c2b6fe26dda8694794dc0ed0 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Mon, 14 Jul 2025 12:43:46 +0200 Subject: [PATCH 1/4] KRPC-113 Support gRPC: Ktor Integration --- .../kotlin/kotlinx/rpc/grpc/GrpcClient.kt | 19 ++++- .../kotlin/kotlinx/rpc/grpc/GrpcServer.kt | 9 +- .../kotlin/kotlinx/rpc/grpc/ManagedChannel.kt | 2 +- .../kotlinx/rpc/grpc/ManagedChannel.js.kt | 2 +- .../kotlinx/rpc/grpc/ManagedChannel.jvm.kt | 4 +- .../kotlinx/rpc/grpc/ManagedChannel.native.kt | 2 +- .../kotlinx/rpc/grpc/ManagedChannel.wasmJs.kt | 2 +- grpc/grpc-ktor-server-test/build.gradle.kts | 41 +++++++++ grpc/grpc-ktor-server-test/gradle.properties | 5 ++ .../rpc/grpc/ktor/server/test/TestServer.kt | 45 ++++++++++ .../src/test/proto/ktor-test-service.proto | 11 +++ .../src/test/resources/logback.xml | 16 ++++ grpc/grpc-ktor-server/build.gradle.kts | 19 +++++ grpc/grpc-ktor-server/gradle.properties | 5 ++ .../kotlinx/rpc/grpc/ktor/server/Server.kt | 85 +++++++++++++++++++ settings.gradle.kts | 3 + 16 files changed, 260 insertions(+), 10 deletions(-) create mode 100644 grpc/grpc-ktor-server-test/build.gradle.kts create mode 100644 grpc/grpc-ktor-server-test/gradle.properties create mode 100644 grpc/grpc-ktor-server-test/src/test/kotlin/kotlinx/rpc/grpc/ktor/server/test/TestServer.kt create mode 100644 grpc/grpc-ktor-server-test/src/test/proto/ktor-test-service.proto create mode 100644 grpc/grpc-ktor-server-test/src/test/resources/logback.xml create mode 100644 grpc/grpc-ktor-server/build.gradle.kts create mode 100644 grpc/grpc-ktor-server/gradle.properties create mode 100644 grpc/grpc-ktor-server/src/commonMain/kotlin/kotlinx/rpc/grpc/ktor/server/Server.kt diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt index 8d10243a2..7ba5c588e 100644 --- a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt +++ b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt @@ -10,6 +10,7 @@ import kotlinx.rpc.RpcClient import kotlinx.rpc.grpc.descriptor.GrpcClientDelegate import kotlinx.rpc.grpc.descriptor.GrpcServiceDescriptor import kotlinx.rpc.internal.utils.map.RpcInternalConcurrentHashMap +import kotlin.time.Duration /** * GrpcClient manages gRPC communication by providing implementation for making asynchronous RPC calls. @@ -19,6 +20,20 @@ import kotlinx.rpc.internal.utils.map.RpcInternalConcurrentHashMap public class GrpcClient internal constructor(private val channel: ManagedChannel) : RpcClient { private val stubs = RpcInternalConcurrentHashMap() + public fun shutdown() { + stubs.clear() + channel.shutdown() + } + + public fun shutdownNow() { + stubs.clear() + channel.shutdownNow() + } + + public suspend fun awaitTermination(duration: Duration) { + channel.awaitTermination(duration) + } + override suspend fun call(call: RpcCall): T { return call.delegate().call(call) } @@ -39,11 +54,11 @@ public class GrpcClient internal constructor(private val channel: ManagedChannel * Constructor function for the [GrpcClient] class. */ public fun GrpcClient( - name: String, + hostname: String, port: Int, configure: ManagedChannelBuilder<*>.() -> Unit = {}, ): GrpcClient { - val channel = ManagedChannelBuilder(name, port).apply(configure).buildChannel() + val channel = ManagedChannelBuilder(hostname, port).apply(configure).buildChannel() return GrpcClient(channel) } diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcServer.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcServer.kt index 4600ea17c..f69865b9b 100644 --- a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcServer.kt +++ b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcServer.kt @@ -4,6 +4,7 @@ package kotlinx.rpc.grpc +import kotlinx.atomicfu.atomic import kotlinx.rpc.RpcServer import kotlinx.rpc.descriptor.serviceDescriptorOf import kotlinx.rpc.grpc.annotations.Grpc @@ -65,9 +66,13 @@ public class GrpcServer internal constructor( return grpc.delegate.definitionFor(service) } + private val buildLock = atomic(false) + internal fun build() { - internalServer = Server(serverBuilder) - isBuilt = true + if (buildLock.compareAndSet(expect = false, update = true)) { + internalServer = Server(serverBuilder) + isBuilt = true + } } override val isShutdown: Boolean diff --git a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.kt b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.kt index 5368b683b..c7ea10b53 100644 --- a/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.kt +++ b/grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.kt @@ -68,7 +68,7 @@ public interface ManagedChannel { */ public expect abstract class ManagedChannelBuilder> -internal expect fun ManagedChannelBuilder(name: String, port: Int): ManagedChannelBuilder<*> +internal expect fun ManagedChannelBuilder(hostname: String, port: Int): ManagedChannelBuilder<*> internal expect fun ManagedChannelBuilder(target: String): ManagedChannelBuilder<*> internal expect fun ManagedChannelBuilder<*>.buildChannel(): ManagedChannel diff --git a/grpc/grpc-core/src/jsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.js.kt b/grpc/grpc-core/src/jsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.js.kt index b7330da46..2218a5078 100644 --- a/grpc/grpc-core/src/jsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.js.kt +++ b/grpc/grpc-core/src/jsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.js.kt @@ -20,7 +20,7 @@ internal actual fun ManagedChannelBuilder<*>.buildChannel(): ManagedChannel { error("JS target is not supported in gRPC") } -internal actual fun ManagedChannelBuilder(name: String, port: Int): ManagedChannelBuilder<*> { +internal actual fun ManagedChannelBuilder(hostname: String, port: Int): ManagedChannelBuilder<*> { error("JS target is not supported in gRPC") } diff --git a/grpc/grpc-core/src/jvmMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.jvm.kt b/grpc/grpc-core/src/jvmMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.jvm.kt index 602f57c82..559007568 100644 --- a/grpc/grpc-core/src/jvmMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.jvm.kt +++ b/grpc/grpc-core/src/jvmMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.jvm.kt @@ -24,8 +24,8 @@ internal actual fun ManagedChannelBuilder<*>.buildChannel(): ManagedChannel { return build().toKotlin() } -internal actual fun ManagedChannelBuilder(name: String, port: Int): ManagedChannelBuilder<*> { - return io.grpc.ManagedChannelBuilder.forAddress(name, port) +internal actual fun ManagedChannelBuilder(hostname: String, port: Int): ManagedChannelBuilder<*> { + return io.grpc.ManagedChannelBuilder.forAddress(hostname, port) } internal actual fun ManagedChannelBuilder(target: String): ManagedChannelBuilder<*> { diff --git a/grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.native.kt b/grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.native.kt index 69d4d7c93..41c05518d 100644 --- a/grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.native.kt +++ b/grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.native.kt @@ -20,7 +20,7 @@ internal actual fun ManagedChannelBuilder<*>.buildChannel(): ManagedChannel { error("Native target is not supported in gRPC") } -internal actual fun ManagedChannelBuilder(name: String, port: Int): ManagedChannelBuilder<*> { +internal actual fun ManagedChannelBuilder(hostname: String, port: Int): ManagedChannelBuilder<*> { error("Native target is not supported in gRPC") } diff --git a/grpc/grpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.wasmJs.kt b/grpc/grpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.wasmJs.kt index 0fbd98458..8e9101a03 100644 --- a/grpc/grpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.wasmJs.kt +++ b/grpc/grpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/grpc/ManagedChannel.wasmJs.kt @@ -20,7 +20,7 @@ internal actual fun ManagedChannelBuilder<*>.buildChannel(): ManagedChannel { error("WasmJS target is not supported in gRPC") } -internal actual fun ManagedChannelBuilder(name: String, port: Int): ManagedChannelBuilder<*> { +internal actual fun ManagedChannelBuilder(hostname: String, port: Int): ManagedChannelBuilder<*> { error("WasmJS target is not supported in gRPC") } diff --git a/grpc/grpc-ktor-server-test/build.gradle.kts b/grpc/grpc-ktor-server-test/build.gradle.kts new file mode 100644 index 000000000..c2d5de339 --- /dev/null +++ b/grpc/grpc-ktor-server-test/build.gradle.kts @@ -0,0 +1,41 @@ +/* + * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. + */ + +plugins { + alias(libs.plugins.conventions.jvm) + alias(libs.plugins.kotlinx.rpc) + alias(libs.plugins.protobuf) +} + +dependencies { + // for the jar dependency + testImplementation(kotlin("test")) + testImplementation(projects.grpc.grpcCore) + testImplementation(projects.grpc.grpcKtorServer) + + testImplementation(libs.grpc.kotlin.stub) + testImplementation(libs.grpc.netty) + + testImplementation(libs.ktor.server.core) + testImplementation(libs.ktor.server.test.host) + testRuntimeOnly(libs.logback.classic) +} + +rpc { + grpc { + enabled = true + + val globalRootDir: String by extra + + plugin { + locator { + path = "$globalRootDir/protobuf-plugin/build/libs/protobuf-plugin-$version-all.jar" + } + } + + tasksMatching { it.isTest }.all { + dependsOn(project(":protobuf-plugin").tasks.jar) + } + } +} diff --git a/grpc/grpc-ktor-server-test/gradle.properties b/grpc/grpc-ktor-server-test/gradle.properties new file mode 100644 index 000000000..b68c20f8d --- /dev/null +++ b/grpc/grpc-ktor-server-test/gradle.properties @@ -0,0 +1,5 @@ +# +# Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. +# + +kotlinx.rpc.exclude.wasmWasi=true diff --git a/grpc/grpc-ktor-server-test/src/test/kotlin/kotlinx/rpc/grpc/ktor/server/test/TestServer.kt b/grpc/grpc-ktor-server-test/src/test/kotlin/kotlinx/rpc/grpc/ktor/server/test/TestServer.kt new file mode 100644 index 000000000..f299fd649 --- /dev/null +++ b/grpc/grpc-ktor-server-test/src/test/kotlin/kotlinx/rpc/grpc/ktor/server/test/TestServer.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. + */ + +package kotlinx.rpc.grpc.ktor.server.test + +import io.ktor.server.testing.testApplication +import kotlinx.rpc.grpc.GrpcClient +import kotlin.test.Test +import kotlinx.rpc.grpc.ktor.server.grpc +import kotlinx.rpc.registerService +import kotlinx.rpc.withService +import kotlin.test.assertEquals +import kotlin.time.Duration.Companion.minutes + +class KtorTestServiceImpl : KtorTestService { + override suspend fun sayHello(message: Hello): Hello { + return message + } +} + +const val PORT = 8085 + +class TestServer { + @Test + fun testPlainRequests() = testApplication { + application { + grpc(PORT) { + registerService { KtorTestServiceImpl() } + } + } + + startApplication() + + val client = GrpcClient("localhost", PORT) { + usePlaintext() + } + + val response = client.withService().sayHello(Hello { message = "Hello" }) + assertEquals("Hello", response.message, "Wrong response message") + + client.shutdown() + client.awaitTermination(1.minutes) + } +} diff --git a/grpc/grpc-ktor-server-test/src/test/proto/ktor-test-service.proto b/grpc/grpc-ktor-server-test/src/test/proto/ktor-test-service.proto new file mode 100644 index 000000000..2dfd01e0b --- /dev/null +++ b/grpc/grpc-ktor-server-test/src/test/proto/ktor-test-service.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package kotlinx.rpc.grpc.ktor.server.test; + +message Hello { + string message = 1; +} + +service KtorTestService { + rpc sayHello(Hello) returns (Hello); +} diff --git a/grpc/grpc-ktor-server-test/src/test/resources/logback.xml b/grpc/grpc-ktor-server-test/src/test/resources/logback.xml new file mode 100644 index 000000000..85ffa5cfa --- /dev/null +++ b/grpc/grpc-ktor-server-test/src/test/resources/logback.xml @@ -0,0 +1,16 @@ + + + + + + %d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/grpc/grpc-ktor-server/build.gradle.kts b/grpc/grpc-ktor-server/build.gradle.kts new file mode 100644 index 000000000..e71d8343e --- /dev/null +++ b/grpc/grpc-ktor-server/build.gradle.kts @@ -0,0 +1,19 @@ +/* + * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. + */ + +plugins { + alias(libs.plugins.conventions.kmp) + alias(libs.plugins.kotlinx.rpc) +} + +kotlin { + sourceSets { + commonMain { + dependencies { + api(projects.grpc.grpcCore) + implementation(libs.ktor.server.core) + } + } + } +} diff --git a/grpc/grpc-ktor-server/gradle.properties b/grpc/grpc-ktor-server/gradle.properties new file mode 100644 index 000000000..b68c20f8d --- /dev/null +++ b/grpc/grpc-ktor-server/gradle.properties @@ -0,0 +1,5 @@ +# +# Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. +# + +kotlinx.rpc.exclude.wasmWasi=true diff --git a/grpc/grpc-ktor-server/src/commonMain/kotlin/kotlinx/rpc/grpc/ktor/server/Server.kt b/grpc/grpc-ktor-server/src/commonMain/kotlin/kotlinx/rpc/grpc/ktor/server/Server.kt new file mode 100644 index 000000000..c14155668 --- /dev/null +++ b/grpc/grpc-ktor-server/src/commonMain/kotlin/kotlinx/rpc/grpc/ktor/server/Server.kt @@ -0,0 +1,85 @@ +/* + * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. + */ + +package kotlinx.rpc.grpc.ktor.server + +import io.ktor.server.application.Application +import io.ktor.server.application.ApplicationStopped +import io.ktor.server.application.ApplicationStopping +import io.ktor.server.application.log +import io.ktor.server.config.getAs +import io.ktor.util.AttributeKey +import kotlinx.rpc.RpcServer +import kotlinx.rpc.grpc.GrpcServer +import kotlinx.rpc.grpc.ServerBuilder + +@Suppress("ConstPropertyName") +public object GrpcConfigKeys { + public const val grpcHostPortPath: String = "ktor.deployment.grpcPort" +} + +/** + * Key used to store and retrieve the [GrpcServer] instance within the application's attributes. + */ +public val GrpcServerKey: AttributeKey = AttributeKey("GrpcServerPluginAttributesKey") + +/** + * Configures and starts a gRPC server within the Ktor application. + * This function integrates with the Ktor lifecycle and manages the lifecycle of the gRPC server + * by subscribing to [ApplicationStopping] and [ApplicationStopped] events. + * It ensures that a gRPC server is properly initialized, started, and shutdown when the application stops. + * + * Usage: + * ```kotlin + * fun Application.module() { + * grpc(port = PORT, configure= { /* ... */ }) { + * registerService { MyServiceImpl() } + * } + * } + * ``` + * + * @param port The port on which the gRPC server will listen for incoming connections. + * Defaults to the value specified in the `ktor.deployment.grpcPort` configuration, or 8001 if not configured. + * @param configure Allows additional configuration of the gRPC server using a platform-specific [ServerBuilder]. + * @param builder A block used to define and register gRPC services for the gRPC server. + * @return The instance of the initialized and running [GrpcServer]. + * @throws IllegalStateException if a gRPC server is already installed or the specified port conflicts with + * an existing HTTP/HTTPS server port. + */ +public fun Application.grpc( + port: Int = environment.config.propertyOrNull(GrpcConfigKeys.grpcHostPortPath)?.getAs() ?: 8001, + configure: ServerBuilder<*>.() -> Unit = {}, + builder: RpcServer.() -> Unit, +): GrpcServer { + if (attributes.contains(GrpcServerKey)) { + error("gRPC Server is already installed, second call to grpc() is not allowed") + } + + var newServer = false + val server = attributes.computeIfAbsent(GrpcServerKey) { + newServer = true + GrpcServer(port, configure, builder) + } + + if (!newServer) { + error("A race detected while installing gRPC Server, second call to grpc() is not allowed") + } + + server.start() + log.debug("Started gRPC server on port $port") + + val stoppingHandle = monitor.subscribe(ApplicationStopping) { + log.debug("Stopping gRPC server") + attributes.getOrNull(GrpcServerKey)?.shutdown() + } + + monitor.subscribe(ApplicationStopped) { + log.debug("gRPC server complete shutdown") + attributes.getOrNull(GrpcServerKey)?.shutdownNow() + + stoppingHandle.dispose() + } + + return server +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 2f84c7fa7..255cff875 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,6 +31,9 @@ includePublic(":protobuf-plugin") include(":grpc") includePublic(":grpc:grpc-core") +includePublic(":grpc:grpc-ktor-server") +// temporary module until KMP project structure support in Protobuf plugin +include(":grpc:grpc-ktor-server-test") includePublic(":bom") From 5b37b6e49882e5ac2be3dc754087e93a5ed4138d Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Mon, 14 Jul 2025 12:48:11 +0200 Subject: [PATCH 2/4] Update platforms table --- docs/pages/kotlinx-rpc/topics/platforms.topic | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/pages/kotlinx-rpc/topics/platforms.topic b/docs/pages/kotlinx-rpc/topics/platforms.topic index f846b1dfe..e04453ca3 100644 --- a/docs/pages/kotlinx-rpc/topics/platforms.topic +++ b/docs/pages/kotlinx-rpc/topics/platforms.topic @@ -96,6 +96,14 @@
  • apple
  • ios
  • iosArm64
  • iosSimulatorArm64
  • iosX64
  • macos
  • macosArm64
  • macosX64
  • watchos
  • watchosArm32
  • watchosArm64
  • watchosDeviceArm64
  • watchosSimulatorArm64
  • watchosX64
  • tvos
  • tvosArm64
  • tvosSimulatorArm64
  • tvosX64
  • linux
  • linuxArm64
  • linuxX64
  • windows
  • mingwX64
  • + +grpc-ktor-server +jvm +
  • browser
  • node
  • +
  • wasmJs
  • browser
  • d8
  • node
  • +
  • apple
  • ios
  • iosArm64
  • iosSimulatorArm64
  • iosX64
  • macos
  • macosArm64
  • macosX64
  • watchos
  • watchosArm32
  • watchosArm64
  • watchosDeviceArm64
  • watchosSimulatorArm64
  • watchosX64
  • tvos
  • tvosArm64
  • tvosSimulatorArm64
  • tvosX64
  • linux
  • linuxArm64
  • linuxX64
  • windows
  • mingwX64
  • + + krpc-client jvm From edfcd561a995f6ef07f6b0d85b4cd589b0bf0821 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Mon, 14 Jul 2025 16:22:02 +0200 Subject: [PATCH 3/4] Added gRPC to artifacts dump --- ...hApplePublicationToBuildRepoRepository.txt | 104 ++++++++++++++++++ ...lishJsPublicationToBuildRepoRepository.txt | 6 + ...ishJvmPublicationToBuildRepoRepository.txt | 6 + ...atformPublicationToBuildRepoRepository.txt | 8 ++ ...hLinuxPublicationToBuildRepoRepository.txt | 12 ++ ...hMavenPublicationToBuildRepoRepository.txt | 3 + ...WasmJsPublicationToBuildRepoRepository.txt | 6 + ...indowsPublicationToBuildRepoRepository.txt | 6 + 8 files changed, 151 insertions(+) diff --git a/gradle/artifacts/publishApplePublicationToBuildRepoRepository.txt b/gradle/artifacts/publishApplePublicationToBuildRepoRepository.txt index 1cf2bb939..f7a31b3e7 100644 --- a/gradle/artifacts/publishApplePublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishApplePublicationToBuildRepoRepository.txt @@ -50,6 +50,110 @@ org.jetbrains.kotlinx:kotlinx-rpc-core-watchosx64/.klib org.jetbrains.kotlinx:kotlinx-rpc-core-watchosx64/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core-watchosx64/metadata.jar org.jetbrains.kotlinx:kotlinx-rpc-core-watchosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iossimulatorarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iossimulatorarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iossimulatorarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iossimulatorarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-iosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-macosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvossimulatorarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvossimulatorarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvossimulatorarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvossimulatorarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-tvosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm32/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm32/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm32/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm32/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosdevicearm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosdevicearm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosdevicearm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosdevicearm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchossimulatorarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchossimulatorarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchossimulatorarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchossimulatorarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-watchosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iossimulatorarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iossimulatorarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iossimulatorarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iossimulatorarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-iosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-macosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvossimulatorarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvossimulatorarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvossimulatorarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvossimulatorarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-tvosx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm32/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm32/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm32/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm32/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosdevicearm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosdevicearm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosdevicearm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosdevicearm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchossimulatorarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchossimulatorarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchossimulatorarm64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchossimulatorarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosx64/metadata.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-watchosx64/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-iosarm64/.klib org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-iosarm64/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-iosarm64/metadata.jar diff --git a/gradle/artifacts/publishJsPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishJsPublicationToBuildRepoRepository.txt index 8fe5ff2e3..ebd93148b 100644 --- a/gradle/artifacts/publishJsPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishJsPublicationToBuildRepoRepository.txt @@ -1,6 +1,12 @@ org.jetbrains.kotlinx:kotlinx-rpc-core-js/.klib org.jetbrains.kotlinx:kotlinx-rpc-core-js/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core-js/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-js/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-js/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-js/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-js/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-js/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-js/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-js/.klib org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-js/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-js/sources.jar diff --git a/gradle/artifacts/publishJvmPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishJvmPublicationToBuildRepoRepository.txt index dc61c5c40..a32e1499c 100644 --- a/gradle/artifacts/publishJvmPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishJvmPublicationToBuildRepoRepository.txt @@ -1,6 +1,12 @@ org.jetbrains.kotlinx:kotlinx-rpc-core-jvm/.jar org.jetbrains.kotlinx:kotlinx-rpc-core-jvm/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core-jvm/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-jvm/.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-jvm/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-jvm/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-jvm/.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-jvm/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-jvm/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-jvm/.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-jvm/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-jvm/sources.jar diff --git a/gradle/artifacts/publishKotlinMultiplatformPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishKotlinMultiplatformPublicationToBuildRepoRepository.txt index ed76b0bff..54eb45c87 100644 --- a/gradle/artifacts/publishKotlinMultiplatformPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishKotlinMultiplatformPublicationToBuildRepoRepository.txt @@ -2,6 +2,14 @@ org.jetbrains.kotlinx:kotlinx-rpc-core/.jar org.jetbrains.kotlinx:kotlinx-rpc-core/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core/kotlin-tooling-metadata.json org.jetbrains.kotlinx:kotlinx-rpc-core/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core/.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core/kotlin-tooling-metadata.json +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server/.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server/kotlin-tooling-metadata.json +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client/.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client/kotlin-tooling-metadata.json diff --git a/gradle/artifacts/publishLinuxPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishLinuxPublicationToBuildRepoRepository.txt index 4da216340..0fc228de8 100644 --- a/gradle/artifacts/publishLinuxPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishLinuxPublicationToBuildRepoRepository.txt @@ -4,6 +4,18 @@ org.jetbrains.kotlinx:kotlinx-rpc-core-linuxarm64/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-core-linuxx64/.klib org.jetbrains.kotlinx:kotlinx-rpc-core-linuxx64/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core-linuxx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-linuxarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-linuxarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-linuxarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-linuxx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-linuxx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-linuxx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-linuxarm64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-linuxarm64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-linuxarm64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-linuxx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-linuxx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-linuxx64/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-linuxarm64/.klib org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-linuxarm64/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-linuxarm64/sources.jar diff --git a/gradle/artifacts/publishMavenPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishMavenPublicationToBuildRepoRepository.txt index e69de29bb..d2de02ca2 100644 --- a/gradle/artifacts/publishMavenPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishMavenPublicationToBuildRepoRepository.txt @@ -0,0 +1,3 @@ +org.jetbrains.kotlinx:kotlinx-rpc-protobuf-plugin/all.jar +org.jetbrains.kotlinx:kotlinx-rpc-protobuf-plugin/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-protobuf-plugin/sources.jar diff --git a/gradle/artifacts/publishWasmJsPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishWasmJsPublicationToBuildRepoRepository.txt index 9660cb071..7349b890e 100644 --- a/gradle/artifacts/publishWasmJsPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishWasmJsPublicationToBuildRepoRepository.txt @@ -1,6 +1,12 @@ org.jetbrains.kotlinx:kotlinx-rpc-core-wasm-js/.klib org.jetbrains.kotlinx:kotlinx-rpc-core-wasm-js/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core-wasm-js/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-wasm-js/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-wasm-js/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-wasm-js/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-wasm-js/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-wasm-js/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-wasm-js/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-wasm-js/.klib org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-wasm-js/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-wasm-js/sources.jar diff --git a/gradle/artifacts/publishWindowsPublicationToBuildRepoRepository.txt b/gradle/artifacts/publishWindowsPublicationToBuildRepoRepository.txt index da02c6ed0..ee9a1e160 100644 --- a/gradle/artifacts/publishWindowsPublicationToBuildRepoRepository.txt +++ b/gradle/artifacts/publishWindowsPublicationToBuildRepoRepository.txt @@ -1,6 +1,12 @@ org.jetbrains.kotlinx:kotlinx-rpc-core-mingwx64/.klib org.jetbrains.kotlinx:kotlinx-rpc-core-mingwx64/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-core-mingwx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-mingwx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-mingwx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-core-mingwx64/sources.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-mingwx64/.klib +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-mingwx64/javadoc.jar +org.jetbrains.kotlinx:kotlinx-rpc-grpc-ktor-server-mingwx64/sources.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-mingwx64/.klib org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-mingwx64/javadoc.jar org.jetbrains.kotlinx:kotlinx-rpc-krpc-client-mingwx64/sources.jar From e82056b4fcef17397f505285acd508a9a40e8c18 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Mon, 14 Jul 2025 16:23:07 +0200 Subject: [PATCH 4/4] add expect/actual opt in option --- grpc/grpc-core/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/grpc/grpc-core/build.gradle.kts b/grpc/grpc-core/build.gradle.kts index fa6dd6983..bc304773d 100644 --- a/grpc/grpc-core/build.gradle.kts +++ b/grpc/grpc-core/build.gradle.kts @@ -8,6 +8,10 @@ plugins { } kotlin { + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } + sourceSets { commonMain { dependencies {