From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 12:58:33 +0000 (+0100)
Subject: Add dependencyResolutionManagement
X-Git-Tag: v0.11.7~4
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/426b59d13e79fbe799f184b8605dfd2d31b34b36?ds=inline

Add dependencyResolutionManagement
---

diff --git a/build.gradle.kts b/build.gradle.kts
index 987ee2a3..77e6971a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,19 +33,14 @@ graalvmNative {
     }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
 dependencies {
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.2")
-    implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
-    implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
-    implementation("org.slf4j", "slf4j-api", "2.0.6")
-    implementation("ch.qos.logback", "logback-classic", "1.4.5")
-    implementation("org.slf4j", "jul-to-slf4j", "2.0.6")
+    implementation(libs.bouncycastle)
+    implementation(libs.jackson.databind)
+    implementation(libs.argparse4j)
+    implementation(libs.dbusjava)
+    implementation(libs.slf4j.api)
+    implementation(libs.slf4j.jul)
+    implementation(libs.logback)
     implementation(project(":lib"))
 }
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index b3dffa2f..719f8bb0 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -8,21 +8,16 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_66")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
-    implementation("com.google.protobuf", "protobuf-javalite", "3.21.12")
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("org.slf4j", "slf4j-api", "2.0.6")
-    implementation("org.xerial", "sqlite-jdbc", "3.40.1.0")
-    implementation("com.zaxxer", "HikariCP", "5.0.1")
-
-    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.2")
+    implementation(libs.signalservice)
+    implementation(libs.jackson.databind)
+    implementation(libs.protobuf)
+    implementation(libs.bouncycastle)
+    implementation(libs.slf4j.api)
+    implementation(libs.sqlite)
+    implementation(libs.hikari)
+
+    testImplementation(libs.junit)
 }
 
 tasks.named<Test>("test") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eb34b67b..44ff0fbd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,29 @@
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.14.2")
+            library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.2.1")
+            version("slf4j", "2.0.6")
+            library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
+            library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.5")
+
+
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_66")
+            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.40.1.0")
+            library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
+            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.2")
+        }
+    }
+}
+
 rootProject.name = "signal-cli"
 include("lib")