Skip to content

Commit fca1259

Browse files
Mr3zeerenovate[bot]
Mr3zee
and
renovate[bot]
committed
Samples update (#224)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent ba916cf commit fca1259

File tree

16 files changed

+75
-89
lines changed

16 files changed

+75
-89
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,5 @@ plugins {
1212
alias(libs.plugins.kotlinMultiplatform) apply false
1313
alias(libs.plugins.kotlinPluginSerialization) apply false
1414
alias(libs.plugins.kotlinx.rpc) apply false
15-
alias(libs.plugins.kotlinx.rpc.platform) apply false
1615
alias(libs.plugins.compose.compiler) apply false
1716
}
18-
19-
allprojects {
20-
configurations.all {
21-
resolutionStrategy {
22-
// Workaround for https://youtrack.jetbrains.com/issue/CMP-6658
23-
force(libs.kotlinx.serialization.core)
24-
force(libs.kotlinx.serialization.json)
25-
force(libs.kotlin.stdlib)
26-
}
27-
}
28-
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ plugins {
1313
alias(libs.plugins.androidApplication)
1414
alias(libs.plugins.jetbrainsCompose)
1515
alias(libs.plugins.compose.compiler)
16-
alias(libs.plugins.kotlinx.rpc.platform)
1716
}
1817

1918
kotlin {

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
kotlin = "2.0.10"
2+
kotlin = "2.0.21"
33

4-
agp = "8.6.1"
5-
android-compileSdk = "34"
4+
agp = "8.7.2"
5+
android-compileSdk = "35"
66
android-minSdk = "24"
7-
android-targetSdk = "34"
8-
androidx-activityCompose = "1.9.2"
7+
android-targetSdk = "35"
8+
androidx-activityCompose = "1.9.3"
99
androidx-appcompat = "1.7.0"
10-
androidx-constraintlayout = "2.1.4"
11-
androidx-core-ktx = "1.13.1"
10+
androidx-constraintlayout = "2.2.0"
11+
androidx-core-ktx = "1.15.0"
1212
androidx-espresso-core = "3.6.1"
1313
androidx-material = "1.12.0"
1414
androidx-test-junit = "1.2.1"
15-
compose = "1.7.2"
16-
compose-plugin = "1.6.11"
15+
compose = "1.7.5"
16+
compose-plugin = "1.7.0"
1717
junit = "4.13.2"
18-
ktor = "3.0.0-rc-1"
19-
logback = "1.5.8"
20-
serialization = "1.7.1"
18+
ktor = "3.0.1"
19+
logback = "1.5.12"
20+
serialization = "1.7.3"
2121
coroutines = "1.9.0"
22-
kotlinx-rpc = "0.3.0"
22+
kotlinx-rpc = "0.4.0"
2323

2424
[libraries]
2525
# kotlin
@@ -58,12 +58,12 @@ ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
5858
ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
5959

6060
# kotlinx-rpc
61-
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
62-
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
63-
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
64-
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
65-
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
66-
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }
61+
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core", version.ref = "kotlinx-rpc" }
62+
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client", version.ref = "kotlinx-rpc" }
63+
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server", version.ref = "kotlinx-rpc" }
64+
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client", version.ref = "kotlinx-rpc" }
65+
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server", version.ref = "kotlinx-rpc" }
66+
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json", version.ref = "kotlinx-rpc" }
6767

6868
# other
6969
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
@@ -81,4 +81,3 @@ kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
8181
ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
8282
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
8383
kotlinx-rpc = { id = "org.jetbrains.kotlinx.rpc.plugin", version.ref = "kotlinx-rpc" }
84-
kotlinx-rpc-platform = { id = "org.jetbrains.kotlinx.rpc.platform", version.ref = "kotlinx-rpc" }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
plugins {
66
alias(libs.plugins.kotlinJvm)
77
alias(libs.plugins.ktor)
8-
alias(libs.plugins.kotlinx.rpc.platform)
98
application
109
}
1110

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
*/
44

55
import kotlinx.coroutines.flow.Flow
6-
import kotlinx.rpc.RPC
6+
import kotlinx.rpc.RemoteService
7+
import kotlinx.rpc.annotations.Rpc
78
import kotlinx.serialization.Serializable
89

910
@Serializable
@@ -12,7 +13,8 @@ data class UserData(
1213
val lastName: String,
1314
)
1415

15-
interface UserService : RPC {
16+
@Rpc
17+
interface UserService : RemoteService {
1618
suspend fun hello(user: String, userData: UserData): String
1719

1820
suspend fun subscribeToNews(): Flow<String>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ plugins {
66
alias(libs.plugins.androidApplication)
77
alias(libs.plugins.kotlinAndroid)
88
alias(libs.plugins.kotlinPluginSerialization)
9-
alias(libs.plugins.kotlinx.rpc.platform)
109
alias(libs.plugins.compose.compiler)
1110
}
1211

1312
android {
1413
namespace = "kotlinx.rpc.sample"
15-
compileSdk = 34
14+
compileSdk = 35
1615

1716
packaging {
1817
resources {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
package kotlinx.rpc.sample
66

77
import kotlinx.coroutines.flow.Flow
8-
import kotlinx.rpc.RPC
8+
import kotlinx.rpc.RemoteService
9+
import kotlinx.rpc.annotations.Rpc
910

10-
interface MyService : RPC {
11+
@Rpc
12+
interface MyService : RemoteService {
1113
suspend fun hello(user: String, userData: UserData): String
1214

1315
suspend fun subscribeToNews(): Flow<String>
14-
}
16+
}

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
[versions]
2-
agp = "8.6.1"
3-
kotlin = "2.0.10"
4-
androidx-activityCompose = "1.9.2"
2+
agp = "8.7.2"
3+
kotlin = "2.0.21"
4+
androidx-activityCompose = "1.9.3"
55
androidx-appcompat = "1.7.0"
6-
androidx-constraintlayout = "2.1.4"
7-
androidx-core-ktx = "1.13.1"
6+
androidx-constraintlayout = "2.2.0"
7+
androidx-core-ktx = "1.15.0"
88
androidx-test-junit = "1.2.1"
9-
compose = "1.7.2"
9+
compose = "1.7.5"
1010
compose-plugin = "1.5.14" # https://mvnrepository.com/artifact/androidx.compose.compiler/compiler
11-
compose-bom = "2024.09.02"
12-
material3 = "1.3.0"
11+
compose-bom = "2024.10.01"
12+
material3 = "1.3.1"
1313
junit = "4.13.2"
14-
ktor = "3.0.0-rc-1"
14+
ktor = "3.0.1"
1515
kotlinx-serialization-json = "1.7.3"
1616
kotlinx-coroutines-core = "1.9.0"
17-
logback = "1.5.8"
18-
kotlinx-rpc = "0.3.0"
17+
logback = "1.5.12"
18+
kotlinx-rpc = "0.4.0"
1919

2020
[libraries]
2121
# kotlin
@@ -66,12 +66,12 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
6666
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
6767

6868
# kotlinx-rpc
69-
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
70-
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
71-
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
72-
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
73-
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
74-
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }
69+
kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core", version.ref = "kotlinx-rpc" }
70+
kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client", version.ref = "kotlinx-rpc" }
71+
kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server", version.ref = "kotlinx-rpc" }
72+
kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client", version.ref = "kotlinx-rpc" }
73+
kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server", version.ref = "kotlinx-rpc" }
74+
kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json", version.ref = "kotlinx-rpc" }
7575

7676
[plugins]
7777
androidApplication = { id = "com.android.application", version.ref = "agp" }
@@ -80,5 +80,4 @@ kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
8080
kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
8181
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
8282
kotlinx-rpc = { id = "org.jetbrains.kotlinx.rpc.plugin", version.ref = "kotlinx-rpc" }
83-
kotlinx-rpc-platform = { id = "org.jetbrains.kotlinx.rpc.platform", version.ref = "kotlinx-rpc" }
8483
ktor = { id = "io.ktor.plugin", version.ref = "ktor" }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
alias(libs.plugins.kotlinJvm)
77
alias(libs.plugins.kotlinPluginSerialization)
88
alias(libs.plugins.ktor)
9-
alias(libs.plugins.kotlinx.rpc.platform)
109

1110
application
1211
distribution

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
plugins {
66
alias(libs.plugins.kotlin.multiplatform) apply false
77
alias(libs.plugins.kotlinx.rpc) apply false
8-
alias(libs.plugins.kotlinx.rpc.platform) apply false
98
}
109

1110
allprojects {

0 commit comments

Comments
 (0)