Update samples to 0.8.0

Mr3zee · Mr3zee · commit ccd3504c7d75 · 2025-06-30T11:05:57.000+02:00
diff --git a/samples/ktor-all-platforms-app/composeApp/build.gradle.kts b/samples/ktor-all-platforms-app/composeApp/build.gradle.kts
@@ -5,7 +5,6 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
@@ -17,9 +16,9 @@ plugins {
 }
 
 kotlin {
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "composeApp"
+        outputModuleName = "composeApp"
         browser {
             val projectDirPath = project.projectDir.path
             commonWebpackConfig {
diff --git a/samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt b/samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt
@@ -18,7 +18,6 @@ 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 ktor_all_platforms_app.composeapp.generated.resources.Res
 import ktor_all_platforms_app.composeapp.generated.resources.compose_multiplatform
diff --git a/samples/ktor-all-platforms-app/gradle/libs.versions.toml b/samples/ktor-all-platforms-app/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 
-agp = "8.11.0"
-android-compileSdk = "35"
+agp = "8.11.0-alpha07"
+android-compileSdk = "36"
 android-minSdk = "24"
-android-targetSdk = "35"
+android-targetSdk = "36"
 androidx-activityCompose = "1.10.1"
 androidx-appcompat = "1.7.1"
 androidx-constraintlayout = "2.2.1"
@@ -15,11 +15,11 @@ androidx-test-junit = "1.2.1"
 compose = "1.8.3"
 compose-plugin = "1.8.2"
 junit = "4.13.2"
-ktor = "3.2.0"
+ktor = "3.1.3"
 logback = "1.5.18"
 serialization = "1.8.1"
 coroutines = "1.10.2"
-kotlinx-rpc = "0.7.0"
+kotlinx-rpc = "0.8.0"
 
 [libraries]
 # kotlin
diff --git a/samples/ktor-all-platforms-app/server/src/main/kotlin/kotlinx/rpc/sample/Application.kt b/samples/ktor-all-platforms-app/server/src/main/kotlin/kotlinx/rpc/sample/Application.kt
@@ -30,7 +30,7 @@ fun Application.module() {
                 }
             }
 
-            registerService<UserService> { ctx -> UserServiceImpl(ctx) }
+            registerService<UserService> { UserServiceImpl() }
         }
     }
 }
diff --git a/samples/ktor-all-platforms-app/server/src/main/kotlin/kotlinx/rpc/sample/UserServiceImpl.kt b/samples/ktor-all-platforms-app/server/src/main/kotlin/kotlinx/rpc/sample/UserServiceImpl.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlin.coroutines.CoroutineContext
 
-class UserServiceImpl(override val coroutineContext: CoroutineContext) : UserService {
+class UserServiceImpl : UserService {
     override suspend fun hello(user: String, userData: UserData): String {
         return "Nice to meet you $user, how is it in ${userData.address}?"
     }
diff --git a/samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt b/samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt
@@ -12,14 +12,17 @@ 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 kotlin.test.Test
 import kotlin.test.assertEquals
 
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
+
         val service = createClient {
             installKrpc()
         }.rpc("/api") {
diff --git a/samples/ktor-all-platforms-app/shared/build.gradle.kts b/samples/ktor-all-platforms-app/shared/build.gradle.kts
@@ -3,8 +3,8 @@
  */
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
diff --git a/samples/ktor-all-platforms-app/shared/src/commonMain/kotlin/UserService.kt b/samples/ktor-all-platforms-app/shared/src/commonMain/kotlin/UserService.kt
@@ -3,7 +3,6 @@
  */
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.rpc.RemoteService
 import kotlinx.rpc.annotations.Rpc
 import kotlinx.serialization.Serializable
 
@@ -14,7 +13,7 @@ data class UserData(
 )
 
 @Rpc
-interface UserService : RemoteService {
+interface UserService {
     suspend fun hello(user: String, userData: UserData): String
 
     fun subscribeToNews(): Flow<String>
diff --git a/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/data/Client.kt b/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/data/Client.kt
@@ -13,7 +13,7 @@ import kotlinx.rpc.krpc.ktor.client.rpc
 import kotlinx.rpc.krpc.ktor.client.rpcConfig
 import kotlinx.rpc.krpc.serialization.json.json
 
-suspend fun createRpcClient(): RpcClient {
+fun createRpcClient(): RpcClient {
     return HttpClient(OkHttp) {
         installKrpc()
     }.rpc {
diff --git a/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt b/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt
@@ -6,6 +6,7 @@ package kotlinx.rpc.sample.ui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.rpc.sample.data.createRpcClient
 import kotlinx.rpc.sample.ui.state.WelcomeData
 import kotlinx.coroutines.Dispatchers
@@ -15,49 +16,40 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.rpc.RpcClient
-import kotlinx.rpc.krpc.streamScoped
 import kotlinx.rpc.withService
 import kotlinx.rpc.sample.MyService
 import kotlinx.rpc.sample.UserData
 
 class AppViewModel : ViewModel() {
-    private var rpcClient: RpcClient? = null
-    private var apiService: MyService? = null
+    private val rpcClient: RpcClient = createRpcClient()
+    private val apiService: MyService = rpcClient.withService<MyService>()
 
     private val _uiState = MutableStateFlow<WelcomeData?>(null)
     val uiState: StateFlow<WelcomeData?> = _uiState
 
     init {
         viewModelScope.launch(Dispatchers.IO) {
-            rpcClient = createRpcClient()
-            rpcClient?.let {
-                apiService = it.withService()
-                fetchData()
-            }
+            fetchData()
         }
     }
 
-    private fun fetchData() {
-        viewModelScope.launch(Dispatchers.IO) {
-            delay(2000)
-            val greetingDeferred = async {
-                apiService?.hello(
-                    "Alex",
-                    UserData("Berlin", "Smith")
-                )
-            }
-
-            val serverGreeting = greetingDeferred.await()
-
-            val allNews: MutableList<String> = mutableListOf()
-            apiService?.subscribeToNews()?.collect {
-                allNews += it
-
-                val sendNews = allNews.toMutableList() // fix ConcurrentModificationException
-                serverGreeting?.let {
-                    _uiState.value = WelcomeData(serverGreeting, sendNews)
-                }
-            }
+    private suspend fun CoroutineScope.fetchData() {
+        delay(2000)
+        val greetingDeferred = async {
+            apiService.hello(
+                "Alex",
+                UserData("Berlin", "Smith")
+            )
+        }
+
+        val serverGreeting = greetingDeferred.await()
+
+        val allNews: MutableList<String> = mutableListOf()
+        apiService.subscribeToNews().collect {
+            allNews += it
+
+            val sendNews = allNews.toMutableList() // fix ConcurrentModificationException
+            _uiState.value = WelcomeData(serverGreeting, sendNews)
         }
     }
 }
diff --git a/samples/ktor-android-app/common/src/main/kotlin/kotlinx/rpc/sample/MyService.kt b/samples/ktor-android-app/common/src/main/kotlin/kotlinx/rpc/sample/MyService.kt
@@ -5,11 +5,10 @@
 package kotlinx.rpc.sample
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.rpc.RemoteService
 import kotlinx.rpc.annotations.Rpc
 
 @Rpc
-interface MyService : RemoteService {
+interface MyService {
     suspend fun hello(user: String, userData: UserData): String
 
     fun subscribeToNews(): Flow<String>
diff --git a/samples/ktor-android-app/gradle/libs.versions.toml b/samples/ktor-android-app/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.11.0"
-kotlin = "2.1.21"
+agp = "8.11.0-alpha07"
+kotlin = "2.2.0"
 androidx-activityCompose = "1.10.1"
 androidx-appcompat = "1.7.1"
 androidx-constraintlayout = "2.2.1"
@@ -15,7 +15,7 @@ ktor = "3.2.0"
 kotlinx-serialization-json = "1.8.1"
 kotlinx-coroutines-core = "1.10.2"
 logback = "1.5.18"
-kotlinx-rpc = "0.7.0"
+kotlinx-rpc = "0.8.0"
 
 [libraries]
 # kotlin
diff --git a/samples/ktor-android-app/server/src/main/kotlin/kotlinx/rpc/sample/Application.kt b/samples/ktor-android-app/server/src/main/kotlin/kotlinx/rpc/sample/Application.kt
@@ -24,7 +24,7 @@ fun Application.module() {
                 }
             }
 
-            registerService<MyService> { ctx -> MyServiceImpl(ctx) }
+            registerService<MyService> { MyServiceImpl() }
         }
     }
 }
diff --git a/samples/ktor-android-app/server/src/main/kotlin/kotlinx/rpc/sample/MyServiceImpl.kt b/samples/ktor-android-app/server/src/main/kotlin/kotlinx/rpc/sample/MyServiceImpl.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlin.coroutines.CoroutineContext
 
-class MyServiceImpl(override val coroutineContext: CoroutineContext) : MyService {
+class MyServiceImpl : MyService {
     override suspend fun hello(user: String, userData: UserData): String {
         return "Nice to meet you $user, how is it in ${userData.address}?"
     }
@@ -22,4 +22,4 @@ class MyServiceImpl(override val coroutineContext: CoroutineContext) : MyService
             }
         }
     }
-}
+}
diff --git a/samples/ktor-web-app/common/src/commonMain/kotlin/Common.kt b/samples/ktor-web-app/common/src/commonMain/kotlin/Common.kt
@@ -3,7 +3,6 @@
  */
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.rpc.RemoteService
 import kotlinx.rpc.annotations.Rpc
 import kotlinx.serialization.Serializable
 
@@ -14,7 +13,7 @@ data class UserData(
 )
 
 @Rpc
-interface MyService : RemoteService {
+interface MyService {
     suspend fun hello(user: String, userData: UserData): String
 
     fun subscribeToNews(): Flow<String>
diff --git a/samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt b/samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt
@@ -2,7 +2,6 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import kotlinx.rpc.RpcClient
 import kotlinx.rpc.withService
 import react.FC
 import react.Props
@@ -11,20 +10,10 @@ import react.useEffectOnce
 import react.useState
 
 val App = FC<Props> {
-    var rpcClient by useState<RpcClient?>(null)
+    val rpcClient = initRpcClient()
 
-    useEffectOnce {
-        rpcClient = initRpcClient()
-    }
-
-    rpcClient?.also { client ->
-        AppContainer {
-            this.apiService = client.withService<MyService>()
-        }
-    } ?: run {
-        div {
-            +"Establishing connection..."
-        }
+    AppContainer {
+        apiService = rpcClient.withService<MyService>()
     }
 }
 
diff --git a/samples/ktor-web-app/frontend/src/jsMain/kotlin/RPC.kt b/samples/ktor-web-app/frontend/src/jsMain/kotlin/RPC.kt
@@ -11,7 +11,7 @@ import kotlinx.rpc.krpc.ktor.client.rpc
 import kotlinx.rpc.krpc.ktor.client.rpcConfig
 import kotlinx.rpc.krpc.serialization.json.json
 
-suspend fun initRpcClient(): RpcClient {
+fun initRpcClient(): RpcClient {
     return HttpClient(Js) {
         installKrpc()
     }.rpc {
diff --git a/samples/ktor-web-app/gradle/libs.versions.toml b/samples/ktor-web-app/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlin-wrappers-bom = "2025.6.11"
 ktor = "3.2.0"
 kotlinx-serialization-json = "1.8.1"
 kotlinx-coroutines-core = "1.10.2"
 logback = "1.5.18"
-kotlinx-rpc = "0.7.0"
+kotlinx-rpc = "0.8.0"
 
 [libraries]
 # kotlin
diff --git a/samples/ktor-web-app/server/src/main/kotlin/Application.kt b/samples/ktor-web-app/server/src/main/kotlin/Application.kt
@@ -28,7 +28,7 @@ fun Application.module() {
                 }
             }
 
-            registerService<MyService> { ctx -> MyServiceImpl(ctx) }
+            registerService<MyService> { MyServiceImpl() }
         }
 
         staticResources("/", "/static") {
diff --git a/samples/ktor-web-app/server/src/main/kotlin/MyServiceImpl.kt b/samples/ktor-web-app/server/src/main/kotlin/MyServiceImpl.kt
@@ -5,9 +5,8 @@
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlin.coroutines.CoroutineContext
 
-class MyServiceImpl(override val coroutineContext: CoroutineContext) : MyService {
+class MyServiceImpl : MyService {
     override suspend fun hello(user: String, userData: UserData): String {
         return "Nice to meet you $user, how is it in ${userData.address}?"
     }
diff --git a/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt b/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt
@@ -8,7 +8,6 @@ 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 kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/samples/simple-ktor-app/build.gradle.kts b/samples/simple-ktor-app/build.gradle.kts
@@ -28,17 +28,17 @@ kotlin {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client:0.7.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server:0.7.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json:0.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client:0.8.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server:0.8.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json:0.8.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client:0.7.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server:0.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client:0.8.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server:0.8.0")
 
     implementation("io.ktor:ktor-client-cio")
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:1.5.18")
 
     testImplementation("io.ktor:ktor-server-test-host")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.1.21")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.2.0")
 }
diff --git a/samples/simple-ktor-app/src/main/kotlin/Client.kt b/samples/simple-ktor-app/src/main/kotlin/Client.kt
diff --git a/samples/simple-ktor-app/src/main/kotlin/ImageRecognizer.kt b/samples/simple-ktor-app/src/main/kotlin/ImageRecognizer.kt
diff --git a/samples/simple-ktor-app/src/main/kotlin/Server.kt b/samples/simple-ktor-app/src/main/kotlin/Server.kt
diff --git a/samples/simple-ktor-app/src/test/kotlin/ApplicationTest.kt b/samples/simple-ktor-app/src/test/kotlin/ApplicationTest.kt

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ fun Application.module() {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- registerService<UserService> { ctx -> UserServiceImpl(ctx) }`
	`33`	`+ registerService<UserService> { UserServiceImpl() }`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow`
`11`	`11`	`import kotlinx.coroutines.flow.flow`
`12`	`12`	`import kotlin.coroutines.CoroutineContext`
`13`	`13`
`14`		`-class UserServiceImpl(override val coroutineContext: CoroutineContext) : UserService {`
	`14`	`+class UserServiceImpl : UserService {`
`15`	`15`	`override suspend fun hello(user: String, userData: UserData): String {`
`16`	`16`	`return "Nice to meet you $user, how is it in ${userData.address}?"`
`17`	`17`	`}`