Skip to content

Commit cd4375c

Browse files
Mr3zeerenovate[bot]
andcommitted
Update samples (#365)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 473080c commit cd4375c

File tree

44 files changed

+100
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+100
-130
lines changed

samples/grpc-app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
plugins {
66
kotlin("jvm") version "2.1.10"
77
kotlin("plugin.serialization") version "2.1.10"
8-
id("org.jetbrains.kotlinx.rpc.plugin") version "0.6.0"
8+
id("org.jetbrains.kotlinx.rpc.plugin") version "0.7.0"
99
id("com.google.protobuf") version "0.9.5"
1010
}
1111

@@ -22,9 +22,9 @@ kotlin {
2222
}
2323

2424
dependencies {
25-
implementation("org.jetbrains.kotlinx:kotlinx-rpc-grpc-core:0.5.1-grpc-39")
25+
implementation("org.jetbrains.kotlinx:kotlinx-rpc-grpc-core:0.7.0-grpc-56")
2626
implementation("ch.qos.logback:logback-classic:1.5.18")
27-
implementation("io.grpc:grpc-netty:1.71.0")
27+
implementation("io.grpc:grpc-netty:1.73.0")
2828
}
2929

3030
rpc {

samples/grpc-app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
66
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
77
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
8-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
98
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
109

1110
plugins {
@@ -17,9 +16,9 @@ plugins {
1716
}
1817

1918
kotlin {
20-
@OptIn(ExperimentalWasmDsl::class)
19+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
2120
wasmJs {
22-
moduleName = "composeApp"
21+
outputModuleName = "composeApp"
2322
browser {
2423
val projectDirPath = project.projectDir.path
2524
commonWebpackConfig {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import kotlinx.rpc.krpc.ktor.client.installKrpc
1818
import kotlinx.rpc.krpc.ktor.client.rpc
1919
import kotlinx.rpc.krpc.ktor.client.rpcConfig
2020
import kotlinx.rpc.krpc.serialization.json.json
21-
import kotlinx.rpc.krpc.streamScoped
2221
import kotlinx.rpc.withService
2322
import ktor_all_platforms_app.composeapp.generated.resources.Res
2423
import ktor_all_platforms_app.composeapp.generated.resources.compose_multiplatform

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
kotlin = "2.1.21"
2+
kotlin = "2.2.0"
33

4-
agp = "8.9.1"
5-
android-compileSdk = "35"
4+
agp = "8.11.0-alpha07"
5+
android-compileSdk = "36"
66
android-minSdk = "24"
7-
android-targetSdk = "35"
7+
android-targetSdk = "36"
88
androidx-activityCompose = "1.10.1"
9-
androidx-appcompat = "1.7.0"
9+
androidx-appcompat = "1.7.1"
1010
androidx-constraintlayout = "2.2.1"
1111
androidx-core-ktx = "1.16.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.8"
16-
compose-plugin = "1.8.0-SNAPSHOT+pull-5245"
15+
compose = "1.8.3"
16+
compose-plugin = "1.8.2"
1717
junit = "4.13.2"
18-
ktor = "3.1.2"
18+
ktor = "3.1.3"
1919
logback = "1.5.18"
2020
serialization = "1.8.1"
2121
coroutines = "1.10.2"
22-
kotlinx-rpc = "0.7.0"
22+
kotlinx-rpc = "0.8.0"
2323

2424
[libraries]
2525
# kotlin
Binary file not shown.

samples/ktor-all-platforms-app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

samples/ktor-all-platforms-app/gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

samples/ktor-all-platforms-app/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fun Application.module() {
3030
}
3131
}
3232

33-
registerService<UserService> { ctx -> UserServiceImpl(ctx) }
33+
registerService<UserService> { UserServiceImpl() }
3434
}
3535
}
3636
}

0 commit comments

Comments
 (0)