Use toml dependencies and update them (#287)

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle" 
+    open-pull-requests-limit: 10
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    labels:
+      - "dependencies"

build.gradle.kts

@@ -1,10 +1,10 @@
 import java.net.URI
 
 plugins {
-    kotlin("jvm") version "2.0.21"
+    kotlin("jvm").version(libs.versions.kotlin)
     `maven-publish`
-    id("com.ncorti.ktfmt.gradle") version "0.20.1"
-    id("org.jetbrains.dokka") version "1.9.20"
+    alias(libs.plugins.dokka)
+    alias(libs.plugins.ktfmt)
     signing
 }
 
@@ -62,6 +62,7 @@ subprojects {
                     }
                 }
             }
+
             publications {
                 register<MavenPublication>("gpr") {
                     from(components["java"])

core/build.gradle.kts

@@ -3,8 +3,7 @@
 plugins { `jvm-test-suite` }
 
 dependencies {
-    implementation(libs.kotlin.coroutines)
-    implementation(libs.kotlin.coroutines.jdk)
+    implementation(libs.coroutines.core)
 
     api(libs.aws.sqs)
     api(project(":plug"))

gradle/libs.versions.toml

@@ -0,0 +1,21 @@
+[versions]
+kotlin = "2.0.21"
+coroutines = "1.9.0"
+aws-sqs = "2.29.20"
+ktfmt = "0.20.1"
+dokka = "1.9.20"
+spring-boot = "3.4.0"
+protobuf-plugin = "0.9.4"
+protobuf-java = "4.28.3"
+
+[libraries]
+coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+aws-sqs = { module = "software.amazon.awssdk:sqs", version.ref = "aws-sqs" }
+spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure", version.ref = "spring-boot" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf-java" }
+
+[plugins]
+ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }
+dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }

gradle/testLibs.versions.toml

@@ -0,0 +1,23 @@
+[versions]
+kotlin = "2.0.21"
+coroutines = "1.9.0"
+mockk = "1.13.13"
+testcontainers = "1.20.4"
+awaitility = "4.2.2"
+spring-boot = "3.4.0"
+
+[libraries]
+kotlin-test-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+kotlin-test-main = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+testcontainer-localstack = { module = "org.testcontainers:localstack", version.ref = "testcontainers" }
+testcontainer-core = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+awaitility-core = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
+awaitility-kotlin = { module = "org.awaitility:awaitility-kotlin", version.ref = "awaitility" }
+spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" }
+
+[bundles]
+kotlin-test = ["kotlin-test-main", "kotlin-test-junit"]
+awaitility = ["awaitility-core", "awaitility-kotlin"]
+testcontainers = ["testcontainer-core", "testcontainer-localstack"]

proto/build.gradle.kts

@@ -1,9 +1,11 @@
-plugins { id("com.google.protobuf") version ("0.9.4") }
+plugins {
+    alias(libs.plugins.protobuf)
+}
 
 dependencies {
     api(libs.aws.sqs)
     implementation(project(":core"))
-    implementation("com.google.protobuf:protobuf-java-util:4.28.2")
+    implementation(libs.protobuf.java.util)
     testImplementation(testLibs.bundles.kotlin.test)
 }
 

settings.gradle.kts

@@ -8,48 +8,10 @@ rootProject.name = "tabour"
 
 include("core", "proto", "spring", "plug")
 
-val kotlinVersion = "2.0.21"
-val coroutinesVersion = "1.9.0"
-val testContainersVersion = "1.20.2"
-val awaitilityVersion = "4.2.2"
-
 dependencyResolutionManagement {
     versionCatalogs {
-        create("libs") {
-            library(
-                "kotlin-coroutines",
-                "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion",
-            )
-            library(
-                "kotlin-coroutines-jdk",
-                "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion",
-            )
-            library("aws-sqs", "software.amazon.awssdk:sqs:2.28.26")
-        }
-
         create("testLibs") {
-            library("kotlin-test-junit", "org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion")
-            library("kotlin-test-main", "org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
-            library("mockk", "io.mockk:mockk:1.13.13")
-            library(
-                "kotlin-test-coroutines",
-                "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion",
-            )
-
-            library(
-                "testcontainers-localstack",
-                "org.testcontainers:localstack:$testContainersVersion",
-            )
-            library(
-                "testcontainers-core",
-                "org.testcontainers:testcontainers:$testContainersVersion",
-            )
-            library("awaitility-core","org.awaitility:awaitility:$awaitilityVersion")
-            library("awaitility-kotlin","org.awaitility:awaitility-kotlin:$awaitilityVersion")
-
-            bundle("kotlin-test", listOf("kotlin-test-main", "kotlin-test-junit"))
-            bundle("testcontainers", listOf("testcontainers-core", "testcontainers-localstack"))
-            bundle("awaitility", listOf("awaitility-kotlin", "awaitility-core"))
+            from(files("gradle/testLibs.versions.toml"))
         }
     }
 }

spring/build.gradle.kts

@@ -2,10 +2,9 @@ plugins { `jvm-test-suite` }
 
 dependencies {
     implementation(project(":core"))
-    runtimeOnly("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
-    implementation(libs.kotlin.coroutines)
-    implementation(libs.kotlin.coroutines.jdk)
-    implementation("org.springframework.boot:spring-boot-autoconfigure:3.2.1")
+    runtimeOnly(libs.kotlin.reflect)
+    implementation(libs.coroutines.core)
+    implementation(libs.spring.boot.autoconfigure)
 }
 
 group = "com.katanox.tabour"
@@ -23,7 +22,7 @@ testing {
                 implementation(project())
                 implementation(project(":core"))
                 implementation.bundle(testLibs.bundles.kotlin.test)
-                implementation("org.springframework.boot:spring-boot-starter-test:3.1.2")
+                implementation(testLibs.spring.boot.starter.test)
                 implementation(testLibs.kotlin.test.coroutines)
             }