Merge pull request #198 from alkum/gradle-consolidate-typesafe

Consolidate typesafe config version
bisq-network · Apr 2, 2022 · 838d845 · 838d845
2 parents 3ebc29b + 9fd3f31
commit 838d845
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/application/build.gradle b/application/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 
     implementation libs.protobuf.java
     implementation libs.guava
-    implementation 'com.typesafe:config'
+    implementation libs.typesafe.config
 }
 
 test {

diff --git a/common/build.gradle b/common/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     implementation libs.protobuf.java
     implementation libs.guava
-    implementation 'com.typesafe:config'
+    implementation libs.typesafe.config
     implementation 'org.jetbrains:annotations:23.0.0'
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,6 +10,7 @@ i2p =           { strictly = '1.7.0' }
 openjfx =       { strictly = '0.0.12' }
 protobuf =      { strictly = '0.8.18' }
 protobuf-java = { strictly = '3.19.4' }
+typesafe-config = { 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
@@ -20,6 +21,7 @@ i2p-streaming =     { module = 'net.i2p.client:streaming',          version.ref
 i2p-core =          { module = 'net.i2p:i2p',                       version.ref = 'i2p' }
 i2p-router =        { module = 'net.i2p:router',                    version.ref = 'i2p' }
 protobuf-java =     { module = 'com.google.protobuf:protobuf-java', version.ref = 'protobuf-java' }
+typesafe-config = { module = 'com.typesafe:config', version.ref = 'typesafe-config' }
 
 # Defines groups of libs that are commonly used together
 # Referenced in dependencies block as 'implementation libs.bundles.i2p'

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

diff --git a/network/build.gradle b/network/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 
     implementation libs.protobuf.java
     implementation libs.guava
-    implementation 'com.typesafe:config'
+    implementation libs.typesafe.config
 
     implementation 'com.github.chimp1984:jsocks'
     implementation 'org.apache.httpcomponents:httpclient'

diff --git a/oracle/build.gradle b/oracle/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation libs.protobuf.java
     implementation libs.guava
     implementation 'com.google.code.gson:gson'
-    implementation 'com.typesafe:config'
+    implementation libs.typesafe.config
 }
 
 test {

diff --git a/platforms/common-platform/build.gradle b/platforms/common-platform/build.gradle
@@ -19,9 +19,7 @@ dependencies {
         /////////////////////////////////////////////////////////////////////////////////
         // Typesafe configuration dependency constraints
         /////////////////////////////////////////////////////////////////////////////////
-        api('com.typesafe:config') {
-            version { require '1.4.1' }
-        }
+        api(libs.typesafe.config)
 
         /////////////////////////////////////////////////////////////////////////////////
         // Protobuf dependency constraints

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

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

diff --git a/social/build.gradle b/social/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.8.5"
     implementation libs.protobuf.java
     implementation libs.guava
-    implementation 'com.typesafe:config'
+    implementation libs.typesafe.config
 }
 
 test {

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