From 688dfac0438cce54e6bddfa134dcc8ab13ba2ec4 Mon Sep 17 00:00:00 2001 From: luisvt Date: Fri, 27 Feb 2026 09:53:08 -0500 Subject: [PATCH 1/4] [REQ] Upgrade ktor to 3.4.0 --- .../libraries/ktor/build.gradle.kts.mustache | 9 ++++----- .../kotlin-server/libraries/ktor/gradle.properties | 4 ++-- .../petstore/kotlin-server-modelMutable/build.gradle.kts | 9 ++++----- .../kotlin-server-modelMutable/gradle.properties | 4 ++-- .../server/petstore/kotlin-server/ktor/build.gradle.kts | 9 ++++----- .../server/petstore/kotlin-server/ktor/gradle.properties | 4 ++-- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache index 1fa61c071eaf..44a4475669e4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache @@ -6,13 +6,13 @@ group = "{{groupId}}" version = "{{artifactVersion}}" plugins { - kotlin("jvm") version "2.0.20" - application - kotlin("plugin.serialization") version "2.0.20" + kotlin("jvm") version "2.3.0" + id("io.ktor.plugin") version "3.4.0" + kotlin("plugin.serialization") version "2.3.0" } application { - mainClass.set("io.ktor.server.netty.EngineMain") + mainClass = "io.ktor.server.netty.EngineMain" val isDevelopment: Boolean = project.ext.has("development") applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") @@ -23,7 +23,6 @@ repositories { } dependencies { - implementation(platform("io.ktor:ktor-bom:3.0.2")) implementation("ch.qos.logback:logback-classic:$logback_version") {{#hasAuthMethods}} implementation("com.typesafe:config:1.4.1") diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties index 36dd5c928837..46c974d67a63 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties +++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official -ktor_version=3.0.2 -kotlin_version=2.0.20 +ktor_version=3.4.0 +kotlin_version=2.3.0 logback_version=1.5.19 diff --git a/samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts b/samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts index 1e91d49feaf6..2cd09d7a899b 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts +++ b/samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts @@ -6,13 +6,13 @@ group = "org.openapitools" version = "1.0.0" plugins { - kotlin("jvm") version "2.0.20" - application - kotlin("plugin.serialization") version "2.0.20" + kotlin("jvm") version "2.3.0" + id("io.ktor.plugin") version "3.4.0" + kotlin("plugin.serialization") version "2.3.0" } application { - mainClass.set("io.ktor.server.netty.EngineMain") + mainClass = "io.ktor.server.netty.EngineMain" val isDevelopment: Boolean = project.ext.has("development") applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") @@ -23,7 +23,6 @@ repositories { } dependencies { - implementation(platform("io.ktor:ktor-bom:3.0.2")) implementation("ch.qos.logback:logback-classic:$logback_version") implementation("com.typesafe:config:1.4.1") implementation("io.ktor:ktor-server-auth") diff --git a/samples/server/petstore/kotlin-server-modelMutable/gradle.properties b/samples/server/petstore/kotlin-server-modelMutable/gradle.properties index 36dd5c928837..46c974d67a63 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/gradle.properties +++ b/samples/server/petstore/kotlin-server-modelMutable/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official -ktor_version=3.0.2 -kotlin_version=2.0.20 +ktor_version=3.4.0 +kotlin_version=2.3.0 logback_version=1.5.19 diff --git a/samples/server/petstore/kotlin-server/ktor/build.gradle.kts b/samples/server/petstore/kotlin-server/ktor/build.gradle.kts index 1e91d49feaf6..2cd09d7a899b 100644 --- a/samples/server/petstore/kotlin-server/ktor/build.gradle.kts +++ b/samples/server/petstore/kotlin-server/ktor/build.gradle.kts @@ -6,13 +6,13 @@ group = "org.openapitools" version = "1.0.0" plugins { - kotlin("jvm") version "2.0.20" - application - kotlin("plugin.serialization") version "2.0.20" + kotlin("jvm") version "2.3.0" + id("io.ktor.plugin") version "3.4.0" + kotlin("plugin.serialization") version "2.3.0" } application { - mainClass.set("io.ktor.server.netty.EngineMain") + mainClass = "io.ktor.server.netty.EngineMain" val isDevelopment: Boolean = project.ext.has("development") applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") @@ -23,7 +23,6 @@ repositories { } dependencies { - implementation(platform("io.ktor:ktor-bom:3.0.2")) implementation("ch.qos.logback:logback-classic:$logback_version") implementation("com.typesafe:config:1.4.1") implementation("io.ktor:ktor-server-auth") diff --git a/samples/server/petstore/kotlin-server/ktor/gradle.properties b/samples/server/petstore/kotlin-server/ktor/gradle.properties index 36dd5c928837..46c974d67a63 100644 --- a/samples/server/petstore/kotlin-server/ktor/gradle.properties +++ b/samples/server/petstore/kotlin-server/ktor/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official -ktor_version=3.0.2 -kotlin_version=2.0.20 +ktor_version=3.4.0 +kotlin_version=2.3.0 logback_version=1.5.19 From 8a61cfe7c46bb4bde4fb59acf67b38d15eac1e46 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 7 Mar 2026 22:25:33 +0800 Subject: [PATCH 2/4] use gradle 8.11 --- .github/workflows/samples-kotlin-server-jdk17.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/samples-kotlin-server-jdk17.yaml b/.github/workflows/samples-kotlin-server-jdk17.yaml index 5b1fda8d6daa..f2104bacde6a 100644 --- a/.github/workflows/samples-kotlin-server-jdk17.yaml +++ b/.github/workflows/samples-kotlin-server-jdk17.yaml @@ -27,7 +27,7 @@ on: # - samples/server/petstore/kotlin-spring-default/** env: - GRADLE_VERSION: '8.10' + GRADLE_VERSION: '8.11' jobs: build: From ffaf8a26a0e91c6bbe1d3ad8cccba06b9ed8c027 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 7 Mar 2026 22:32:05 +0800 Subject: [PATCH 3/4] use gradle 8.11 --- .github/workflows/samples-kotlin-server-jdk21.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/samples-kotlin-server-jdk21.yaml b/.github/workflows/samples-kotlin-server-jdk21.yaml index 8d70d007e658..43e96e60f9af 100644 --- a/.github/workflows/samples-kotlin-server-jdk21.yaml +++ b/.github/workflows/samples-kotlin-server-jdk21.yaml @@ -13,7 +13,7 @@ on: - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**' env: - GRADLE_VERSION: '8.10' + GRADLE_VERSION: '8.11' jobs: build: From 69577c6fe3c1e2aeda06ec958e490c71ae7cf169 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 7 Mar 2026 23:20:01 +0800 Subject: [PATCH 4/4] rearrange --- .github/workflows/samples-kotlin-server-jdk17.yaml | 1 + .github/workflows/samples-kotlin-server.yaml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/samples-kotlin-server-jdk17.yaml b/.github/workflows/samples-kotlin-server-jdk17.yaml index f2104bacde6a..b461b2cf8a69 100644 --- a/.github/workflows/samples-kotlin-server-jdk17.yaml +++ b/.github/workflows/samples-kotlin-server-jdk17.yaml @@ -54,6 +54,7 @@ jobs: - samples/server/petstore/kotlin-server/javalin-6 - samples/server/petstore/kotlin-server/ktor - samples/server/petstore/kotlin-server/ktor2 + - samples/server/petstore/kotlin-server-modelMutable - samples/server/petstore/kotlin-misk - samples/server/petstore/kotlin-spring-declarative-interface - samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml index 509f087e2856..aa5349199a92 100644 --- a/.github/workflows/samples-kotlin-server.yaml +++ b/.github/workflows/samples-kotlin-server.yaml @@ -42,11 +42,9 @@ jobs: - samples/server/petstore/kotlin-springboot-springfox - samples/server/petstore/kotlin-springboot-x-kotlin-implements - samples/server/petstore/kotlin-springboot-include-http-request-context-delegate - - samples/server/petstore/kotlin-server/ktor - samples/server/petstore/kotlin-server/ktor2 - samples/server/petstore/kotlin-server/jaxrs-spec - samples/server/petstore/kotlin-server/jaxrs-spec-mutiny - - samples/server/petstore/kotlin-server-modelMutable - samples/server/petstore/kotlin-server/javalin - samples/server/others/kotlin-server/jaxrs-spec - samples/server/others/kotlin-server/jaxrs-spec-array-response