Skip to content

Commit bc90d56

Browse files
authored
Update Ktor to 3.2.1 and samples (#383)
1 parent a006536 commit bc90d56

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ androidx-test-junit = "1.2.1"
1515
compose = "1.8.3"
1616
compose-plugin = "1.8.2"
1717
junit = "4.13.2"
18-
ktor = "3.1.3"
18+
ktor = "3.2.1"
1919
logback = "1.5.18"
2020
serialization = "1.8.1"
2121
coroutines = "1.10.2"

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
/*
24
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
35
*/
@@ -47,9 +49,6 @@ android {
4749
sourceCompatibility = JavaVersion.VERSION_17
4850
targetCompatibility = JavaVersion.VERSION_17
4951
}
50-
kotlinOptions {
51-
jvmTarget = "17"
52-
}
5352
buildFeatures {
5453
compose = true
5554
}
@@ -63,6 +62,12 @@ android {
6362
}
6463
}
6564

65+
kotlin {
66+
compilerOptions {
67+
jvmTarget = JvmTarget.JVM_17
68+
}
69+
}
70+
6671
dependencies {
6772
implementation(projects.common)
6873
testImplementation(libs.kotlinx.rpc.krpc.client)

samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.unit.dp
2323
import kotlinx.rpc.sample.ui.state.WelcomeData
2424
import kotlinx.rpc.sample.ui.theme.KtorApplicationTheme
25-
2625
import androidx.compose.runtime.collectAsState
2726
import androidx.compose.runtime.getValue
2827

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

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

@@ -16,4 +15,4 @@ dependencies {
1615
implementation(libs.kotlinx.serialization.json)
1716
implementation(libs.kotlinx.rpc.krpc.ktor.server)
1817
implementation(libs.kotlinx.rpc.krpc.serialization.json)
19-
}
18+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ compose-plugin = "1.5.14" # https://mvnrepository.com/artifact/androidx.compose.
1111
compose-bom = "2025.06.01"
1212
material3 = "1.3.2"
1313
junit = "4.13.2"
14-
ktor = "3.2.0"
14+
ktor = "3.2.1"
1515
kotlinx-serialization-json = "1.8.1"
1616
kotlinx-coroutines-core = "1.10.2"
1717
logback = "1.5.18"

samples/ktor-web-app/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "2.2.0"
33
kotlin-wrappers-bom = "2025.6.11"
4-
ktor = "3.2.0"
4+
ktor = "3.2.1"
55
kotlinx-serialization-json = "1.8.1"
66
kotlinx-coroutines-core = "1.10.2"
77
logback = "1.5.18"

samples/simple-ktor-app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
plugins {
66
kotlin("jvm") version "2.2.0"
77
kotlin("plugin.serialization") version "2.2.0"
8-
id("io.ktor.plugin") version "3.2.0"
8+
id("io.ktor.plugin") version "3.2.1"
99
id("org.jetbrains.kotlinx.rpc.plugin") version "0.8.0"
1010
}
1111

versions-root/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ kotlin-compiler = "0.0.0" # default to kotlin-lang or env.KOTLIN_COMPILER_VERSIO
99
# kotlin independent versions
1010
detekt-analyzer = "1.23.6"
1111
coroutines = "1.10.2"
12-
ktor = "3.2.0"
12+
ktor = "3.2.1"
1313
kotlin-logging = "7.0.7"
1414
slf4j = "2.0.17"
1515
logback = "1.3.14"

0 commit comments

Comments
 (0)