Make use of libs.versions.toml file

Signed-off-by: Simon Scholz <opensource.simon@gmail.com>

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm") version "1.9.22" apply false
-    id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false
+    id("io.gitlab.arturbosch.detekt") version "1.23.5" apply false
     id("org.jlleitschuh.gradle.ktlint") version "12.1.0" apply false
     id("com.github.ben-manes.versions") version "0.51.0" apply false
 }

gradle/libs.versions.toml

@@ -0,0 +1,33 @@
+[versions]
+kotlin = "1.9.22"
+zxing = "3.5.3"
+junit = "5.10.1"
+
+[libraries]
+zxing-core = { group = "com.google.zxing", name = "core", version.ref = "zxing" }
+zxing-se = { group = "com.google.zxing", name = "javase", version.ref = "zxing" }
+
+kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5", version.ref = "kotlin" }
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
+junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "1.10.1" }
+assertk = { group = "com.willowtreeapps.assertk", name = "assertk", version = "0.28.0" }
+
+miglayout = { group = "com.miglayout", name = "miglayout-swing", version = "11.3" }
+databinding = { group = "org.eclipse.platform", name = "org.eclipse.core.databinding", version = "1.13.100" }
+datePicker = { group = "com.github.lgooddatepicker", name = "LGoodDatePicker", version = "11.2.1" }
+swingx = { group = "org.swinglabs", name = "swingx", version = "1.6.1" }
+jackson-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version = "2.16.1" }
+kotlinpoet-javapoet = { group = "com.squareup", name = "kotlinpoet-javapoet", version = "1.16.0" }
+
+batik-dom = { group = "org.apache.xmlgraphics", name = "batik-dom", version = "1.17" }
+batik-svggen = { group = "org.apache.xmlgraphics", name = "batik-svggen", version = "1.17" }
+batik-codec = { group = "org.apache.xmlgraphics", name = "batik-codec", version = "1.17" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.5" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.0" }
+ben-manes-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
+dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
+vaniktech-publish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }

java-sample/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("java")
-    id("com.github.ben-manes.versions") version "0.50.0"
+    java
+    alias(libs.plugins.ben.manes.versions)
 }
 
 group = "com.github.simonscholz"
@@ -16,8 +16,9 @@ repositories {
 dependencies {
     implementation("io.github.simonscholz:qr-code-with-logo:0.4.0-SNAPSHOT")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1")
+    testImplementation(libs.junit.jupiter.engine)
+    testImplementation(libs.junit.jupiter.params)
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 tasks.test {

java-sample/gradle/libs.versions.toml

@@ -0,0 +1,10 @@
+[versions]
+junit = "5.10.1"
+
+[libraries]
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
+junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "1.10.1" }
+
+[plugins]
+ben-manes-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }

kotlin-sample/build.gradle.kts

@@ -1,11 +1,10 @@
 import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
-    kotlin("jvm")
-
-    id("io.gitlab.arturbosch.detekt")
-    id("org.jlleitschuh.gradle.ktlint")
-    id("com.github.ben-manes.versions")
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.ktlint)
+    alias(libs.plugins.ben.manes.versions)
 }
 
 repositories {

qr-code-app/build.gradle.kts

@@ -1,12 +1,12 @@
 import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
-    kotlin("jvm")
     application
+    alias(libs.plugins.kotlin.jvm)
 
-    id("io.gitlab.arturbosch.detekt")
-    id("org.jlleitschuh.gradle.ktlint")
-    id("com.github.ben-manes.versions")
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.ktlint)
+    alias(libs.plugins.ben.manes.versions)
 
     id("org.graalvm.buildtools.native") version "0.9.28"
     id("com.ryandens.jlink-application") version "0.4.0"
@@ -20,16 +20,14 @@ repositories {
 dependencies {
     implementation(project(":qr-code"))
 
-    implementation("com.miglayout:miglayout-swing:11.3")
-    implementation("org.eclipse.platform:org.eclipse.core.databinding:1.13.100") {
+    implementation(libs.miglayout)
+    implementation(libs.databinding) {
         exclude(group = "org.eclipse.platform", module = "org.eclipse.osgi")
     }
-    implementation("com.github.lgooddatepicker:LGoodDatePicker:11.2.1")
-    implementation("org.swinglabs:swingx:1.6.1")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
-    implementation("com.squareup:kotlinpoet-javapoet:1.16.0")
-
-    // implementation("io.quarkus:quarkus-awt-deployment:3.5.0")
+    implementation(libs.datePicker)
+    implementation(libs.swingx)
+    implementation(libs.jackson.kotlin)
+    implementation(libs.kotlinpoet.javapoet)
 
     // Just for comparison with JFace implementation
     // implementation("org.eclipse.platform:org.eclipse.jface.databinding:1.15.100")

qr-code-svg/build.gradle.kts

@@ -1,17 +1,14 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
-import com.vanniktech.maven.publish.SonatypeHost
 import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
-    kotlin("jvm")
     `java-library`
 
-    id("io.gitlab.arturbosch.detekt")
-    id("org.jlleitschuh.gradle.ktlint")
-    id("com.github.ben-manes.versions")
-
-    id("com.vanniktech.maven.publish") version "0.27.0"
-    id("org.jetbrains.dokka") version "1.9.10"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.ktlint)
+    alias(libs.plugins.ben.manes.versions)
+    alias(libs.plugins.dokka)
 }
 
 repositories {
@@ -21,17 +18,15 @@ repositories {
 dependencies {
     implementation(project(":qr-code"))
 
-    implementation("org.apache.xmlgraphics:batik-dom:1.17")
-    implementation("org.apache.xmlgraphics:batik-svggen:1.17")
-    runtimeOnly("org.apache.xmlgraphics:batik-codec:1.17")
-
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4")
+    implementation(libs.batik.dom)
+    implementation(libs.batik.svggen)
+    runtimeOnly(libs.batik.codec)
 
-    testImplementation("com.willowtreeapps.assertk:assertk:0.28.0")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:1.9.22")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.1")
+    testImplementation(libs.assertk)
+    testImplementation(libs.kotlin.junit)
+    testImplementation(libs.junit.jupiter.engine)
+    testImplementation(libs.junit.jupiter.params)
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
@@ -74,9 +69,3 @@ tasks.withType<Detekt>().configureEach {
         md.required.set(false)
     }
 }
-
-mavenPublishing {
-    publishToMavenCentral(SonatypeHost.S01)
-
-    signAllPublications()
-}

qr-code-svg/src/main/kotlin/io/github/simonscholz/spi/Graphics2DSvgSpi.kt

@@ -25,6 +25,7 @@ class Graphics2DSvgSpi : Graphics2DSpi {
         val svgGraphics = SVGGraphics2D(ctx, false)
         try {
             delegate.drawQrCode(svgGraphics)
+            svgGraphics.root
             val writer: Writer = OutputStreamWriter(outputStream)
             svgGraphics.stream(writer, true)
         } finally {

qr-code/build.gradle.kts

@@ -3,32 +3,28 @@ import com.vanniktech.maven.publish.SonatypeHost
 import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
-    kotlin("jvm")
     `java-library`
-
-    id("io.gitlab.arturbosch.detekt")
-    id("org.jlleitschuh.gradle.ktlint")
-    id("com.github.ben-manes.versions")
-
-    id("com.vanniktech.maven.publish") version "0.27.0"
-    id("org.jetbrains.dokka") version "1.9.10"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.ktlint)
+    alias(libs.plugins.ben.manes.versions)
+    alias(libs.plugins.vaniktech.publish)
+    alias(libs.plugins.dokka)
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation("com.google.zxing:core:3.5.2")
-
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4")
+    implementation(libs.zxing.core)
 
-    testImplementation("com.google.zxing:javase:3.5.2")
-    testImplementation("com.willowtreeapps.assertk:assertk:0.28.0")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:1.9.22")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.1")
+    testImplementation(libs.zxing.se)
+    testImplementation(libs.kotlin.junit)
+    testImplementation(libs.junit.jupiter.engine)
+    testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.assertk)
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 // Apply a specific Java toolchain to ease working on different environments.