Improve build src

README.md

@@ -10,14 +10,15 @@ individual buildSrc modules. This makes the build very modular and also very cle
 It has the following details:
 
 - Java 17
-- Gradle 8.2.1
+- Gradle 8.4
   - buildSrc
   - Kotlin DSL
   - Version Catalog (libs.versions.toml)
   - Gradle Build Scan enabled in CI (Attention! Terms of Service are accepted by the environment variable `BUILD_SCAN_TOS_ACCEPTED` and the scan enabled by the environment variable `CI`)
-- Kotlin 1.8.10
-- Spring Boot 3.0.3
-- Dokka 1.7.20
+- Kotlin 1.9.20
+- Spring Boot 3.1.5
+- Detekt 1.23.3
+- Dokka 1.9.10
 - Spring Dependency-Management
 
 Additionally, I added a POC how Maven Publishing could work. In another project, I got it to work like this without

buildSrc/build.gradle.kts

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
 plugins {
@@ -12,6 +15,34 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(
+            JavaLanguageVersion.of(libs.findVersion("jdk").get().toString())
+        )
+    }
+    compilerOptions {
+        @Suppress("SpellCheckingInspection")
+        freeCompilerArgs.add("-Xjsr305=strict")
+        allWarningsAsErrors = false
+        jvmTarget.set(JvmTarget.valueOf("JVM_${libs.findVersion("jdk").get()}"))
+        languageVersion.set(
+            KotlinVersion.valueOf(
+                "KOTLIN_${
+                    libs.findVersion("kotlin").get().toString().substringBeforeLast(".").replace(".", "_")
+                }"
+            )
+        )
+        apiVersion.set(
+            KotlinVersion.valueOf(
+                "KOTLIN_${
+                    libs.findVersion("kotlin").get().toString().substringBeforeLast(".").replace(".", "_")
+                }"
+            )
+        )
+    }
+}
+
 dependencies {
     // buildSrc in combination with this plugin ensures that the version set here
     // will be set to the same for all other Kotlin dependencies / plugins in the project.

buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts

@@ -1,7 +1,8 @@
 import de.mrclrchtr.education.gradle.constant.JDK_VERSION
-import de.mrclrchtr.education.gradle.constant.KOTLIN_VERSION
 import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     id("java-conventions")
@@ -13,56 +14,52 @@ plugins {
     id("io.gitlab.arturbosch.detekt")
 }
 
-val embeddedMajorAndMinorKotlinVersion = project.getKotlinPluginVersion().substringBeforeLast(".")
-if (KOTLIN_VERSION != embeddedMajorAndMinorKotlinVersion) {
-    logger.warn(
-        "Constant 'KOTLIN_VERSION' ($KOTLIN_VERSION) differs from embedded Kotlin version in Gradle" +
-            " (${project.getKotlinPluginVersion()})!" +
-            " Constant 'KOTLIN_VERSION' should be ($embeddedMajorAndMinorKotlinVersion)."
-    )
-}
-
-tasks.compileKotlin {
-    logger.lifecycle("Configuring $name with version ${project.getKotlinPluginVersion()} in project ${project.name}")
-    kotlinOptions {
-        @Suppress("SpellCheckingInspection")
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        allWarningsAsErrors = true
-        jvmTarget = JDK_VERSION
-        languageVersion = KOTLIN_VERSION
-        apiVersion = KOTLIN_VERSION
-    }
-}
-
-tasks.compileTestKotlin {
-    logger.lifecycle("Configuring $name with version ${project.getKotlinPluginVersion()} in project ${project.name}")
-    kotlinOptions {
-        @Suppress("SpellCheckingInspection")
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        allWarningsAsErrors = true
-        jvmTarget = JDK_VERSION
-        languageVersion = KOTLIN_VERSION
-        apiVersion = KOTLIN_VERSION
-    }
-}
+// Needs to exist before first usage of 'libs'
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
 kotlin {
     jvmToolchain {
         languageVersion.set(
-            JavaLanguageVersion.of(JDK_VERSION)
+            JavaLanguageVersion.of(libs.findVersion("jdk").get().toString())
+        )
+    }
+    compilerOptions {
+        @Suppress("SpellCheckingInspection")
+        freeCompilerArgs.add("-Xjsr305=strict")
+        allWarningsAsErrors = false
+        jvmTarget.set(JvmTarget.valueOf("JVM_${libs.findVersion("jdk").get()}"))
+        languageVersion.set(
+            KotlinVersion.valueOf(
+                "KOTLIN_${
+                    libs.findVersion("kotlin").get().toString().substringBeforeLast(".").replace(".", "_")
+                }"
+            )
+        )
+        apiVersion.set(
+            KotlinVersion.valueOf(
+                "KOTLIN_${
+                    libs.findVersion("kotlin").get().toString().substringBeforeLast(".").replace(".", "_")
+                }"
+            )
         )
     }
 }
 
 detekt {
     ignoreFailures = false
+
+    // Applies the config files on top of detekt's default config file. `false` by default.
     buildUponDefaultConfig = true
-    config = files("$rootDir/detekt.yml")
+
+    // Define the detekt configuration(s) you want to use.
+    // Defaults to the default detekt configuration.
+    config.setFrom("$rootDir/detekt.yml")
+
+    // Builds the AST in parallel. Rules are always executed in parallel.
+    // Can lead to speedups in larger projects. `false` by default.
     parallel = true
 }
 
-val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-
 dependencies {
     constraints {
         implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
@@ -77,9 +74,22 @@ dependencies {
     add("detektPlugins", libs.findLibrary("detekt-formatting").get())
 }
 
+// Activate Type Resolution
 tasks.withType<Detekt>().configureEach {
-    // Target version of the generated JVM bytecode. It is used for type resolution.
     this.jvmTarget = JDK_VERSION
+    classpath.setFrom(
+        sourceSets.main.get().compileClasspath,
+        sourceSets.test.get().compileClasspath
+    )
+}
+
+// Activate Type Resolution
+tasks.withType<DetektCreateBaselineTask>().configureEach {
+    this.jvmTarget = JDK_VERSION
+    classpath.setFrom(
+        sourceSets.main.get().compileClasspath,
+        sourceSets.test.get().compileClasspath
+    )
 }
 
 afterEvaluate {

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 kotlin-logging = "3.0.5"
 lorem = "2.2"
 j2html = "1.6.0"
+jdk = "17"
 kotlin = "1.9.20"
 kotlinForDetekt = "1.9.10"
 springBoot = "3.1.5"

message-dashboard/src/main/kotlin/de/mrclrchtr/education/message/dashboard/MessageClient.kt

@@ -16,7 +16,7 @@ class MessageClient(
     @Value("\${mrclrchtr.message.factory.port}") val port: Int,
 ) {
 
-    private final var uriComponentsBuilder = UriComponentsBuilder.newInstance()
+    private final val uriComponentsBuilder = UriComponentsBuilder.newInstance()
 
     private val restTemplate = templateBuilder.rootUri(
         uriComponentsBuilder