Skip to content

Commit 892e797

Browse files
authored
KTOR-6351 Bump Ktor to 2.3.5 and Kotlin to 1.9.10 (#180)
1 parent 474311c commit 892e797

Some content is hidden

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

41 files changed

+74
-74
lines changed

chat/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
6+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
77
}
88
}
99

@@ -33,14 +33,14 @@ kotlin {
3333

3434
sourceSets.each {
3535
it.dependencies {
36-
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.4"))
36+
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.5"))
3737
}
3838
}
3939

4040
sourceSets {
4141
backendMain {
4242
dependencies {
43-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20"
43+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
4444
implementation "io.ktor:ktor-server-netty"
4545
implementation "io.ktor:ktor-server-websockets"
4646
implementation "io.ktor:ktor-server-call-logging"

client-mpp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
gradlePluginPortal()
66
}
77
dependencies {
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
8+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
99
classpath("com.android.tools.build:gradle:7.0.4")
1010
}
1111
}

client-mpp/shared/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kotlin {
1919

2020
sourceSets.each {
2121
it.dependencies {
22-
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.4"))
22+
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.5"))
2323
}
2424
}
2525

client-multipart/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
gradlePluginPortal()
55
}
66
dependencies {
7-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
8-
classpath "io.ktor.plugin:plugin:2.3.4"
7+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
8+
classpath "io.ktor.plugin:plugin:2.3.5"
99
}
1010
}
1111

@@ -27,7 +27,7 @@ repositories {
2727
}
2828

2929
dependencies {
30-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20'
30+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10'
3131
implementation "io.ktor:ktor-server-html-builder"
3232
implementation 'ch.qos.logback:logback-classic:1.4.6'
3333
implementation 'io.ktor:ktor-server-netty-jvm'

client-tools/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
gradlePluginPortal()
55
}
66
dependencies {
7-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
8-
classpath "io.ktor.plugin:plugin:2.3.4"
7+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
8+
classpath "io.ktor.plugin:plugin:2.3.5"
99
}
1010
}
1111

@@ -27,7 +27,7 @@ repositories {
2727
}
2828

2929
dependencies {
30-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20'
30+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10'
3131
implementation "io.ktor:ktor-server-html-builder"
3232
implementation 'ch.qos.logback:logback-classic:1.4.6'
3333
implementation 'io.ktor:ktor-server-netty-jvm'

di-kodein/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
7-
kotlin("plugin.serialization") version "1.8.22"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
7+
kotlin("plugin.serialization") version "1.9.10"
88
}
99

1010
application {

di-kodein/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

filelisting/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

filelisting/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

fullstack-mpp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
9+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
1010
}
1111
}
1212

@@ -29,7 +29,7 @@ kotlin {
2929

3030
sourceSets.each {
3131
it.dependencies {
32-
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.4"))
32+
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.5"))
3333
}
3434
}
3535

graalvm/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
application
3-
kotlin("jvm") version "1.7.20"
4-
id("io.ktor.plugin") version "2.3.4"
3+
kotlin("jvm") version "1.9.10"
4+
id("io.ktor.plugin") version "2.3.5"
55
id("org.graalvm.buildtools.native") version "0.9.19"
66
}
77

h2/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ val logback_version: String by project
33

44
plugins {
55
application
6-
kotlin("jvm") version "1.7.20"
7-
id("io.ktor.plugin") version "2.3.4"
6+
kotlin("jvm") version "1.9.10"
7+
id("io.ktor.plugin") version "2.3.5"
88
}
99

1010
group = "io.ktor.samples"

h2/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.7.20
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

httpbin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

httpbin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official
44

jwt-auth-tests/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
kotlin("jvm") version "1.8.22"
3-
kotlin("plugin.serialization") version "1.8.22"
4-
id("io.ktor.plugin") version "2.3.4"
2+
kotlin("jvm") version "1.9.10"
3+
kotlin("plugin.serialization") version "1.9.10"
4+
id("io.ktor.plugin") version "2.3.5"
55
}
66

77
application {

kweet/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ val logback_version: String by project
33
val exposed_version: String by project
44

55
plugins {
6-
kotlin("jvm") version "1.8.22"
7-
id("io.ktor.plugin") version "2.3.4"
8-
kotlin("plugin.serialization") version "1.8.22"
6+
kotlin("jvm") version "1.9.10"
7+
id("io.ktor.plugin") version "2.3.5"
8+
kotlin("plugin.serialization") version "1.9.10"
99
}
1010

1111
application {

kweet/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
exposed_version=0.40.1
44
kotlin.code.style=official

location-header/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

location-header/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

maven-google-appengine-standard/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<artifactId>maven-google-appengine-standard</artifactId>
1212

1313
<properties>
14-
<kotlin.version>1.7.20</kotlin.version>
14+
<kotlin.version>1.9.10</kotlin.version>
1515
<slf4j.version>1.7.36</slf4j.version>
1616
<appengine.version>2.0.12</appengine.version>
1717
<servlet.version>4.0.1</servlet.version>
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>io.ktor</groupId>
3939
<artifactId>ktor-bom</artifactId>
40-
<version>2.3.4</version>
40+
<version>2.3.5</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>

mongodb/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ val logback_version: String by project
33
val mongodb_version: String by project
44

55
plugins {
6-
kotlin("jvm") version "1.8.22"
7-
id("io.ktor.plugin") version "2.3.4"
8-
id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22"
6+
kotlin("jvm") version "1.9.10"
7+
id("io.ktor.plugin") version "2.3.5"
8+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
99
}
1010

1111
group = "com.example"
@@ -32,7 +32,7 @@ dependencies {
3232
implementation("org.litote.kmongo:kmongo:$mongodb_version")
3333
testImplementation("io.ktor:ktor-server-tests-jvm")
3434
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
35-
testImplementation("io.ktor:ktor-server-test-host-jvm:2.3.4")
35+
testImplementation("io.ktor:ktor-server-test-host-jvm:2.3.5")
3636
}
3737

3838
tasks.register("databaseInstance") {

mongodb/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
mongodb_version=4.8.0
44
kotlin.code.style=official

postgres/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
5+
kotlin("jvm") version "1.9.10"
66
id("io.ktor.plugin") version "2.2.3"
7-
id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22"
7+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
88
}
99

1010
group = "com.example"

postgres/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

redirect-with-exception/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

reverse-proxy-ws/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

reverse-proxy-ws/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

reverse-proxy/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

reverse-proxy/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

rx/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

rx/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

sse/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

sse/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

structured-logging/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "1.8.22"
6-
id("io.ktor.plugin") version "2.3.4"
5+
kotlin("jvm") version "1.9.10"
6+
id("io.ktor.plugin") version "2.3.5"
77
}
88

99
application {

structured-logging/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=1.8.22
1+
kotlin_version=1.9.10
22
logback_version=1.2.11
33
kotlin.code.style=official

version-diff/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ val kotlin_version: String by project
44
val logback_version: String by project
55

66
plugins {
7-
kotlin("jvm") version "1.8.22"
8-
id("io.ktor.plugin") version "2.3.4"
9-
kotlin("plugin.serialization") version "1.8.22"
7+
kotlin("jvm") version "1.9.10"
8+
id("io.ktor.plugin") version "2.3.5"
9+
kotlin("plugin.serialization") version "1.9.10"
1010
}
1111

1212
group = "org.example"

0 commit comments

Comments
 (0)