Skip to content

Commit a7a8639

Browse files
[kotlin-server] Bump Kotlin/Gradle versions and improve CI triggers/config (#20061)
* [kotlin-server] Bump Kotlin versions to latest * Run tests on more samples * Fix typo in workflow definitions * Update samples * Bump Gradle to 7.6.4 * Some further tweaks * Bump Gradle versions * Fix Gradle version syntax
1 parent 7bce639 commit a7a8639

File tree

26 files changed

+44
-38
lines changed

26 files changed

+44
-38
lines changed

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,28 @@ name: Samples Kotlin server (jdk17)
22

33
on:
44
push:
5-
branches:
5+
paths:
66
- 'samples/server/petstore/kotlin-springboot-3*/**'
7-
- 'samples/server/petstore/kotlin-server/javalin/**'
8-
- 'samples/server/petstore/kotlin-server/javalin-6/**'
7+
- 'samples/server/petstore/kotlin-server/**'
8+
- 'samples/server/petstore/kotlin-server-modelMutable/**'
9+
- 'samples/server/petstore/kotlin-springboot-*/**'
910
# comment out due to gradle build failure
1011
# - samples/server/petstore/kotlin-spring-default/**
1112
pull_request:
1213
paths:
1314
- 'samples/server/petstore/kotlin-springboot-3*/**'
14-
- 'samples/server/petstore/kotlin-server/javalin/**'
15-
- 'samples/server/petstore/kotlin-server/javalin-6/**'
15+
- 'samples/server/petstore/kotlin-server/**'
16+
- 'samples/server/petstore/kotlin-server-modelMutable/**'
17+
- 'samples/server/petstore/kotlin-springboot-*/**'
1618
# comment out due to gradle build failure
1719
# - samples/server/petstore/kotlin-spring-default/**
1820

1921
env:
20-
GRADLE_VERSION: 7.4
22+
GRADLE_VERSION: '8.10'
2123

2224
jobs:
2325
build:
24-
name: Build Kotlin server
26+
name: Build Kotlin server (jdk17)
2527
runs-on: ubuntu-latest
2628
strategy:
2729
fail-fast: false
@@ -31,8 +33,11 @@ jobs:
3133
- samples/server/petstore/kotlin-springboot-3
3234
- samples/server/petstore/kotlin-springboot-delegate-nodefaults
3335
- samples/server/petstore/kotlin-springboot-request-cookie
36+
- samples/server/petstore/kotlin-server/jaxrs-spec
37+
- samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
3438
- samples/server/petstore/kotlin-server/javalin
3539
- samples/server/petstore/kotlin-server/javalin-6
40+
- samples/server/petstore/kotlin-server/ktor
3641
# comment out due to gradle build failure
3742
# - samples/server/petstore/kotlin-spring-default/
3843
steps:

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ name: Samples Kotlin server (jdk21)
22

33
on:
44
push:
5-
branches:
6-
- 'samples/server/petstore/kotlin-server/javalin-6/**'
5+
paths:
6+
- 'samples/server/petstore/kotlin-server/**'
77
pull_request:
88
paths:
9-
- 'samples/server/petstore/kotlin-server/javalin-6/**'
9+
- 'samples/server/petstore/kotlin-server/**'
1010

1111
env:
12-
GRADLE_VERSION: 8.8
12+
GRADLE_VERSION: '8.10'
1313

1414
jobs:
1515
build:
16-
name: Build Kotlin server
16+
name: Build Kotlin server (jdk21)
1717
runs-on: ubuntu-latest
1818
strategy:
1919
fail-fast: false
2020
matrix:
2121
sample:
2222
- samples/server/petstore/kotlin-server/javalin-6
23+
- samples/server/petstore/kotlin-server/ktor
2324
steps:
2425
- uses: actions/checkout@v4
2526
- uses: actions/setup-java@v4

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Samples Kotlin server
1+
name: Samples Kotlin server (jdk8)
22

33
on:
44
push:
5-
branches:
5+
paths:
66
- samples/server/others/kotlin-server/jaxrs-spec/**
77
- 'samples/server/petstore/kotlin*/**'
88
- 'samples/server/others/kotlin-server/jaxrs-spec-array-response/**'
@@ -21,7 +21,7 @@ env:
2121

2222
jobs:
2323
build:
24-
name: Build Kotlin server
24+
name: Build Kotlin server (jdk8)
2525
runs-on: ubuntu-latest
2626
strategy:
2727
fail-fast: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.9.21"
4+
kotlin("jvm") version "1.9.25"
55
}
66

77
group = "{{groupId}}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "2.0.0"
2+
kotlin("jvm") version "2.0.21"
33
}
44

55
group = "{{groupId}}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tasks.bootJar {
2020

2121
{{/interfaceOnly}}
2222
plugins {
23-
val kotlinVersion = "1.7.10"
23+
val kotlinVersion = "1.9.25"
2424
id("org.jetbrains.kotlin.jvm") version kotlinVersion
2525
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
2626
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tasks.bootJar {
2727

2828
{{/interfaceOnly}}
2929
plugins {
30-
val kotlinVersion = "1.6.21"
30+
val kotlinVersion = "1.9.25"
3131
id("org.jetbrains.kotlin.jvm") version kotlinVersion
3232
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
3333
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tasks.withType<KotlinCompile> {
1414
}
1515

1616
plugins {
17-
val kotlinVersion = "1.7.10"
17+
val kotlinVersion = "1.9.25"
1818
id("org.jetbrains.kotlin.jvm") version kotlinVersion
1919
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
2020
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
2121
}
2222

2323
plugins {
24-
val kotlinVersion = "1.6.21"
24+
val kotlinVersion = "1.9.25"
2525
id("org.jetbrains.kotlin.jvm") version kotlinVersion
2626
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
2727
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion

samples/server/petstore/kotlin-server/javalin-6/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "2.0.0"
2+
kotlin("jvm") version "2.0.21"
33
}
44

55
group = "org.openapitools"

0 commit comments

Comments
 (0)