Skip to content

Commit e2258fb

Browse files
[kotlin-spring] Fix gradle build failure when generated with interfaceOnly=true (#18809)
* Fix kotlin-spring not building when `interfaceOnly=true` Fixes #18803 * Regenerate fixed kotlin-spring samples * Include sample kotlin-springboot-request-cookie in CI build check * Apply suggestions from code review Co-authored-by: Stefan Koppier <[email protected]> --------- Co-authored-by: Stefan Koppier <[email protected]>
1 parent 66126a8 commit e2258fb

File tree

5 files changed

+21
-0
lines changed

5 files changed

+21
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
# server
2929
- samples/server/petstore/kotlin-springboot-3
3030
- samples/server/petstore/kotlin-springboot-request
31+
- samples/server/petstore/kotlin-springboot-request-cookie
3132
- samples/server/petstore/kotlin-server/javalin
3233
# comment out due to gradle build failure
3334
# - samples/server/petstore/kotlin-spring-default/

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ tasks.withType<KotlinCompile> {
1313
kotlinOptions.jvmTarget = "17"
1414
}
1515

16+
{{#interfaceOnly}}
17+
tasks.bootJar {
18+
enabled = false
19+
}
20+
21+
{{/interfaceOnly}}
1622
plugins {
1723
val kotlinVersion = "1.7.10"
1824
id("org.jetbrains.kotlin.jvm") version kotlinVersion

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ tasks.withType<KotlinCompile> {
2020
kotlinOptions.jvmTarget = "1.8"
2121
}
2222

23+
{{#interfaceOnly}}
24+
tasks.bootJar {
25+
enabled = false
26+
}
27+
28+
{{/interfaceOnly}}
2329
plugins {
2430
val kotlinVersion = "1.6.21"
2531
id("org.jetbrains.kotlin.jvm") version kotlinVersion

samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ tasks.withType<KotlinCompile> {
1313
kotlinOptions.jvmTarget = "17"
1414
}
1515

16+
tasks.bootJar {
17+
enabled = false
18+
}
19+
1620
plugins {
1721
val kotlinVersion = "1.7.10"
1822
id("org.jetbrains.kotlin.jvm") version kotlinVersion

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ tasks.withType<KotlinCompile> {
1313
kotlinOptions.jvmTarget = "17"
1414
}
1515

16+
tasks.bootJar {
17+
enabled = false
18+
}
19+
1620
plugins {
1721
val kotlinVersion = "1.7.10"
1822
id("org.jetbrains.kotlin.jvm") version kotlinVersion

0 commit comments

Comments
 (0)