Update samples tp 0.6.1 (#319)

Author: Mr3zee

samples/ktor-all-platforms-app/composeApp/build.gradle.kts

@@ -13,6 +13,7 @@ plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlinx.rpc)
 }
 
 kotlin {

samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt

@@ -66,10 +66,8 @@ fun App() {
         }
 
         LaunchedEffect(service) {
-            streamScoped {
-                service.subscribeToNews().collect { article ->
-                    news.add(article)
-                }
+            service.subscribeToNews().collect { article ->
+                news.add(article)
             }
         }
 

samples/ktor-all-platforms-app/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.10"
+kotlin = "2.1.20"
 
 agp = "8.8.0-alpha05"
 android-compileSdk = "35"
@@ -19,7 +19,7 @@ ktor = "3.0.3"
 logback = "1.5.16"
 serialization = "1.8.0"
 coroutines = "1.10.1"
-kotlinx-rpc = "0.5.1"
+kotlinx-rpc = "0.6.1"
 
 [libraries]
 # kotlin

samples/ktor-all-platforms-app/server/build.gradle.kts

@@ -5,6 +5,7 @@
 plugins {
     alias(libs.plugins.kotlinJvm)
     alias(libs.plugins.ktor)
+    alias(libs.plugins.kotlinx.rpc)
     application
 }
 

samples/ktor-all-platforms-app/server/src/main/kotlin/kotlinx/rpc/sample/UserServiceImpl.kt

@@ -16,7 +16,7 @@ class UserServiceImpl(override val coroutineContext: CoroutineContext) : UserSer
         return "Nice to meet you $user, how is it in ${userData.address}?"
     }
 
-    override suspend fun subscribeToNews(): Flow<String> {
+    override fun subscribeToNews(): Flow<String> {
         return flow {
             repeat(10) {
                 delay(300)

samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt

@@ -35,11 +35,9 @@ class ApplicationTest {
             actual = service.hello("Alex", UserData("address1", "last")),
         )
 
-        streamScoped {
-            assertEquals(
-                expected = List(10) { "Article number $it" },
-                actual = service.subscribeToNews().toList(),
-            )
-        }
+        assertEquals(
+            expected = List(10) { "Article number $it" },
+            actual = service.subscribeToNews().toList(),
+        )
     }
 }

samples/ktor-all-platforms-app/shared/src/commonMain/kotlin/UserService.kt

@@ -17,5 +17,5 @@ data class UserData(
 interface UserService : RemoteService {
     suspend fun hello(user: String, userData: UserData): String
 
-    suspend fun subscribeToNews(): Flow<String>
+    fun subscribeToNews(): Flow<String>
 }

samples/ktor-android-app/app/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.kotlinAndroid)
     alias(libs.plugins.kotlinPluginSerialization)
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlinx.rpc)
 }
 
 android {

samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt

@@ -39,27 +39,23 @@ class AppViewModel : ViewModel() {
 
     private fun fetchData() {
         viewModelScope.launch(Dispatchers.IO) {
-            streamScoped {
-                delay(2000)
-                val greetingDeferred = async {
-                    apiService?.hello(
-                        "Alex",
-                        UserData("Berlin", "Smith")
-                    )
-                }
-                val newsDeferred = async { apiService?.subscribeToNews() }
+            delay(2000)
+            val greetingDeferred = async {
+                apiService?.hello(
+                    "Alex",
+                    UserData("Berlin", "Smith")
+                )
+            }
 
-                val serverGreeting = greetingDeferred.await()
-                val news = newsDeferred.await()
+            val serverGreeting = greetingDeferred.await()
 
-                val allNews: MutableList<String> = mutableListOf()
-                news?.collect {
-                    allNews += it
+            val allNews: MutableList<String> = mutableListOf()
+            apiService?.subscribeToNews()?.collect {
+                allNews += it
 
-                    val sendNews = allNews.toMutableList() // fix ConcurrentModificationException
-                    serverGreeting?.let {
-                        _uiState.value = WelcomeData(serverGreeting, sendNews)
-                    }
+                val sendNews = allNews.toMutableList() // fix ConcurrentModificationException
+                serverGreeting?.let {
+                    _uiState.value = WelcomeData(serverGreeting, sendNews)
                 }
             }
         }

samples/ktor-android-app/common/src/main/kotlin/kotlinx/rpc/sample/MyService.kt

@@ -12,5 +12,5 @@ import kotlinx.rpc.annotations.Rpc
 interface MyService : RemoteService {
     suspend fun hello(user: String, userData: UserData): String
 
-    suspend fun subscribeToNews(): Flow<String>
+    fun subscribeToNews(): Flow<String>
 }

samples/ktor-android-app/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agp = "8.8.0"
-kotlin = "2.1.10"
+kotlin = "2.1.20"
 androidx-activityCompose = "1.9.3"
 androidx-appcompat = "1.7.0"
 androidx-constraintlayout = "2.2.0"
@@ -15,7 +15,7 @@ ktor = "3.0.3"
 kotlinx-serialization-json = "1.8.0"
 kotlinx-coroutines-core = "1.10.1"
 logback = "1.5.16"
-kotlinx-rpc = "0.5.1"
+kotlinx-rpc = "0.6.1"
 
 [libraries]
 # kotlin

samples/ktor-android-app/server/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kotlinJvm)
     alias(libs.plugins.kotlinPluginSerialization)
     alias(libs.plugins.ktor)
+    alias(libs.plugins.kotlinx.rpc)
 
     application
     distribution

samples/ktor-android-app/server/src/main/kotlin/kotlinx/rpc/sample/MyServiceImpl.kt

@@ -14,10 +14,10 @@ class MyServiceImpl(override val coroutineContext: CoroutineContext) : MyService
         return "Nice to meet you $user, how is it in ${userData.address}?"
     }
 
-    override suspend fun subscribeToNews(): Flow<String> {
+    override fun subscribeToNews(): Flow<String> {
         return flow {
             repeat(10) {
-                delay(2000)
+                delay(200)
                 emit("Article number $it")
             }
         }

samples/ktor-android-app/server/src/test/kotlin/ApplicationTest.kt

@@ -13,16 +13,20 @@ import kotlinx.rpc.krpc.ktor.client.installKrpc
 import kotlinx.rpc.krpc.ktor.client.rpc
 import kotlinx.rpc.krpc.ktor.client.rpcConfig
 import kotlinx.rpc.krpc.serialization.json.json
-import kotlinx.rpc.krpc.streamScoped
 import kotlinx.rpc.withService
 import kotlinx.rpc.sample.MyService
 import kotlinx.rpc.sample.UserData
+import kotlinx.rpc.sample.module
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
+
         val service = createClient {
             installKrpc()
         }.rpc("/api") {
@@ -38,12 +42,10 @@ class ApplicationTest {
             actual = service.hello("Alex", UserData("address1", "last")),
         )
 
-        streamScoped {
-            assertEquals(
-                expected = List(10) { "Article number $it" },
-                actual = service.subscribeToNews().toList(),
-            )
-        }
+        assertEquals(
+            expected = List(10) { "Article number $it" },
+            actual = service.subscribeToNews().toList(),
+        )
     }
 
     @Test

samples/ktor-web-app/common/src/commonMain/kotlin/Common.kt

@@ -17,5 +17,5 @@ data class UserData(
 interface MyService : RemoteService {
     suspend fun hello(user: String, userData: UserData): String
 
-    suspend fun subscribeToNews(): Flow<String>
+    fun subscribeToNews(): Flow<String>
 }

samples/ktor-web-app/frontend/build.gradle.kts

@@ -4,7 +4,7 @@
 
 plugins {
     kotlin("multiplatform")
-    alias(libs.plugins.kotlin.plugin.serialization)
+    alias(libs.plugins.kotlinx.rpc)
 }
 
 kotlin {
@@ -32,10 +32,11 @@ kotlin {
                 implementation(libs.kotlinx.rpc.krpc.ktor.client)
                 implementation(libs.kotlinx.rpc.krpc.serialization.json)
 
-                implementation(project.dependencies.platform(libs.kotlin.wrappers.bom))
+                implementation(project.dependencies.enforcedPlatform(libs.kotlin.wrappers.bom))
                 implementation(libs.react)
                 implementation(libs.react.dom)
-                implementation(libs.emotion)
+                implementation(libs.emotion.css)
+                implementation(libs.emotion.react)
             }
         }
     }

samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt

@@ -44,7 +44,7 @@ val AppContainer = FC<AppContainerProps> { props ->
     data?.also { welcomeData ->
         Welcome {
             this.data = welcomeData
-            this.service = service
+            this.news = service.subscribeToNews()
         }
     } ?: run {
         div {

samples/ktor-web-app/frontend/src/jsMain/kotlin/Welcome.kt

@@ -3,7 +3,7 @@
  */
 
 import emotion.react.css
-import kotlinx.rpc.krpc.streamScoped
+import kotlinx.coroutines.flow.Flow
 import react.FC
 import react.Props
 import react.dom.html.ReactHTML.div
@@ -20,29 +20,27 @@ data class WelcomeData(
 )
 
 external interface WelcomeProps : Props {
-    var service: MyService
+    var news: Flow<String>
     var data: WelcomeData
 }
 
-fun useArticles(service: MyService): List<String> {
+fun useArticles(news: Flow<String>): List<String> {
     var articles by useState(emptyList<String>())
 
     useEffectOnce {
         var localArticles = articles
-        streamScoped {
-            service.subscribeToNews().collect {
-                @Suppress("SuspiciousCollectionReassignment")
-                localArticles += it
-                articles = localArticles
-            }
+        news.collect {
+            @Suppress("SuspiciousCollectionReassignment")
+            localArticles += it
+            articles = localArticles
         }
     }
 
     return articles
 }
 
 val Welcome = FC<WelcomeProps> { props ->
-    val articles = useArticles(props.service)
+    val articles = useArticles(props.news)
 
     div {
         css {

samples/ktor-web-app/gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-kotlin = "2.1.10"
-kotlin-wrappers-bom = "2025.1.2"
+kotlin = "2.1.20"
+kotlin-wrappers-bom = "2025.4.8"
 ktor = "3.0.3"
 kotlinx-serialization-json = "1.8.0"
 kotlinx-coroutines-core = "1.10.1"
 logback = "1.5.16"
-kotlinx-rpc = "0.5.1"
+kotlinx-rpc = "0.6.1"
 
 [libraries]
 # kotlin
@@ -23,7 +23,8 @@ kotlinx-coroutines-core-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutin
 kotlin-wrappers-bom = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom", version.ref = "kotlin-wrappers-bom" }
 react = { module = "org.jetbrains.kotlin-wrappers:kotlin-react" }
 react-dom = { module = "org.jetbrains.kotlin-wrappers:kotlin-react-dom" }
-emotion = { module = "org.jetbrains.kotlin-wrappers:kotlin-emotion" }
+emotion-css = { module = "org.jetbrains.kotlin-wrappers:kotlin-emotion-css" }
+emotion-react = { module = "org.jetbrains.kotlin-wrappers:kotlin-emotion-react" }
 
 # ktor
 ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }

samples/ktor-web-app/server/build.gradle.kts

@@ -5,6 +5,7 @@
 plugins {
     kotlin("jvm")
     alias(libs.plugins.kotlin.plugin.serialization)
+    alias(libs.plugins.kotlinx.rpc)
     application
     distribution
 }

samples/ktor-web-app/server/src/main/kotlin/MyServiceImpl.kt

@@ -12,7 +12,7 @@ class MyServiceImpl(override val coroutineContext: CoroutineContext) : MyService
         return "Nice to meet you $user, how is it in ${userData.address}?"
     }
 
-    override suspend fun subscribeToNews(): Flow<String> {
+    override fun subscribeToNews(): Flow<String> {
         return flow {
             repeat(10) {
                 delay(2000)

samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt

@@ -35,11 +35,9 @@ class ApplicationTest {
             actual = service.hello("Alex", UserData("address1", "last")),
         )
 
-        streamScoped {
-            assertEquals(
-                expected = List(10) { "Article number $it" },
-                actual = service.subscribeToNews().toList(),
-            )
-        }
+        assertEquals(
+            expected = List(10) { "Article number $it" },
+            actual = service.subscribeToNews().toList(),
+        )
     }
 }

samples/simple-ktor-app/build.gradle.kts

@@ -3,10 +3,10 @@
  */
 
 plugins {
-    kotlin("jvm") version "2.1.10"
-    kotlin("plugin.serialization") version "2.1.10"
+    kotlin("jvm") version "2.1.20"
+    kotlin("plugin.serialization") version "2.1.20"
     id("io.ktor.plugin") version "3.0.3"
-    id("org.jetbrains.kotlinx.rpc.plugin") version "0.5.1"
+    id("org.jetbrains.kotlinx.rpc.plugin") version "0.6.1"
 }
 
 group = "kotlinx.rpc.sample"
@@ -28,17 +28,17 @@ kotlin {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client:0.5.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server:0.5.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json:0.5.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client:0.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server:0.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json:0.6.1")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client:0.5.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server:0.5.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client:0.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server:0.6.1")
 
     implementation("io.ktor:ktor-client-cio")
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:1.5.16")
 
     testImplementation("io.ktor:ktor-server-test-host")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.1.10")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.1.20")
 }