diff --git a/samples/ktor-all-platforms-app/gradle/libs.versions.toml b/samples/ktor-all-platforms-app/gradle/libs.versions.toml index d0b765fdf..ef451a2f6 100644 --- a/samples/ktor-all-platforms-app/gradle/libs.versions.toml +++ b/samples/ktor-all-platforms-app/gradle/libs.versions.toml @@ -15,7 +15,7 @@ androidx-test-junit = "1.2.1" compose = "1.8.3" compose-plugin = "1.8.2" junit = "4.13.2" -ktor = "3.1.3" +ktor = "3.2.1" logback = "1.5.18" serialization = "1.8.1" coroutines = "1.10.2" diff --git a/samples/ktor-android-app/app/build.gradle.kts b/samples/ktor-android-app/app/build.gradle.kts index 69692fe18..90f32397e 100644 --- a/samples/ktor-android-app/app/build.gradle.kts +++ b/samples/ktor-android-app/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + /* * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. */ @@ -47,9 +49,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } buildFeatures { compose = true } @@ -63,6 +62,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + } +} + dependencies { implementation(projects.common) testImplementation(libs.kotlinx.rpc.krpc.client) diff --git a/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/MainActivity.kt b/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/MainActivity.kt index e0756518c..c43408d1b 100644 --- a/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/MainActivity.kt +++ b/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/MainActivity.kt @@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotlinx.rpc.sample.ui.state.WelcomeData import kotlinx.rpc.sample.ui.theme.KtorApplicationTheme - import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue diff --git a/samples/ktor-android-app/common/build.gradle.kts b/samples/ktor-android-app/common/build.gradle.kts index ea6a79c30..3dc12d8c6 100644 --- a/samples/ktor-android-app/common/build.gradle.kts +++ b/samples/ktor-android-app/common/build.gradle.kts @@ -5,7 +5,6 @@ plugins { alias(libs.plugins.kotlinJvm) alias(libs.plugins.kotlinPluginSerialization) - alias(libs.plugins.ktor) alias(libs.plugins.kotlinx.rpc) } @@ -16,4 +15,4 @@ dependencies { implementation(libs.kotlinx.serialization.json) implementation(libs.kotlinx.rpc.krpc.ktor.server) implementation(libs.kotlinx.rpc.krpc.serialization.json) -} \ No newline at end of file +} diff --git a/samples/ktor-android-app/gradle/libs.versions.toml b/samples/ktor-android-app/gradle/libs.versions.toml index 1d76e5a6e..469252019 100644 --- a/samples/ktor-android-app/gradle/libs.versions.toml +++ b/samples/ktor-android-app/gradle/libs.versions.toml @@ -11,7 +11,7 @@ compose-plugin = "1.5.14" # https://mvnrepository.com/artifact/androidx.compose. compose-bom = "2025.06.01" material3 = "1.3.2" junit = "4.13.2" -ktor = "3.2.0" +ktor = "3.2.1" kotlinx-serialization-json = "1.8.1" kotlinx-coroutines-core = "1.10.2" logback = "1.5.18" diff --git a/samples/ktor-web-app/gradle/libs.versions.toml b/samples/ktor-web-app/gradle/libs.versions.toml index 782dc9fdd..b3269be9e 100644 --- a/samples/ktor-web-app/gradle/libs.versions.toml +++ b/samples/ktor-web-app/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.2.0" kotlin-wrappers-bom = "2025.6.11" -ktor = "3.2.0" +ktor = "3.2.1" kotlinx-serialization-json = "1.8.1" kotlinx-coroutines-core = "1.10.2" logback = "1.5.18" diff --git a/samples/simple-ktor-app/build.gradle.kts b/samples/simple-ktor-app/build.gradle.kts index b8c9987e2..fc8fa3192 100644 --- a/samples/simple-ktor-app/build.gradle.kts +++ b/samples/simple-ktor-app/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("jvm") version "2.2.0" kotlin("plugin.serialization") version "2.2.0" - id("io.ktor.plugin") version "3.2.0" + id("io.ktor.plugin") version "3.2.1" id("org.jetbrains.kotlinx.rpc.plugin") version "0.8.0" } diff --git a/versions-root/libs.versions.toml b/versions-root/libs.versions.toml index 0f7f580dd..ebda05bc6 100644 --- a/versions-root/libs.versions.toml +++ b/versions-root/libs.versions.toml @@ -9,7 +9,7 @@ kotlin-compiler = "0.0.0" # default to kotlin-lang or env.KOTLIN_COMPILER_VERSIO # kotlin independent versions detekt-analyzer = "1.23.6" coroutines = "1.10.2" -ktor = "3.2.0" +ktor = "3.2.1" kotlin-logging = "7.0.7" slf4j = "2.0.17" logback = "1.3.14"