Merge pull request #211 from alkum/gradle-consolidate-various-libs

Gradle consolidate various libs
bisq-network · Apr 5, 2022 · 477623d · 477623d
2 parents 5ce3a2f + 0697281
commit 477623d
Show file tree

Hide file tree

Showing 31 changed files with 71 additions and 70 deletions.
diff --git a/account/build.gradle b/account/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     implementation project(':network')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 }
 test {
     useJUnitPlatform()

diff --git a/application/build.gradle b/application/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation project(':wallets')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
     implementation libs.typesafe.config
 }
 

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gradle.kotlin.kotlin-dsl" version "2.1.7"
+    alias(libs.plugins.kotlindsl)
     alias(libs.plugins.protobuf)
     id 'signing'
     id 'maven-publish'

diff --git a/buildSrc/logging-dependencies.gradle b/buildSrc/logging-dependencies.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api platform(project(':platforms:common-platform'))
-    implementation 'org.slf4j:slf4j-api'
-    implementation 'ch.qos.logback:logback-core'
-    implementation 'ch.qos.logback:logback-classic'
+    implementation libs.slf4j.api
+    implementation libs.logback.core
+    implementation libs.logback.classic
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -16,9 +16,9 @@ dependencies {
     api platform(project(':platforms:common-platform'))
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
     implementation libs.typesafe.config
-    implementation 'org.jetbrains:annotations:23.0.0'
+    implementation libs.annotations
 }
 
 test {

diff --git a/contract/build.gradle b/contract/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     implementation project(':network')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 }
 
 test {

diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation project(':application')
     implementation project(':wallets')
 
-    implementation libs.guava
+    implementation libs.google.guava
 
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'de.jensd:fontawesomefx:8.0.0'

diff --git a/desktopapp/build.gradle b/desktopapp/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation project(':wallets')
     implementation project(':desktop')
 
-    implementation libs.guava
+    implementation libs.google.guava
 
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'de.jensd:fontawesomefx:8.0.0'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,28 +5,38 @@
 # Convention: mark all versions using 'strictly'. This ensures only one version is allowed in the dependency tree, even
 # when multiple versions are attempted to be brought in as transitive dependencies of other requirements.
 [versions]
-guava =         { strictly = '31.1-jre' }
-i2p =           { strictly = '1.7.0' }
-junit-jupiter = { strictly = '5.8.2' }
-lombok =        { strictly = '1.18.22'}
-openjfx =       { strictly = '0.0.12' }
-protobuf =      { strictly = '0.8.18' }
-protobuf-java = { strictly = '3.19.4' }
-typesafe-config = { strictly = '1.4.2' }
+annotations-lib =       { strictly = '23.0.0' }
+google-gson-lib =       { strictly = '2.9.0' }
+google-guava-lib =      { strictly = '31.1-jre' }
+i2p-lib =               { strictly = '1.7.0' }
+junit-jupiter-lib =     { strictly = '5.8.2' }
+kotlindsl-plugin =      { strictly = '2.1.7' }
+logback-lib =           { strictly = '1.2.11' }
+lombok-lib =            { strictly = '1.18.22' }
+openjfx-plugin =        { strictly = '0.0.12' }
+protobuf-plugin =       { strictly = '0.8.18' }
+protobuf-java-lib =     { strictly = '3.19.4' }
+slf4j-lib =             { strictly = '1.7.36' }
+typesafe-config-lib =   { strictly = '1.4.2' }
 
 # Referenced in subproject's build.gradle > dependencies block in the form 'implementation libs.guava'
 # Note: keys can contain dash (protobuf-java) but the dash is replaced by dot when referenced
 # in a build.gradle ('implementation libs.protobuf.java')
 [libraries]
-guava =             { module = 'com.google.guava:guava',            version.ref = 'guava' }
-i2p-streaming =     { module = 'net.i2p.client:streaming',          version.ref = 'i2p' }
-i2p-core =          { module = 'net.i2p:i2p',                       version.ref = 'i2p' }
-i2p-router =        { module = 'net.i2p:router',                    version.ref = 'i2p' }
-junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = 'junit-jupiter' }
-junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = 'junit-jupiter' }
-lombok =            { module = 'org.projectlombok:lombok',          version.ref = 'lombok' }
-protobuf-java =     { module = 'com.google.protobuf:protobuf-java', version.ref = 'protobuf-java' }
-typesafe-config = { module = 'com.typesafe:config', version.ref = 'typesafe-config' }
+annotations =       { module = 'org.jetbrains:annotations',         version.ref = 'annotations-lib' }
+google-gson =       { module = 'com.google.code.gson:gson',         version.ref = 'google-gson-lib' }
+google-guava =      { module = 'com.google.guava:guava',            version.ref = 'google-guava-lib' }
+i2p-streaming =     { module = 'net.i2p.client:streaming',          version.ref = 'i2p-lib' }
+i2p-core =          { module = 'net.i2p:i2p',                       version.ref = 'i2p-lib' }
+i2p-router =        { module = 'net.i2p:router',                    version.ref = 'i2p-lib' }
+junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = 'junit-jupiter-lib' }
+junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = 'junit-jupiter-lib' }
+logback-core =      { module = 'ch.qos.logback:logback-core',       version.ref = 'logback-lib' }
+logback-classic =   { module = 'ch.qos.logback:logback-classic',    version.ref = 'logback-lib' }
+lombok =            { module = 'org.projectlombok:lombok',          version.ref = 'lombok-lib' }
+protobuf-java =     { module = 'com.google.protobuf:protobuf-java', version.ref = 'protobuf-java-lib' }
+slf4j-api =         { module = 'org.slf4j:slf4j-api',               version.ref = 'slf4j-lib' }
+typesafe-config =   { module = 'com.typesafe:config',               version.ref = 'typesafe-config-lib' }
 
 # Defines groups of libs that are commonly used together
 # Referenced in dependencies block as 'implementation libs.bundles.i2p'
@@ -38,5 +48,6 @@ i2p = ['i2p-core', 'i2p-router', 'i2p-streaming']
 # since plugins don't bring other plugins as transitive dependencies, as long as they are loaded using the
 # `alias(libs.plugins.protobuf)` mechanism, there is no risk of loading multiple versions.
 [plugins]
-openjfx = { id = 'org.openjfx.javafxplugin', version.ref = 'openjfx' }
-protobuf = { id = 'com.google.protobuf', version.ref = 'protobuf' }
+kotlindsl = { id = 'org.gradle.kotlin.kotlin-dsl', version.ref = 'kotlindsl-plugin' }
+openjfx = { id = 'org.openjfx.javafxplugin', version.ref = 'openjfx-plugin' }
+protobuf = { id = 'com.google.protobuf', version.ref = 'protobuf-plugin' }
diff --git a/grpc/build.gradle b/grpc/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation 'io.grpc:grpc-services'
     implementation 'io.grpc:grpc-stub'
     implementation 'org.codehaus.mojo:animal-sniffer-annotations'
-    implementation libs.guava
+    implementation libs.google.guava
 }
 
 ext {

diff --git a/i18n/build.gradle b/i18n/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     api platform(project(':platforms:common-platform'))
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 }
 
 test {

diff --git a/i2p/build.gradle b/i2p/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation project(':common')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 
     // Exclude httpclient transitive dependency because it may override
     // I2P-specific impl of some Apache classes like org.apache.http.util.Args

diff --git a/identity/build.gradle b/identity/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':network')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
     implementation libs.typesafe.config
 }
 test {

diff --git a/network/build.gradle b/network/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation project(':persistence')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
     implementation libs.typesafe.config
 
     implementation 'com.github.chimp1984:jsocks'

diff --git a/offer/build.gradle b/offer/build.gradle
@@ -27,8 +27,8 @@ dependencies {
     implementation project(':wallets')
 
     implementation libs.protobuf.java
-    implementation libs.guava
-    implementation 'com.google.code.gson:gson'
+    implementation libs.google.gson
+    implementation libs.google.guava
     implementation 'com.github.chimp1984:jsocks'
 }
 

diff --git a/oracle/build.gradle b/oracle/build.gradle
@@ -24,8 +24,8 @@ dependencies {
     implementation project(':network')
 
     implementation libs.protobuf.java
-    implementation libs.guava
-    implementation 'com.google.code.gson:gson'
+    implementation libs.google.gson
+    implementation libs.google.guava
     implementation libs.typesafe.config
 }
 

diff --git a/persistence/build.gradle b/persistence/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation project(':common')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 }
 
 test {

diff --git a/platforms/common-platform/build.gradle b/platforms/common-platform/build.gradle
@@ -29,7 +29,7 @@ dependencies {
         /////////////////////////////////////////////////////////////////////////////////
         // Guava and transitive dependency constraints
         /////////////////////////////////////////////////////////////////////////////////
-        api(libs.guava)
+        api(libs.google.guava)
         // Declaring the guava dependency above will bring in the transitive dependencies below.
         // If some other dependency brings in other versions of the transitive dependencies below,
         // they should be excluded.
@@ -62,27 +62,17 @@ dependencies {
         /////////////////////////////////////////////////////////////////////////////////
         // Gson dependency constraints
         /////////////////////////////////////////////////////////////////////////////////
-        api('com.google.code.gson:gson') {
-            version { require '2.8.6' }
-        }
+        api(libs.google.gson)
 
         /////////////////////////////////////////////////////////////////////////////////
         // Logging dependency constraints
         /////////////////////////////////////////////////////////////////////////////////
-        api('org.slf4j:slf4j-api') {
-            version { require '1.7.30' }
-        }
-        api('ch.qos.logback:logback-core') {
-            version { require '1.2.3' }
-        }
-        api('ch.qos.logback:logback-classic') {
-            version { require '1.2.3' }
-        }
+        api(libs.slf4j.api)
+        api(libs.logback.core)
+        api(libs.logback.classic)
 
         // The runtime configuration should be used to declare
         // constraints or dependencies which are visible at runtime.
-        runtime('org.slf4j:slf4j-api') {
-            version { require '1.7.30' }
-        }
+        runtime(libs.slf4j.api)
     }
 }
diff --git a/platforms/grpc-platform/build.gradle b/platforms/grpc-platform/build.gradle
@@ -44,6 +44,6 @@ dependencies {
         /////////////////////////////////////////////////////////////////////////////////
         // Guava and transitive dependency constraints (grpc only)
         /////////////////////////////////////////////////////////////////////////////////
-        api(libs.guava)
+        api(libs.google.guava)
     }
 }
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':offer')
     implementation project(':oracle')
 
-    implementation libs.guava
+    implementation libs.google.guava
 }
 
 test {

diff --git a/protocol/build.gradle b/protocol/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     implementation project(':wallets')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
     implementation libs.typesafe.config
 
     implementation("org.jeasy:easy-states:2.0.0")

diff --git a/satoshisquareapp/build.gradle b/satoshisquareapp/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation project(':wallets')
     implementation project(':desktop')
 
-    implementation libs.guava
+    implementation libs.google.guava
 
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'de.jensd:fontawesomefx:8.0.0'

diff --git a/security/build.gradle b/security/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation project(':persistence')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
     implementation 'org.bouncycastle:bcprov-jdk16:1.46'
 }
 test {

diff --git a/seed/build.gradle b/seed/build.gradle
@@ -29,7 +29,7 @@ dependencies {
 
     implementation project(':application')
 
-    implementation libs.guava
+    implementation libs.google.guava
     implementation libs.typesafe.config
 }
 test {

diff --git a/settings/build.gradle b/settings/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation project(':persistence')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 }
 test {
     useJUnitPlatform()

diff --git a/social/build.gradle b/social/build.gradle
@@ -27,9 +27,9 @@ dependencies {
     implementation project(':presentation')
 
     implementation 'com.github.chimp1984:jsocks'
-    implementation "com.google.code.gson:gson:2.8.5"
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.gson
+    implementation libs.google.guava
     implementation libs.typesafe.config
 }
 

diff --git a/support/build.gradle b/support/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation project(':network')
 
     implementation libs.protobuf.java
-    implementation libs.guava
+    implementation libs.google.guava
 }
 test {
     useJUnitPlatform()

diff --git a/tools/build.gradle b/tools/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation project(':wallets')
     implementation project(':desktop')
 
-    implementation libs.guava
+    implementation libs.google.guava
 
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'de.jensd:fontawesomefx:8.0.0'

diff --git a/tor/build.gradle b/tor/build.gradle
@@ -18,7 +18,7 @@ dependencies {
 
     implementation project(':common')
 
-    implementation libs.guava
+    implementation libs.google.guava
 
     implementation 'org.apache.commons:commons-compress'
 

diff --git a/wallets/build.gradle b/wallets/build.gradle
@@ -28,7 +28,7 @@ dependencies {
         exclude(module: 'base64')
         exclude(module: 'httpcore-nio')
     }
-    implementation libs.guava
+    implementation libs.google.guava
 
     testImplementation("org.assertj:assertj-core:3.22.0")
 }

diff --git a/web/build.gradle b/web/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation project(':presentation')
     implementation project(':application')
 
-    implementation 'com.google.code.gson:gson'
+    implementation libs.google.gson
 
     implementation 'io.ratpack:ratpack-core'
     implementation 'io.ratpack:ratpack-rx2'