Switch to TOML based version catalogs

Author: mrotteveel

build.gradle

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2020-2025 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2020-2026 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later
 import org.apache.tools.ant.filters.*
 import org.asciidoctor.gradle.jvm.AsciidoctorTask
@@ -13,10 +13,10 @@ import org.asciidoctor.gradle.jvm.AsciidoctorTask
 
 plugins {
     id 'java-library'
-    id 'nu.studer.credentials' version '3.0'
+    alias(libs.plugins.credentials)
     id 'maven-publish'
     id 'signing'
-    id 'org.asciidoctor.jvm.convert' version '4.0.5'
+    alias(libs.plugins.asciidoctor.jvm.convert)
 }
 
 defaultTasks 'clean', 'build'

gradle/libs.versions.toml

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Copyright 2026 Mark Rotteveel
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[versions]
+jna = "5.18.1"
+jakarta-servlet = "5.0.0"
+bouncy-castle = "1.83"
+jspecify = "1.0.0"
+credentials = "3.0"
+asciidoctor-jvm = "4.0.5"
+
+[libraries]
+jna = { module = "net.java.dev.jna:jna-jpms", version.ref = "jna" }
+jakarta-servlet-api  = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" }
+bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncy-castle" }
+jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
+
+[plugins]
+credentials = { id = "nu.studer.credentials", version.ref = "credentials" }
+asciidoctor-jvm-convert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor-jvm" }

gradle/test-libs.versions.toml

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: Copyright 2026 Mark Rotteveel
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[versions]
+junit = "6.0.3"
+mockito = "5.23.0"
+hamcrest = "3.0"
+hamcrest-optional = "1.3.2"
+assertj = "3.27.7"
+awaitility = "4.3.0"
+
+[libraries]
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
+hamcrest-optional = { module = "com.spotify:hamcrest-optional", version.ref = "hamcrest-optional" }
+assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+mockito-bom  = { module =  "org.mockito:mockito-bom", version.ref = "mockito" }
+mockito-core  = { module =  "org.mockito:mockito-core" }
+mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" }
+awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
+
+[bundles]
+junit = ["junit-jupiter"]
+hamcrest = ["hamcrest", "hamcrest-optional"]
+mockito = ["mockito-core", "mockito-junit-jupiter"]

settings.gradle

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2020-2025 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2020-2026 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later
 rootProject.name = 'jaybird'
 include 'chacha64-plugin'
@@ -11,31 +11,8 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs {
-        libs {
-            library('jna', 'net.java.dev.jna', 'jna-jpms').version('5.18.1')
-            library('jakarta.servlet-api', 'jakarta.servlet', 'jakarta.servlet-api').version('5.0.0')
-            library('bcprov-jdk18on', 'org.bouncycastle', 'bcprov-jdk18on').version('1.83')
-            library('jspecify', 'org.jspecify', 'jspecify').version('1.0.0')
-        }
-
         testLibs {
-            version('junit', '6.0.3')
-            version('mockito', '5.23.0')
-
-            library('junit-bom', 'org.junit', 'junit-bom').versionRef('junit')
-            library('junit-jupiter', 'org.junit.jupiter', 'junit-jupiter').withoutVersion()
-            library('junit-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').withoutVersion()
-            library('hamcrest', 'org.hamcrest', 'hamcrest').version('3.0')
-            library('hamcrest-optional', 'com.spotify', 'hamcrest-optional').version('1.3.2')
-            library('assertj-core', 'org.assertj', 'assertj-core').version('3.27.7')
-            library('mockito-bom', 'org.mockito', 'mockito-bom').versionRef('mockito')
-            library('mockito-core', 'org.mockito', 'mockito-core').withoutVersion()
-            library('mockito-junit-jupiter', 'org.mockito', 'mockito-junit-jupiter').withoutVersion()
-            library('awaitility', 'org.awaitility', 'awaitility').version('4.3.0')
-
-            bundle('junit', ['junit-jupiter'])
-            bundle('hamcrest', ['hamcrest', 'hamcrest-optional'])
-            bundle('mockito', ['mockito-core', 'mockito-junit-jupiter'])
+            from(files('gradle/test-libs.versions.toml'))
         }
     }
 }