Updated samples to match current API state (#58)

Author: Mr3zee

CONTRIBUTING.md

@@ -75,7 +75,7 @@ Contributions are made using Github [pull requests](https://help.github.com/en/a
 
 [//]: # (TODO change repo link to the repo)
 1. Fork the `kotlinx.rpc` repository and work on your fork.
-2. [Create](https://github.com/kotlin/kotlinx.rpc/compare) a new PR with a request to merge to the **main** branch. 
+2. [Create](https://github.com/kotlin/kotlinx-rpc/compare) a new PR with a request to merge to the **main** branch. 
 3. Ensure that the description is clear and refers to an existing ticket/bug if applicable. 
 4. Make sure any code contributed is covered by tests and no existing tests are broken.
 

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/kotlin/kotlinx.rpc/main/.github/images/logo.svg">
-    <img alt="kotlinx.rpc logo" src="https://raw.githubusercontent.com/kotlin/kotlinx.rpc/main/.github/images/logo.svg">
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/kotlin/kotlinx-rpc/main/.github/images/logo.svg">
+    <img alt="kotlinx.rpc logo" src="https://raw.githubusercontent.com/kotlin/kotlinx-rpc/main/.github/images/logo.svg">
   </picture>
 </div>
 

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

@@ -11,7 +11,7 @@ plugins {
     alias(libs.plugins.kotlinJvm) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.kotlinPluginSerialization) apply false
-    alias(libs.plugins.krpc) apply false
-    alias(libs.plugins.krpc.platform) apply false
+    alias(libs.plugins.kotlinx.rpc) apply false
+    alias(libs.plugins.kotlinx.rpc.platform) apply false
     alias(libs.plugins.ksp) apply false
 }

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

@@ -8,7 +8,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
-    alias(libs.plugins.krpc.platform)
+    alias(libs.plugins.kotlinx.rpc.platform)
 }
 
 kotlin {
@@ -48,9 +48,9 @@ kotlin {
             implementation(compose.components.resources)
             implementation(projects.shared)
 
-            implementation(libs.krpc.runtime.client)
-            implementation(libs.krpc.runtime.serialization.json)
-            implementation(libs.krpc.transport.ktor.client)
+            implementation(libs.kotlinx.rpc.runtime.client)
+            implementation(libs.kotlinx.rpc.runtime.serialization.json)
+            implementation(libs.kotlinx.rpc.transport.ktor.client)
             implementation(libs.ktor.client.cio)
             implementation(libs.ktor.client.core)
             implementation(libs.ktor.client.websockets)
@@ -62,15 +62,15 @@ kotlin {
 }
 
 android {
-    namespace = "org.jetbrains.krpc.sample"
+    namespace = "kotlinx.rpc.sample"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
-        applicationId = "org.jetbrains.krpc.sample"
+        applicationId = "kotlinx.rpc.sample"
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         versionCode = 1
@@ -101,7 +101,7 @@ compose.desktop {
 
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "org.jetbrains.krpc.sample"
+            packageName = "kotlinx.rpc.sample"
             packageVersion = "1.0.0"
         }
     }

samples/ktor-all-platforms-app/composeApp/src/androidMain/kotlin/org/jetbrains/krpc/sample/MainActivity.kt renamed to samples/ktor-all-platforms-app/composeApp/src/androidMain/kotlin/kotlinx/rpc/sample/MainActivity.kt

@@ -1,4 +1,8 @@
-package org.jetbrains.krpc.sample
+/*
+ * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.rpc.sample
 
 import App
 import android.os.Bundle
@@ -21,4 +25,4 @@ class MainActivity : ComponentActivity() {
 @Composable
 fun AppAndroidPreview() {
     App()
-}
+}

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

@@ -13,22 +13,23 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import io.ktor.client.*
-import io.ktor.client.plugins.websocket.*
 import io.ktor.http.*
+import kotlinx.rpc.client.withService
+import kotlinx.rpc.internal.streamScoped
+import kotlinx.rpc.serialization.json
+import kotlinx.rpc.transport.ktor.client.installRPC
+import kotlinx.rpc.transport.ktor.client.rpc
+import kotlinx.rpc.transport.ktor.client.rpcConfig
 import ktor_all_platforms_app.composeapp.generated.resources.Res
 import ktor_all_platforms_app.composeapp.generated.resources.compose_multiplatform
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.krpc.client.withService
-import org.jetbrains.krpc.serialization.json
-import org.jetbrains.krpc.transport.ktor.client.rpc
-import org.jetbrains.krpc.transport.ktor.client.rpcConfig
 
 expect val DEV_SERVER_HOST: String
 
 val client by lazy {
     HttpClient {
-        install(WebSockets)
+        installRPC()
     }
 }
 
@@ -64,8 +65,10 @@ fun App() {
         }
 
         LaunchedEffect(service) {
-            service.subscribeToNews().collect { article ->
-                news.add(article)
+            streamScoped {
+                service.subscribeToNews().collect { article ->
+                    news.add(article)
+                }
             }
         }
 

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

@@ -20,7 +20,7 @@ ktor = "2.3.8"
 logback = "1.4.14"
 kotlinx-serialization-json = "1.6.1"
 kotlinx-coroutines-core = "1.7.3"
-krpc = "5.4-beta"
+kotlinx-rpc = "6.0-beta"
 
 [libraries]
 # kotlin
@@ -57,13 +57,13 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 
-# krpc
-krpc-runtime = { module = "org.jetbrains.krpc:krpc-runtime" }
-krpc-runtime-client = { module = "org.jetbrains.krpc:krpc-runtime-client" }
-krpc-runtime-server = { module = "org.jetbrains.krpc:krpc-runtime-server" }
-krpc-transport-ktor-client = { module = "org.jetbrains.krpc:krpc-transport-ktor-client" }
-krpc-transport-ktor-server = { module = "org.jetbrains.krpc:krpc-transport-ktor-server" }
-krpc-runtime-serialization-json = { module = "org.jetbrains.krpc:krpc-runtime-serialization-json" }
+# kotlinx-rpc
+kotlinx-rpc-runtime = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime" }
+kotlinx-rpc-runtime-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-client" }
+kotlinx-rpc-runtime-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-server" }
+kotlinx-rpc-transport-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-client" }
+kotlinx-rpc-transport-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-server" }
+kotlinx-rpc-runtime-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-serialization-json" }
 
 # other
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
@@ -79,6 +79,6 @@ kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization",
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-krpc = { id = "org.jetbrains.krpc.plugin", version.ref = "krpc" }
-krpc-platform = { id = "org.jetbrains.krpc.platform", version.ref = "krpc" }
+kotlinx-rpc = { id = "org.jetbrains.kotlinx.rpc.plugin", version.ref = "kotlinx-rpc" }
+kotlinx-rpc-platform = { id = "org.jetbrains.kotlinx.rpc.platform", version.ref = "kotlinx-rpc" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

samples/ktor-all-platforms-app/iosApp/Configuration/Config.xcconfig

@@ -1,3 +1,3 @@
 TEAM_ID=
-BUNDLE_ID=org.jetbrains.krpc.sample.ktor-all-platforms-app
+BUNDLE_ID=kotlinx.rpc.sample.ktor-all-platforms-app
 APP_NAME=ktor-all-platforms-app

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

@@ -5,14 +5,14 @@
 plugins {
     alias(libs.plugins.kotlinJvm)
     alias(libs.plugins.ktor)
-    alias(libs.plugins.krpc.platform)
+    alias(libs.plugins.kotlinx.rpc.platform)
     application
 }
 
-group = "org.jetbrains.krpc.sample"
+group = "kotlinx.rpc.sample"
 version = "1.0.0"
 application {
-    mainClass.set("org.jetbrains.krpc.sample.ApplicationKt")
+    mainClass.set("kotlinx.rpc.sample.ApplicationKt")
     applicationDefaultJvmArgs = listOf("-Dio.ktor.development=${extra["development"] ?: "false"}")
 }
 
@@ -25,11 +25,11 @@ dependencies {
     implementation(libs.ktor.server.cors.jvm)
     implementation(libs.ktor.server.websockets.jvm)
     implementation(libs.ktor.server.host.common.jvm)
-    implementation(libs.krpc.runtime.server)
-    implementation(libs.krpc.runtime.serialization.json)
-    implementation(libs.krpc.transport.ktor.server)
+    implementation(libs.kotlinx.rpc.runtime.server)
+    implementation(libs.kotlinx.rpc.runtime.serialization.json)
+    implementation(libs.kotlinx.rpc.transport.ktor.server)
     testImplementation(libs.ktor.server.tests)
-    testImplementation(libs.krpc.runtime.client)
-    testImplementation(libs.krpc.transport.ktor.client)
+    testImplementation(libs.kotlinx.rpc.runtime.client)
+    testImplementation(libs.kotlinx.rpc.transport.ktor.client)
     testImplementation(libs.kotlin.test.junit)
 }

samples/ktor-all-platforms-app/server/src/main/kotlin/org/jetbrains/krpc/sample/Application.kt renamed to samples/ktor-all-platforms-app/server/src/main/kotlin/kotlinx/rpc/sample/Application.kt

@@ -2,23 +2,23 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package org.jetbrains.krpc.sample
+package kotlinx.rpc.sample
 
 import UserService
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.netty.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.routing.*
-import io.ktor.server.websocket.*
-import org.jetbrains.krpc.serialization.json
-import org.jetbrains.krpc.transport.ktor.server.rpc
+import kotlinx.rpc.serialization.json
+import kotlinx.rpc.transport.ktor.server.RPC
+import kotlinx.rpc.transport.ktor.server.rpc
 
 fun main(args: Array<String>): Unit = EngineMain.main(args)
 
 @Suppress("unused")
 fun Application.module() {
-    install(WebSockets)
+    install(RPC)
 
     installCORS()
 
@@ -30,7 +30,7 @@ fun Application.module() {
                 }
             }
 
-            registerService<UserService>(UserServiceImpl())
+            registerService<UserService> { ctx -> UserServiceImpl(ctx) }
         }
     }
 }