Skip to content

Commit 15d307f

Browse files
committed
fix(kotlin-spring): update Gradle templates to Kotlin 2.2 JvmTarget DSL and bump CI Gradle
- Replace deprecated kotlinOptions.jvmTarget with kotlin.compilerOptions DSL - Upgrade Gradle wrapper to 8.14 for Kotlin 2.2 compatibility - Add kotlin-springboot-4 sample to JDK17 CI matrix - Regenerate sample with updated templates
1 parent fef058a commit 15d307f

9 files changed

Lines changed: 24 additions & 19 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.14'
3131

3232
jobs:
3333
build:
@@ -48,6 +48,7 @@ jobs:
4848
- samples/server/petstore/kotlin-springboot-additionalproperties
4949
- samples/server/petstore/kotlin-springboot-delegate-nodefaults
5050
- samples/server/petstore/kotlin-springboot-request-cookie
51+
- samples/server/petstore/kotlin-springboot-4
5152
- samples/server/petstore/kotlin-server/jaxrs-spec
5253
- samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
5354
- samples/server/petstore/kotlin-server/javalin

.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.14'
1717

1818
jobs:
1919
build:

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb4-Kts.mustache

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
group = "{{groupId}}"
44
version = "{{artifactVersion}}"
@@ -8,8 +8,10 @@ repositories {
88
mavenCentral()
99
}
1010

11-
tasks.withType<KotlinCompile> {
12-
kotlinOptions.jvmTarget = "17"
11+
kotlin {
12+
compilerOptions {
13+
jvmTarget.set(JvmTarget.JVM_17)
14+
}
1315
}
1416

1517
{{#interfaceOnly}}

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb4-Kts.mustache

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
group = "{{groupId}}"
44
version = "{{artifactVersion}}"
@@ -8,8 +8,10 @@ repositories {
88
mavenCentral()
99
}
1010

11-
tasks.withType<KotlinCompile> {
12-
kotlinOptions.jvmTarget = "17"
11+
kotlin {
12+
compilerOptions {
13+
jvmTarget.set(JvmTarget.JVM_17)
14+
}
1315
}
1416

1517
plugins {

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb4-Kts.mustache

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
group = "{{groupId}}"
44
version = "{{artifactVersion}}"
@@ -8,8 +8,10 @@ repositories {
88
mavenCentral()
99
}
1010

11-
tasks.withType<KotlinCompile> {
12-
kotlinOptions.jvmTarget = "17"
11+
kotlin {
12+
compilerOptions {
13+
jvmTarget.set(JvmTarget.JVM_17)
14+
}
1315
}
1416

1517
plugins {

samples/server/petstore/kotlin-springboot-4/.openapi-generator/FILES

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.openapi-generator-ignore
21
README.md
32
build.gradle.kts
43
gradle/wrapper/gradle-wrapper.jar
@@ -26,6 +25,3 @@ src/main/kotlin/org/openapitools/model/Pet.kt
2625
src/main/kotlin/org/openapitools/model/Tag.kt
2726
src/main/kotlin/org/openapitools/model/User.kt
2827
src/main/resources/application.yaml
29-
src/test/kotlin/org/openapitools/api/PetApiTest.kt
30-
src/test/kotlin/org/openapitools/api/StoreApiTest.kt
31-
src/test/kotlin/org/openapitools/api/UserApiTest.kt

samples/server/petstore/kotlin-springboot-4/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
group = "org.openapitools"
44
version = "1.0.0"
@@ -8,8 +8,10 @@ repositories {
88
mavenCentral()
99
}
1010

11-
tasks.withType<KotlinCompile> {
12-
kotlinOptions.jvmTarget = "17"
11+
kotlin {
12+
compilerOptions {
13+
jvmTarget.set(JvmTarget.JVM_17)
14+
}
1315
}
1416

1517
plugins {

samples/server/petstore/kotlin-springboot-4/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

samples/server/petstore/kotlin-springboot-4/gradlew

100644100755
File mode changed.

0 commit comments

Comments
 (0)