Moved all versions for plugins and deps into libs.versions.toml (#1025)

* Moved all versions for plugins and deps into libs.versions.toml

* Removed commented-out dep

Author: roar-skinderviken

build.gradle.kts

@@ -1,10 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+
 group = "no.ssb.kostra"
 
 repositories { mavenCentral() }
 
 plugins {
-    kotlin("jvm") version libs.versions.kotlin
-    id("org.sonarqube") version "6.2.0.5505"
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.sonarqube)
     jacoco
 }
 
@@ -29,20 +31,25 @@ sonarqube {
 
 subprojects {
     if (name != "kostra-kontrollprogram-web-frontend") {
+        repositories { mavenCentral() }
+
         apply(plugin = "kotlin")
         apply(plugin = "jacoco")
 
-        kotlin { jvmToolchain(21) }
-        repositories { mavenCentral() }
+        configure<KotlinJvmProjectExtension> {
+            jvmToolchain(21)
+        }
 
-        tasks.test {
+        tasks.withType<Test> {
             useJUnitPlatform()
             jvmArgs("-Xshare:off", "-XX:+EnableDynamicAgentLoading")
         }
 
-        tasks.jacocoTestReport {
-            dependsOn(tasks.test)
-            reports { xml.required = true }
+        tasks.withType<JacocoReport> {
+            dependsOn(tasks.withType<Test>())
+            reports {
+                xml.required.set(true)
+            }
         }
     }
 }

gradle/libs.versions.toml

@@ -1,24 +1,50 @@
 [versions]
-micronautPlatform = "4.7.6"
-kotlin = "2.1.10"
-jackson = "2.19.0"
-kotest = "5.9.1"
+micronaut-platform-version = "4.7.6"
+kotlin-version = "2.1.10"
+jackson-version = "2.19.0"
+kotest-version = "5.9.1"
+mockk-version = "1.14.2"
+woodstox-core-version = "7.1.1"
+picocli-version = "4.7.7"
+logback-classic-version = "1.5.18"
+swagger-annotations-version = "2.2.32"
+
+# plugins
+sonarqube-version = "6.2.0.5505"
+spring-dependency-management-version = "1.1.7"
+shadow-version = "8.3.6"
+gradle-git-properties-version = "2.5.0"
+devtools-ksp-version = "2.1.10-1.0.31"
+micronaut-application-version = "4.5.3"
+siouan-frontend-jdk21-version = "10.0.0"
 
 [libraries]
 # Kotlin
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", 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-version" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-version" }
+
+jackson-module-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson-version" }
+jackson-jakarta-rs-xml-provider = { group = "com.fasterxml.jackson.jakarta.rs", name = "jackson-jakarta-rs-xml-provider", version.ref = "jackson-version" }
+jackson-dataformat-xml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-xml", version.ref = "jackson-version" }
+jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson-version" }
 
-jackson-module-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson" }
-jackson-jakarta-rs-xml-provider = { group = "com.fasterxml.jackson.jakarta.rs", name = "jackson-jakarta-rs-xml-provider", version.ref = "jackson" }
-jackson-dataformat-xml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-xml", version.ref = "jackson" }
-woodstox-core = { group = "com.fasterxml.woodstox", name = "woodstox-core", version = "7.1.1" }
-picocli = { group = "info.picocli", name = "picocli", version = "4.7.7"}
-logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.18" }
-micronautPlatform = { group = "io.micronaut.platform", name = "micronaut-parent", version.ref = "micronautPlatform" }
-swagger-annotations = { group = "io.swagger.core.v3", name = "swagger-annotations", version = "2.2.32" }
+woodstox-core = { group = "com.fasterxml.woodstox", name = "woodstox-core", version.ref = "woodstox-core-version" }
+picocli = { group = "info.picocli", name = "picocli", version.ref = "picocli-version"}
+logback-classic = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback-classic-version" }
+micronaut-platform = { group = "io.micronaut.platform", name = "micronaut-parent", version.ref = "micronaut-platform-version" }
+swagger-annotations = { group = "io.swagger.core.v3", name = "swagger-annotations", version.ref = "swagger-annotations-version" }
 
 # Tests
-kotest-assertions-core-jvm = { group = "io.kotest", name = "kotest-assertions-core-jvm", version.ref = "kotest" }
-kotest-runner-junit5-jvm = { group = "io.kotest", name = "kotest-runner-junit5-jvm", version.ref = "kotest" }
-mockk-jvm = { group = "io.mockk", name = "mockk-jvm", version = "1.14.2" }
+kotest-assertions-core-jvm = { group = "io.kotest", name = "kotest-assertions-core-jvm", version.ref = "kotest-version" }
+kotest-runner-junit5-jvm = { group = "io.kotest", name = "kotest-runner-junit5-jvm", version.ref = "kotest-version" }
+mockk-jvm = { group = "io.mockk", name = "mockk-jvm", version.ref = "mockk-version" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
+sonarqube = { id = "org.sonarqube", version.ref = "sonarqube-version" }
+spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "spring-dependency-management-version" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow-version" }
+gradle-git-properties = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradle-git-properties-version" }
+devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "devtools-ksp-version" }
+micronaut-application = { id = "io.micronaut.application", version.ref = "micronaut-application-version" }
+siouan-frontend-jdk21 = { id = "org.siouan.frontend-jdk21", version.ref = "siouan-frontend-jdk21-version" }

konsoll/build.gradle.kts

@@ -2,7 +2,7 @@ application { mainClass = "no.ssb.kostra.program.KostraKontrollprogramCommand" }
 
 plugins {
     application
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {

kontroller/build.gradle.kts

@@ -1,12 +1,12 @@
 plugins {
-    id("com.gorylenko.gradle-git-properties") version "2.5.0"
+    alias(libs.plugins.gradle.git.properties)
 }
 
 dependencies {
     api(project(":kostra-barnevern"))
 
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${libs.versions.jackson.get()}")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}")
+    implementation(libs.jackson.dataformat.yaml)
+    implementation(libs.jackson.module.kotlin)
 
     testImplementation(libs.kotest.assertions.core.jvm)
     testImplementation(libs.kotest.runner.junit5.jvm)

kostra-barnevern/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.spring.dependency-management") version "1.1.7"
+    alias(libs.plugins.spring.dependency.management)
 //    id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.4" apply false
 //    `maven-publish`
 }
@@ -10,7 +10,7 @@ plugins {
 
 dependencyManagement {
     dependencies {
-        dependency("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
+        dependency("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.version.get()}")
     }
 }
 

web-frontend/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.siouan.frontend-jdk21") version "10.0.0"
+    alias(libs.plugins.siouan.frontend.jdk21)
 }
 
 frontend {

web/build.gradle.kts

@@ -1,9 +1,9 @@
 application { mainClass = "no.ssb.kostra.web.ApplicationKt" }
 
 plugins {
-    id("com.google.devtools.ksp") version "2.1.10-1.0.31"
-    id("io.micronaut.application") version "4.5.3"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.devtools.ksp)
+    alias(libs.plugins.micronaut.application)
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -30,7 +30,7 @@ dependencies {
 }
 
 micronaut {
-    version = libs.versions.micronautPlatform
+    version = libs.versions.micronaut.platform.version
     runtime("netty")
     testRuntime("kotest5")
     processing {