feat: jdk 25 (#1020)

Author: csikb

.github/workflows/gradle.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: "liberica"
-          java-version: 21
+          java-version: 25
       - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.2-librca
+java=25-librca

Dockerfile

@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-runtime-container:jdk-21.0.9_12-crac-cds-musl@sha256:7ee4a57e7a0da0ac1e49ed40950e9bdf91e20eb82abeabdf997583b2ff4ce031 AS build
+FROM bellsoft/liberica-runtime-container:jdk-25.0.1_11-cds-musl@sha256:a2dbf6d09e07023b120ffdb2d17763b173a4131bb604aa93541dccc4819fdd30 AS build
 WORKDIR /usr/src/app
 # cache dependencies
 COPY ./buildSrc/*.gradle.kts             ./buildSrc/

buildSrc/build.gradle.kts

@@ -10,12 +10,12 @@ dependencies {
     implementation(libs.plugin.springBoot)
     implementation(libs.plugin.spotless)
     implementation(libs.plugin.detekt)
-    implementation(kotlin("allopen", "2.3.0"))
-    implementation(kotlin("gradle-plugin", "2.3.0"))
+    implementation(libs.kotlin.allopen)
+    implementation(libs.kotlin.gradle.plugin)
     // required for kotlin plugin jpa
-    implementation(kotlin("reflect", "2.3.0"))
-    implementation(kotlin("stdlib-jdk8", "2.3.0"))
-    implementation(kotlin("noarg", "2.3.0"))
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kotlin.stdlib.jdk8)
+    implementation(libs.kotlin.noarg)
 }
 
 gradlePlugin {

buildSrc/src/main/kotlin/hu/bsstudio/gradle/DetektConventionPlugin.kt

@@ -1,7 +1,7 @@
 package hu.bsstudio.gradle
 
-import io.gitlab.arturbosch.detekt.DetektPlugin
-import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import dev.detekt.gradle.extensions.DetektExtension
+import dev.detekt.gradle.plugin.DetektPlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
@@ -12,7 +12,6 @@ class DetektConventionPlugin : Plugin<Project> {
         project.pluginManager.apply(DetektPlugin::class)
 
         project.extensions.configure<DetektExtension> {
-            buildUponDefaultConfig = true
             config.setFrom(project.layout.settingsDirectory.file("detekt.yml"))
         }
     }

buildSrc/src/main/kotlin/hu/bsstudio/gradle/JavaConventionPlugin.kt

@@ -15,7 +15,7 @@ class JavaConventionPlugin : Plugin<Project> {
 
         project.extensions.configure(JavaPluginExtension::class) {
             toolchain {
-                languageVersion.set(JavaLanguageVersion.of(21))
+                languageVersion.set(JavaLanguageVersion.of(25))
             }
         }
 

buildSrc/src/main/kotlin/hu/bsstudio/gradle/JavaLibraryConventionPlugin.kt

@@ -15,7 +15,7 @@ class JavaLibraryConventionPlugin : Plugin<Project> {
 
         project.extensions.configure(JavaPluginExtension::class) {
             toolchain {
-                languageVersion.set(JavaLanguageVersion.of(21))
+                languageVersion.set(JavaLanguageVersion.of(25))
             }
         }
 

buildSrc/src/main/kotlin/hu/bsstudio/gradle/KotlinConventionPlugin.kt

@@ -16,7 +16,7 @@ class KotlinConventionPlugin : Plugin<Project> {
                 freeCompilerArgs = listOf("-Xjsr305=strict")
                 extraWarnings = true
                 allWarningsAsErrors = true
-                jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21
+                jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_25
             }
         }
     }

gradle/libs.versions.toml

@@ -3,12 +3,18 @@ springdoc = "3.0.1"
 springBoot = "4.0.2"
 kotest = "6.1.1"
 spotless = "8.2.0"
-detekt = "1.23.8"
+detekt = "2.0.0-alpha.2"
+kotlin = "2.3.0"
 
 [libraries]
 springdoc = { module = "org.springdoc:springdoc-openapi-starter-webflux-ui", version.ref = "springdoc" }
 kotestAssertionsJson = { module = "io.kotest:kotest-assertions-json", version.ref = "kotest" }
 
 plugin-springBoot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "springBoot" }
 plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
-plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+plugin-detekt = { module = "dev.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+kotlin-allopen = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-noarg = { module = "org.jetbrains.kotlin:kotlin-noarg", version.ref = "kotlin" }