.github/workflows/docs.yml

@@ -20,7 +20,7 @@ env:
   ALGOLIA_INDEX_NAME: 'prod_kotlin_rpc'
   ALGOLIA_KEY: '${{ secrets.ALGOLIA_KEY }}'
   CONFIG_JSON_PRODUCT: 'kotlinx-rpc'
-  CONFIG_JSON_VERSION: '0.5.0'
+  CONFIG_JSON_VERSION: '0.6.0'
 
 jobs:
   build:

CHANGELOG.md

@@ -1,5 +1,58 @@
+# 0.6.0
+> Published 4 April 2025
+
+### Features 🎉
+* 2.1.20 by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/309
+* Non suspend flow by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/299
+
+### Documentation 📗
+* Update gRPC Docs and Sample by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/284
+
+### Infra 🚧
+* Update monitior by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/282
+* Fix build config for for-ide builds by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/287
+* Update build for custom KC versions by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/293
+* Fix kotlin master compilation by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/306
+
+### Other Changes 🧹
+* Upgrade Gradle to 8.12.1 by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/286
+* Version 0.6.0-SNAPSHOT by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/283
+* Update leftover sources from jvm-only to kmp by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/300
+* KRPC-129 Move compatibility tests from Toolbox to Kotlin RPC repo by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/304
+* Dependency bump by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/303
+* Better compiler error message for checked annotations by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/302
+
+**Full Changelog**: https://github.com/Kotlin/kotlinx-rpc/compare/0.5.1...0.6.0
+
+# 0.5.1
+> Published 12 February 2025
+
+### Features 🎉
+* 2.1.10 by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/271
+
+### Documentation 📗
+* Fix typo in README.md by @SebastianAigner in https://github.com/Kotlin/kotlinx-rpc/pull/266
+* Added IDE plugin docs by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/273
+
+### Infra 🚧
+* Update for IDE configs by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/272
+* Added python deps automerge by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/276
+
+### Other Changes 🧹
+* Update README.md by @pambrose in https://github.com/Kotlin/kotlinx-rpc/pull/268
+* Added monitor app for deps publication by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/265
+* Fix kotlin master by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/274
+* Fix println tests by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/277
+* Update Python Monitor Dependencies by @renovate in https://github.com/Kotlin/kotlinx-rpc/pull/278
+
+## New Contributors
+* @SebastianAigner made their first contribution in https://github.com/Kotlin/kotlinx-rpc/pull/266
+* @pambrose made their first contribution in https://github.com/Kotlin/kotlinx-rpc/pull/268
+
+**Full Changelog**: https://github.com/Kotlin/kotlinx-rpc/compare/0.5.0...0.5.1
+
 # 0.5.0
-> Published 27 January 2024
+> Published 27 January 2025
 
 ### Features 🎉
 * Update Service Descriptors Generation by @Mr3zee in https://github.com/Kotlin/kotlinx-rpc/pull/227

README.md

@@ -7,7 +7,7 @@
 
 [![Kotlin Experimental](https://kotl.in/badges/experimental.svg)](https://kotlinlang.org/docs/components-stability.html)
 [![Official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0--2.0.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0--2.1.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 
 [//]: # ([![TeamCity build](https://img.shields.io/teamcity/build/s/Build_kRPC_All.svg?server=http%3A%2F%2Fkrpc.teamcity.com)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=Build_kRPC_All&guest=1))
@@ -26,7 +26,7 @@ import kotlinx.rpc.annotations.Rpc
 interface AwesomeService : RemoteService {
     suspend fun getNews(city: String): Flow<String>
 
-    suspend fun daysUntilStableRelese(): Int
+    suspend fun daysUntilStableRelease(): Int
 }
 ```
 In your server code define how to respond by simply implementing the service:
@@ -43,7 +43,7 @@ class AwesomeServiceImpl(
         }
     }
 
-    override suspend fun daysUntilStableRelese(): Int {
+    override suspend fun daysUntilStableRelease(): Int {
         return if (parameters.stable) 0 else {
             parameters.daysUntilStable ?: error("Who says it will be stable?")
         }
@@ -88,7 +88,7 @@ val rpcClient = HttpClient { installKrpc() }.rpc {
 
 val service = rpcClient.withService<AwesomeService>()
 
-service.daysUntilStableRelese()
+service.daysUntilStableRelease()
 
 streamScoped {
     service.getNews("KotlinBurg").collect { article ->
@@ -114,9 +114,9 @@ that will set up code generation in a project.
 Example of a setup in a project's `build.gradle.kts`:
 ```kotlin
 plugins {
-    kotlin("multiplatform") version "2.1.0"
-    kotlin("plugin.serialization") version "2.1.0"
-    id("org.jetbrains.kotlinx.rpc.plugin") version "0.5.0"
+    kotlin("multiplatform") version "2.1.20"
+    kotlin("plugin.serialization") version "2.1.20"
+    id("org.jetbrains.kotlinx.rpc.plugin") version "0.6.0"
 }
 ```
 
@@ -131,15 +131,15 @@ And now you can add dependencies to your project:
 ```kotlin
 dependencies {
     // Client API
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client:0.5.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client:0.6.0")
     // Server API
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server:0.5.0") 
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server:0.6.0") 
     // Serialization module. Also, protobuf and cbor are provided
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json:0.5.0") 
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json:0.6.0") 
 
     // Transport implementation for Ktor
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client:0.5.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server:0.5.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client:0.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server:0.6.0")
 
     // Ktor API
     implementation("io.ktor:ktor-client-cio-jvm:$ktor_version")
@@ -176,7 +176,8 @@ For a working example, see the [sample gRPC project](/samples/grpc-app).
 
 ## Kotlin compatibility
 We support all stable Kotlin versions starting from 2.0.0:
-- 2.0.0, 2.0.10, 2.0.20, 2.0.21, 2.1.0
+- 2.0.0, 2.0.10, 2.0.20, 2.0.21
+- 2.1.0, 2.1.10, 2.1.20
 
 For a full compatibility checklist, 
 see [Versions](https://kotlin.github.io/kotlinx-rpc/versions.html).

compiler-plugin/build.gradle.kts

@@ -2,7 +2,6 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import util.otherwise
 import util.whenForIde
 
 plugins {
@@ -16,10 +15,11 @@ val kotlinLangVersion = libs.versions.kotlin.lang.get()
 
 allprojects {
     group = "org.jetbrains.kotlinx"
-    whenForIde {
-        version = "$kotlinCompilerVersion-$rpcVersion"
-    } otherwise {
-        version = "$kotlinLangVersion-$rpcVersion"
+
+    version = if (kotlinCompilerVersion != kotlinLangVersion) {
+        "$kotlinCompilerVersion-$rpcVersion"
+    } else {
+        "$kotlinLangVersion-$rpcVersion"
     }
 }
 

compiler-plugin/compiler-plugin-backend/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
@@ -18,6 +18,7 @@ kotlin {
 }
 
 dependencies {
-    compileOnly(libs.kotlin.compiler.embeddable)
+    compileOnly(libs.kotlin.compiler)
+
     implementation(projects.compilerPluginCommon)
 }

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcIrContext.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * 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.codegen.extension
@@ -169,13 +169,17 @@ internal class RpcIrContext(
         }
 
         val dataCast by lazy {
-            namedFunction("kotlinx.rpc.internal", "dataCast")
+            namedFunction("kotlinx.rpc.internal", "rpcInternalDataCast")
         }
 
         val rpcClientCall by lazy {
             rpcClient.namedFunction("call")
         }
 
+        val rpcClientCallServerStreaming by lazy {
+            rpcClient.namedFunction("callServerStreaming")
+        }
+
         val provideStubContext by lazy {
             rpcClient.namedFunction("provideStubContext")
         }

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcIrExtension.kt

@@ -1,9 +1,10 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * 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.codegen.extension
 
+import kotlinx.rpc.codegen.RpcIrServiceProcessorDelegate
 import kotlinx.rpc.codegen.VersionSpecificApi
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -20,7 +21,7 @@ class RpcIrExtension(configuration: CompilerConfiguration) : IrGenerationExtensi
     ) {
         val context = RpcIrContext(pluginContext, VersionSpecificApi.INSTANCE)
 
-        val processor = RpcIrServiceProcessor(logger)
+        val processor = RpcIrServiceProcessorDelegate(RpcIrServiceProcessor(logger))
         moduleFragment.transform(processor, context)
     }
 }

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcIrServiceProcessor.kt

@@ -6,22 +6,18 @@ package kotlinx.rpc.codegen.extension
 
 import kotlinx.rpc.codegen.common.RpcClassId
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.util.hasAnnotation
 import org.jetbrains.kotlin.ir.util.isInterface
-import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 
 internal class RpcIrServiceProcessor(
     @Suppress("unused")
     private val logger: MessageCollector,
-) : IrElementTransformer<RpcIrContext> {
-    override fun visitClass(declaration: IrClass, data: RpcIrContext): IrStatement {
+) {
+    fun visitClass(declaration: IrClass, data: RpcIrContext) {
         if (declaration.hasAnnotation(RpcClassId.rpcAnnotation) && declaration.isInterface) {
             processService(declaration, data)
         }
-
-        return super.visitClass(declaration, data)
     }
 
     private fun processService(service: IrClass, context: RpcIrContext) {

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcStubGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * 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.codegen.extension
@@ -530,7 +530,7 @@ internal class RpcStubGenerator(
             returnType = method.function.returnType
             modality = Modality.OPEN
 
-            isSuspend = true
+            isSuspend = method.function.isSuspend
         }.apply {
             val functionThisReceiver = vsApi {
                 stubClassThisReceiver.copyToVS(this@apply, origin = IrDeclarationOrigin.DEFINED)
@@ -550,6 +550,20 @@ internal class RpcStubGenerator(
             overriddenSymbols = listOf(method.function.symbol)
 
             body = irBuilder(symbol).irBlockBody {
+                if (method.function.isNonSuspendingWithFlowReturn()) {
+                    +irReturn(
+                        irRpcMethodClientCall(
+                            method = method,
+                            functionThisReceiver = functionThisReceiver,
+                            isMethodObject = isMethodObject,
+                            methodClass = methodClass,
+                            arguments = arguments,
+                        )
+                    )
+
+                    return@irBlockBody
+                }
+
                 +irReturn(
                     irCall(
                         callee = ctx.functions.scopedClientCall,
@@ -742,8 +756,14 @@ internal class RpcStubGenerator(
         methodClass: IrClass,
         arguments: List<IrValueParameter>,
     ): IrCall {
+        val callee = if (method.function.isNonSuspendingWithFlowReturn()) {
+            ctx.functions.rpcClientCallServerStreaming.symbol
+        } else {
+            ctx.functions.rpcClientCall.symbol
+        }
+
         val call = irCall(
-            callee = ctx.functions.rpcClientCall.symbol,
+            callee = callee,
             type = method.function.returnType,
             typeArgumentsCount = 1,
         ).apply {
@@ -1218,13 +1238,15 @@ internal class RpcStubGenerator(
      *         ),
      *         ...
      *     ),
+     *     isNonSuspendFunction = !function.isSuspend,
      * )
      *```
      *
      * Where:
      *  - `<callable-name>` - the name of the method (field)
      *  - `<callable-data-type>` - a method class for a method and `FieldDataObject` for fields
-     *  - `<callable-return-type>` - the return type for the method and the field type for a field
+     *  - `<callable-return-type>` - the return type for the method and the field type for a field.
+     *  For a non-suspending flow the return type is its element type
      *  - `<callable-invokator>` - an invokator, previously generated by [generateInvokators]
      *  - `<method-parameter-name-k>` - if a method, its k-th parameter name
      *  - `<method-parameter-type-k>` - if a method, its k-th parameter type
@@ -1253,7 +1275,16 @@ internal class RpcStubGenerator(
             putValueArgument(1, irRpcTypeCall(dataType))
 
             val returnType = when (callable) {
-                is ServiceDeclaration.Method -> callable.function.returnType
+                is ServiceDeclaration.Method -> when {
+                    callable.function.isNonSuspendingWithFlowReturn() -> {
+                        (callable.function.returnType as IrSimpleType).arguments.single().typeOrFail
+                    }
+
+                    else -> {
+                        callable.function.returnType
+                    }
+                }
+
                 is ServiceDeclaration.FlowField -> callable.property.getterOrFail.returnType
             }
 
@@ -1321,9 +1352,14 @@ internal class RpcStubGenerator(
             }
 
             putValueArgument(4, arrayOfCall)
+            putValueArgument(5, booleanConst(callable is ServiceDeclaration.Method && !callable.function.isSuspend))
         }
     }
 
+    private fun IrSimpleFunction.isNonSuspendingWithFlowReturn(): Boolean {
+        return returnType.classOrNull == ctx.flow && !isSuspend
+    }
+
     /**
      * Accessor function for the `callableMap` property
      * Defined in `RpcServiceDescriptor`
@@ -1525,7 +1561,7 @@ internal class RpcStubGenerator(
     }
 
     /**
-     * IR call of the `RpcType(KType, Array<Annotation>)` function
+     * IR call of the `RpcType(KType)` function
      */
     private fun irRpcTypeCall(type: IrType): IrConstructorCallImpl {
         return vsApi {
@@ -1644,6 +1680,13 @@ internal class RpcStubGenerator(
         value = value,
     )
 
+    private fun booleanConst(value: Boolean) = IrConstImpl.boolean(
+        startOffset = UNDEFINED_OFFSET,
+        endOffset = UNDEFINED_OFFSET,
+        type = ctx.irBuiltIns.booleanType,
+        value = value,
+    )
+
     private fun <T> vsApi(body: VersionSpecificApi.() -> T): T {
         return ctx.versionSpecificApi.body()
     }