Skip to content

Commit f151c46

Browse files
wing328luisvt
andauthored
Upgrade ktor to 3.4.0, kotlin to 2.3.0 (#23164)
* [REQ] Upgrade ktor to 3.4.0 * use gradle 8.11 * use gradle 8.11 * rearrange --------- Co-authored-by: luisvt <luisbigvargas@gmail.com>
1 parent c0a7652 commit f151c46

9 files changed

Lines changed: 21 additions & 25 deletions

File tree

.github/workflows/samples-kotlin-server-jdk17.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
# - samples/server/petstore/kotlin-spring-default/**
2828

2929
env:
30-
GRADLE_VERSION: '8.10'
30+
GRADLE_VERSION: '8.11'
3131

3232
jobs:
3333
build:
@@ -54,6 +54,7 @@ jobs:
5454
- samples/server/petstore/kotlin-server/javalin-6
5555
- samples/server/petstore/kotlin-server/ktor
5656
- samples/server/petstore/kotlin-server/ktor2
57+
- samples/server/petstore/kotlin-server-modelMutable
5758
- samples/server/petstore/kotlin-misk
5859
- samples/server/petstore/kotlin-spring-declarative-interface
5960
- samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines

.github/workflows/samples-kotlin-server-jdk21.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
1414

1515
env:
16-
GRADLE_VERSION: '8.10'
16+
GRADLE_VERSION: '8.11'
1717

1818
jobs:
1919
build:

.github/workflows/samples-kotlin-server.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ jobs:
4242
- samples/server/petstore/kotlin-springboot-springfox
4343
- samples/server/petstore/kotlin-springboot-x-kotlin-implements
4444
- samples/server/petstore/kotlin-springboot-include-http-request-context-delegate
45-
- samples/server/petstore/kotlin-server/ktor
4645
- samples/server/petstore/kotlin-server/ktor2
4746
- samples/server/petstore/kotlin-server/jaxrs-spec
4847
- samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
49-
- samples/server/petstore/kotlin-server-modelMutable
5048
- samples/server/petstore/kotlin-server/javalin
5149
- samples/server/others/kotlin-server/jaxrs-spec
5250
- samples/server/others/kotlin-server/jaxrs-spec-array-response

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ group = "{{groupId}}"
66
version = "{{artifactVersion}}"
77

88
plugins {
9-
kotlin("jvm") version "2.0.20"
10-
application
11-
kotlin("plugin.serialization") version "2.0.20"
9+
kotlin("jvm") version "2.3.0"
10+
id("io.ktor.plugin") version "3.4.0"
11+
kotlin("plugin.serialization") version "2.3.0"
1212
}
1313

1414
application {
15-
mainClass.set("io.ktor.server.netty.EngineMain")
15+
mainClass = "io.ktor.server.netty.EngineMain"
1616
1717
val isDevelopment: Boolean = project.ext.has("development")
1818
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
@@ -23,7 +23,6 @@ repositories {
2323
}
2424

2525
dependencies {
26-
implementation(platform("io.ktor:ktor-bom:3.0.2"))
2726
implementation("ch.qos.logback:logback-classic:$logback_version")
2827
{{#hasAuthMethods}}
2928
implementation("com.typesafe:config:1.4.1")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
2-
ktor_version=3.0.2
3-
kotlin_version=2.0.20
2+
ktor_version=3.4.0
3+
kotlin_version=2.3.0
44
logback_version=1.5.19

samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ group = "org.openapitools"
66
version = "1.0.0"
77

88
plugins {
9-
kotlin("jvm") version "2.0.20"
10-
application
11-
kotlin("plugin.serialization") version "2.0.20"
9+
kotlin("jvm") version "2.3.0"
10+
id("io.ktor.plugin") version "3.4.0"
11+
kotlin("plugin.serialization") version "2.3.0"
1212
}
1313

1414
application {
15-
mainClass.set("io.ktor.server.netty.EngineMain")
15+
mainClass = "io.ktor.server.netty.EngineMain"
1616

1717
val isDevelopment: Boolean = project.ext.has("development")
1818
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
@@ -23,7 +23,6 @@ repositories {
2323
}
2424

2525
dependencies {
26-
implementation(platform("io.ktor:ktor-bom:3.0.2"))
2726
implementation("ch.qos.logback:logback-classic:$logback_version")
2827
implementation("com.typesafe:config:1.4.1")
2928
implementation("io.ktor:ktor-server-auth")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
2-
ktor_version=3.0.2
3-
kotlin_version=2.0.20
2+
ktor_version=3.4.0
3+
kotlin_version=2.3.0
44
logback_version=1.5.19

samples/server/petstore/kotlin-server/ktor/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ group = "org.openapitools"
66
version = "1.0.0"
77

88
plugins {
9-
kotlin("jvm") version "2.0.20"
10-
application
11-
kotlin("plugin.serialization") version "2.0.20"
9+
kotlin("jvm") version "2.3.0"
10+
id("io.ktor.plugin") version "3.4.0"
11+
kotlin("plugin.serialization") version "2.3.0"
1212
}
1313

1414
application {
15-
mainClass.set("io.ktor.server.netty.EngineMain")
15+
mainClass = "io.ktor.server.netty.EngineMain"
1616

1717
val isDevelopment: Boolean = project.ext.has("development")
1818
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
@@ -23,7 +23,6 @@ repositories {
2323
}
2424

2525
dependencies {
26-
implementation(platform("io.ktor:ktor-bom:3.0.2"))
2726
implementation("ch.qos.logback:logback-classic:$logback_version")
2827
implementation("com.typesafe:config:1.4.1")
2928
implementation("io.ktor:ktor-server-auth")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
2-
ktor_version=3.0.2
3-
kotlin_version=2.0.20
2+
ktor_version=3.4.0
3+
kotlin_version=2.3.0
44
logback_version=1.5.19

0 commit comments

Comments
 (0)