Skip to content

Commit

Permalink
Updated samples to use version 0.2.0 (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mr3zee
Mr3zee authored Jun 28, 2024
1 parent 8b7c6d6 commit 219fa92
Show file tree
Hide file tree
Showing 25 changed files with 68 additions and 88 deletions.
6 changes: 3 additions & 3 deletions samples/ktor-all-platforms-app/composeApp/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ kotlin {
implementation(compose.components.resources)
implementation(projects.shared)

implementation(libs.kotlinx.rpc.runtime.client)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
implementation(libs.kotlinx.rpc.transport.ktor.client)
implementation(libs.kotlinx.rpc.krpc.client)
implementation(libs.kotlinx.rpc.krpc.serialization.json)
implementation(libs.kotlinx.rpc.krpc.ktor.client)
implementation(libs.ktor.client.cio)
implementation(libs.ktor.client.core)
implementation(libs.ktor.client.websockets)
Expand Down
2 changes: 1 addition & 1 deletion samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
import io.ktor.client.*
import io.ktor.http.*
import kotlinx.rpc.client.withService
import kotlinx.rpc.internal.streamScoped
import kotlinx.rpc.serialization.json
import kotlinx.rpc.streamScoped
import kotlinx.rpc.transport.ktor.client.installRPC
import kotlinx.rpc.transport.ktor.client.rpc
import kotlinx.rpc.transport.ktor.client.rpcConfig
Expand Down
22 changes: 11 additions & 11 deletions samples/ktor-all-platforms-app/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "1.9.23"
ksp = "1.9.23-1.0.19"
kotlin = "1.9.24"
ksp = "1.9.24-1.0.20"

agp = "8.2.0"
android-compileSdk = "34"
Expand All @@ -13,14 +13,14 @@ androidx-core-ktx = "1.12.0"
androidx-espresso-core = "3.5.1"
androidx-material = "1.11.0"
androidx-test-junit = "1.1.5"
compose = "1.6.1"
compose-plugin = "1.6.1"
compose = "1.6.8"
compose-plugin = "1.6.11"
junit = "4.13.2"
ktor = "2.3.11"
logback = "1.5.6"
kotlinx-serialization-json = "1.6.3"
kotlinx-coroutines-core = "1.8.1"
kotlinx-rpc = "0.1.0"
kotlinx-rpc = "0.2.0"

[libraries]
# kotlin
Expand Down Expand Up @@ -58,12 +58,12 @@ ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.re
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }

# 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" }
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }

# other
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
Expand Down
10 changes: 5 additions & 5 deletions samples/ktor-all-platforms-app/server/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.kotlinx.rpc.runtime.server)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
implementation(libs.kotlinx.rpc.transport.ktor.server)
implementation(libs.kotlinx.rpc.krpc.server)
implementation(libs.kotlinx.rpc.krpc.serialization.json)
implementation(libs.kotlinx.rpc.krpc.ktor.server)
testImplementation(libs.ktor.server.tests)
testImplementation(libs.kotlinx.rpc.runtime.client)
testImplementation(libs.kotlinx.rpc.transport.ktor.client)
testImplementation(libs.kotlinx.rpc.krpc.client)
testImplementation(libs.kotlinx.rpc.krpc.ktor.client)
testImplementation(libs.kotlin.test.junit)
}
2 changes: 1 addition & 1 deletion samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import UserService
import io.ktor.server.testing.*
import kotlinx.coroutines.flow.toList
import kotlinx.rpc.client.withService
import kotlinx.rpc.internal.streamScoped
import kotlinx.rpc.serialization.json
import kotlinx.rpc.streamScoped
import kotlinx.rpc.transport.ktor.client.installRPC
import kotlinx.rpc.transport.ktor.client.rpc
import kotlinx.rpc.transport.ktor.client.rpcConfig
Expand Down
2 changes: 0 additions & 2 deletions samples/ktor-all-platforms-app/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
pluginManagement {
repositories {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
google()
gradlePluginPortal()
mavenCentral()
Expand All @@ -20,7 +19,6 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
}
}

Expand Down
2 changes: 1 addition & 1 deletion samples/ktor-all-platforms-app/shared/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ kotlin {
commonMain.dependencies {
api(libs.kotlinx.coroutines.core)

implementation(libs.kotlinx.rpc.runtime)
implementation(libs.kotlinx.rpc.core)
implementation(libs.kotlinx.serialization.json)
}
}
Expand Down
10 changes: 5 additions & 5 deletions samples/ktor-android-app/app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ android {

dependencies {
implementation(project(":common"))
testImplementation(libs.kotlinx.rpc.runtime.client)
testImplementation(libs.kotlinx.rpc.runtime.server)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
testImplementation(libs.kotlinx.rpc.krpc.client)
testImplementation(libs.kotlinx.rpc.krpc.server)
implementation(libs.kotlinx.rpc.krpc.serialization.json)

implementation(libs.kotlinx.rpc.transport.ktor.client)
implementation(libs.kotlinx.rpc.transport.ktor.server)
implementation(libs.kotlinx.rpc.krpc.ktor.client)
implementation(libs.kotlinx.rpc.krpc.ktor.server)

implementation(libs.ktor.server.cio)
implementation(libs.ktor.server.core.jvm)
Expand Down
2 changes: 1 addition & 1 deletion samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
import kotlinx.rpc.RPCClient
import kotlinx.rpc.internal.streamScoped
import kotlinx.rpc.streamScoped
import kotlinx.rpc.client.withService
import kotlinx.rpc.sample.MyService
import kotlinx.rpc.sample.UserData
Expand Down
4 changes: 2 additions & 2 deletions samples/ktor-android-app/common/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ dependencies {
implementation(libs.ktor.server.core.jvm)
implementation(libs.ktor.server.websockets.jvm)
implementation(libs.kotlinx.serialization.json)
implementation(libs.kotlinx.rpc.transport.ktor.server)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
implementation(libs.kotlinx.rpc.krpc.ktor.server)
implementation(libs.kotlinx.rpc.krpc.serialization.json)
}
20 changes: 10 additions & 10 deletions samples/ktor-android-app/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[versions]
agp = "8.1.3"
kotlin = "1.9.22"
kotlin = "1.9.24"
androidx-activityCompose = "1.8.2"
androidx-appcompat = "1.6.1"
androidx-constraintlayout = "2.1.4"
androidx-core-ktx = "1.12.0"
androidx-test-junit = "1.1.5"
compose = "1.6.0"
compose = "1.6.11"
material3 = "1.2.0"
junit = "4.13.2"
ktor = "2.3.11"
kotlinx-serialization-json = "1.6.1"
kotlinx-coroutines-core = "1.8.1"
logback = "1.5.6"
kotlinx-rpc = "0.1.0"
ksp = "1.9.22-1.0.17"
kotlinx-rpc = "0.2.0"
ksp = "1.9.24-1.0.20"

[libraries]
# kotlin
Expand Down Expand Up @@ -64,12 +64,12 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }

# 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" }
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }

[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
Expand Down
8 changes: 4 additions & 4 deletions samples/ktor-android-app/server/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ dependencies {
implementation(libs.kotlinx.coroutines.core.jvm)
implementation(libs.logback.classic)

implementation(libs.kotlinx.rpc.transport.ktor.server)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
implementation(libs.kotlinx.rpc.krpc.ktor.server)
implementation(libs.kotlinx.rpc.krpc.serialization.json)

testImplementation(libs.kotlinx.rpc.runtime.client)
testImplementation(libs.kotlinx.rpc.transport.ktor.client)
testImplementation(libs.kotlinx.rpc.krpc.client)
testImplementation(libs.kotlinx.rpc.krpc.ktor.client)
testImplementation(libs.kotlin.test)
testImplementation(libs.ktor.server.test.host)
}
2 changes: 1 addition & 1 deletion samples/ktor-android-app/server/src/test/kotlin/ApplicationTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import io.ktor.server.routing.*
import io.ktor.server.testing.*
import kotlinx.coroutines.flow.toList
import kotlinx.rpc.client.withService
import kotlinx.rpc.internal.streamScoped
import kotlinx.rpc.sample.MyService
import kotlinx.rpc.sample.UserData
import kotlinx.rpc.serialization.json
import kotlinx.rpc.streamScoped
import kotlinx.rpc.transport.ktor.client.installRPC
import kotlinx.rpc.transport.ktor.client.rpc
import kotlinx.rpc.transport.ktor.client.rpcConfig
Expand Down
2 changes: 0 additions & 2 deletions samples/ktor-android-app/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ pluginManagement {
repositories {
google()
mavenCentral()
maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
google()
mavenCentral()
}
Expand Down
1 change: 0 additions & 1 deletion samples/ktor-web-app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ allprojects {
version = "0.1"

repositories {
maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
mavenCentral()
}
}
2 changes: 1 addition & 1 deletion samples/ktor-web-app/common/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies {
commonMainApi(libs.kotlinx.serialization.json)
commonMainApi(libs.ktor.client.core)
commonMainApi(libs.kotlinx.coroutines.core)
commonMainApi(libs.kotlinx.rpc.runtime)
commonMainApi(libs.kotlinx.rpc.core)
}
4 changes: 2 additions & 2 deletions samples/ktor-web-app/frontend/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ kotlin {
implementation(libs.kotlin.stdlib.js)
implementation(libs.ktor.client.js)
implementation(libs.ktor.client.websockets.js)
implementation(libs.kotlinx.rpc.transport.ktor.client)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
implementation(libs.kotlinx.rpc.krpc.ktor.client)
implementation(libs.kotlinx.rpc.krpc.serialization.json)

implementation(project.dependencies.platform(libs.kotlin.wrappers.bom))
implementation(libs.react)
Expand Down
2 changes: 1 addition & 1 deletion samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import kotlinx.coroutines.flow.flow
import kotlinx.rpc.RPCClient
import kotlinx.rpc.client.withService
import kotlinx.rpc.internal.streamScoped
import kotlinx.rpc.streamScoped
import react.FC
import react.Props
import react.dom.html.ReactHTML.div
Expand Down
14 changes: 7 additions & 7 deletions samples/ktor-web-app/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ktor = "2.3.11"
kotlinx-serialization-json = "1.6.1"
kotlinx-coroutines-core = "1.8.1"
logback = "1.5.6"
krpc = "0.1.0"
krpc = "0.2.0"
ksp = "1.9.24-1.0.20"

[libraries]
Expand Down Expand Up @@ -42,12 +42,12 @@ ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }

# krpc
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" }
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }

[plugins]
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
Expand Down
8 changes: 4 additions & 4 deletions samples/ktor-web-app/server/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ dependencies {
implementation(libs.kotlinx.coroutines.core.jvm)
implementation(libs.logback.classic)

implementation(libs.kotlinx.rpc.transport.ktor.server)
implementation(libs.kotlinx.rpc.runtime.serialization.json)
implementation(libs.kotlinx.rpc.krpc.ktor.server)
implementation(libs.kotlinx.rpc.krpc.serialization.json)

testImplementation(libs.kotlinx.rpc.runtime.client)
testImplementation(libs.kotlinx.rpc.transport.ktor.client)
testImplementation(libs.kotlinx.rpc.krpc.client)
testImplementation(libs.kotlinx.rpc.krpc.ktor.client)
testImplementation(libs.kotlin.test)
testImplementation(libs.ktor.server.test.host)
}
Expand Down
2 changes: 1 addition & 1 deletion samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import io.ktor.server.testing.*
import kotlinx.coroutines.flow.toList
import kotlinx.rpc.client.withService
import kotlinx.rpc.internal.streamScoped
import kotlinx.rpc.serialization.json
import kotlinx.rpc.streamScoped
import kotlinx.rpc.transport.ktor.client.installRPC
import kotlinx.rpc.transport.ktor.client.rpc
import kotlinx.rpc.transport.ktor.client.rpcConfig
Expand Down
7 changes: 0 additions & 7 deletions samples/ktor-web-app/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,4 @@

rootProject.name = "ktor-web-app"

pluginManagement {
repositories {
maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
gradlePluginPortal()
}
}

include("common", "frontend", "server")
13 changes: 6 additions & 7 deletions samples/simple-ktor-app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
kotlin("plugin.serialization") version "1.9.24"
id("io.ktor.plugin") version "2.3.11"
id("com.google.devtools.ksp") version "1.9.24-1.0.20"
id("org.jetbrains.kotlinx.rpc.plugin") version "0.1.0"
id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.0"
}

val kotlin_version: String by project
Expand All @@ -24,7 +24,6 @@ application {
}

repositories {
maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
mavenCentral()
}

Expand All @@ -33,12 +32,12 @@ kotlin {
}

dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-rpc-runtime-client")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-runtime-server")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-runtime-serialization-json")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json")

implementation("org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-client")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-server")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client")
implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server")

implementation("io.ktor:ktor-client-cio-jvm")
implementation("io.ktor:ktor-server-netty-jvm")
Expand Down
7 changes: 0 additions & 7 deletions samples/simple-ktor-app/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,3 @@
*/

rootProject.name = "simple-ktor-app"

pluginManagement {
repositories {
maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
gradlePluginPortal()
}
}
Loading

0 comments on commit 219fa92

Please sign in to comment.