Merge pull request #176 from alkum/update-gradle-add-versions

Bump gradle wrapper to 7.4.1 + centralize lib version mgmt
bisq-network · Mar 30, 2022 · ef11787 · ef11787
2 parents bb6449d + b0b040a
commit ef11787
Show file tree

Hide file tree

Showing 30 changed files with 216 additions and 139 deletions.
diff --git a/account/build.gradle b/account/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
 }
 
 repositories {

diff --git a/application/build.gradle b/application/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
 }
 
 repositories {

diff --git a/build.gradle b/build.gradle
@@ -15,14 +15,7 @@ repositories {
 apply from: 'buildSrc/bisq-version.gradle'
 apply from: 'buildSrc/os-arch.gradle'
 
-dependencies {
-}
-
 test {
     useJUnitPlatform()
     exclude '**/**Integration*'
-}
-
-ext {
-    i2pVersion = '1.7.0'
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "org.gradle.kotlin.kotlin-dsl" version "2.1.7"
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
     id 'signing'
     id 'maven-publish'
 }

diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/cli/build.gradle b/cli/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
 }
 
 repositories {

diff --git a/common/build.gradle b/common/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
 }
 
 repositories {

diff --git a/contract/build.gradle b/contract/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
 }
 
 repositories {

diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.google.protobuf' version '0.8.18'
+    alias(libs.plugins.protobuf)
     id 'application'
     id 'distribution'
     id 'org.openjfx.javafxplugin' version '0.0.10'

diff --git a/docs/dev-update-gradle.md b/docs/dev-update-gradle.md
@@ -0,0 +1,14 @@
+### How to update the Gradle Wrapper
+
+The wrapper can update itself using:
+
+```
+./gradlew wrapper --gradle-version 7.4.1 \
+    --distribution-type all \
+    --gradle-distribution-sha256-sum a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be
+```
+
+- `--gradle-version`: the version you wish to update to
+- `--distribution-type`: `bin` or `all`. Use the `all` distribution to provide the sources needed for the IDE for 
+code-completion and the ability to navigate the Gradle source code.
+- `--gradle-distribution-sha256-sum`: the checksum for the chosen distribution from https://gradle.org/release-checksums/
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,16 @@
+# Version Catalogs documentation: https://docs.gradle.org/7.4.1/userguide/platforms.html
+
+[versions]
+i2p = '1.7.0'
+protobuf = '0.8.18'
+
+[libraries]
+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' }
+
+[bundles]
+i2p = ['i2p-core', 'i2p-router', 'i2p-streaming']
+
+[plugins]
+protobuf = { id = 'com.google.protobuf', version.ref = 'protobuf' }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists