Skip to content

[kotlin-server] Bump Kotlin/Gradle versions and improve CI triggers/config #20061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 8 commits into from
Nov 9, 2024
Merged

[kotlin-server] Bump Kotlin/Gradle versions and improve CI triggers/config #20061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf38b55
[kotlin-server] Bump Kotlin versions to latest
Nov 8, 2024
1ade0b3
Run tests on more samples
Nov 8, 2024
efaec2d
Fix typo in workflow definitions
Nov 8, 2024
c3286ad
Update samples
Nov 8, 2024
894ff1f
Bump Gradle to 7.6.4
Nov 8, 2024
d2725f6
Some further tweaks
Nov 8, 2024
5fcb7e5
Bump Gradle versions
Nov 8, 2024
51e9459
Fix Gradle version syntax
Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions .github/workflows/samples-kotlin-server-jdk17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,28 @@ name: Samples Kotlin server (jdk17)

on:
push:
branches:
paths:
- 'samples/server/petstore/kotlin-springboot-3*/**'
- 'samples/server/petstore/kotlin-server/javalin/**'
- 'samples/server/petstore/kotlin-server/javalin-6/**'
- 'samples/server/petstore/kotlin-server/**'
- 'samples/server/petstore/kotlin-server-modelMutable/**'
- 'samples/server/petstore/kotlin-springboot-*/**'
# comment out due to gradle build failure
# - samples/server/petstore/kotlin-spring-default/**
pull_request:
paths:
- 'samples/server/petstore/kotlin-springboot-3*/**'
- 'samples/server/petstore/kotlin-server/javalin/**'
- 'samples/server/petstore/kotlin-server/javalin-6/**'
- 'samples/server/petstore/kotlin-server/**'
- 'samples/server/petstore/kotlin-server-modelMutable/**'
- 'samples/server/petstore/kotlin-springboot-*/**'
# comment out due to gradle build failure
# - samples/server/petstore/kotlin-spring-default/**

env:
GRADLE_VERSION: 7.4
GRADLE_VERSION: '8.10'
Copy link
Member

@wing328 wing328 Nov 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi. 7.x is still supported (Critical Bug and Security Fixes): https://endoflife.date/gradle

i'm ok to move forward with 8.x. let's see if our users cannot migrate to 7.x for any reason.


jobs:
build:
name: Build Kotlin server
name: Build Kotlin server (jdk17)
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -31,8 +33,11 @@ jobs:
- samples/server/petstore/kotlin-springboot-3
- samples/server/petstore/kotlin-springboot-delegate-nodefaults
- samples/server/petstore/kotlin-springboot-request-cookie
- samples/server/petstore/kotlin-server/jaxrs-spec
- samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
- samples/server/petstore/kotlin-server/javalin
- samples/server/petstore/kotlin-server/javalin-6
- samples/server/petstore/kotlin-server/ktor
# comment out due to gradle build failure
# - samples/server/petstore/kotlin-spring-default/
steps:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/samples-kotlin-server-jdk21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@ name: Samples Kotlin server (jdk21)

on:
push:
branches:
- 'samples/server/petstore/kotlin-server/javalin-6/**'
paths:
- 'samples/server/petstore/kotlin-server/**'
pull_request:
paths:
- 'samples/server/petstore/kotlin-server/javalin-6/**'
- 'samples/server/petstore/kotlin-server/**'

env:
GRADLE_VERSION: 8.8
GRADLE_VERSION: '8.10'

jobs:
build:
name: Build Kotlin server
name: Build Kotlin server (jdk21)
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
sample:
- samples/server/petstore/kotlin-server/javalin-6
- samples/server/petstore/kotlin-server/ktor
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/samples-kotlin-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Samples Kotlin server
name: Samples Kotlin server (jdk8)

on:
push:
branches:
paths:
- samples/server/others/kotlin-server/jaxrs-spec/**
- 'samples/server/petstore/kotlin*/**'
- 'samples/server/others/kotlin-server/jaxrs-spec-array-response/**'
Expand All @@ -21,7 +21,7 @@ env:

jobs:
build:
name: Build Kotlin server
name: Build Kotlin server (jdk8)
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion ...i-generator/src/main/resources/kotlin-server/libraries/javalin5/build.gradle.kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.9.21"
kotlin("jvm") version "1.9.25"
}

group = "{{groupId}}"
Expand Down
2 changes: 1 addition & 1 deletion ...i-generator/src/main/resources/kotlin-server/libraries/javalin6/build.gradle.kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "2.0.0"
kotlin("jvm") version "2.0.21"
}

group = "{{groupId}}"
Expand Down
2 changes: 1 addition & 1 deletion ...rator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tasks.bootJar {

{{/interfaceOnly}}
plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion ...-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tasks.bootJar {

{{/interfaceOnly}}
plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion ...ator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion ...generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-server/javalin-6/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "2.0.0"
kotlin("jvm") version "2.0.21"
}

group = "org.openapitools"
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-server/javalin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.9.21"
kotlin("jvm") version "1.9.25"
}

group = "org.openapitools"
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-spring-cloud/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-spring-default/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-bigdecimal-default/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks.bootJar {
}

plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-multipart-request-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks.bootJar {
}

plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/kotlin-springboot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks.withType<KotlinCompile> {
}

plugins {
val kotlinVersion = "1.6.21"
val kotlinVersion = "1.9.25"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
Expand Down