Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump gradle wrapper to 7.4.1 + centralize lib version mgmt #176

Merged
merged 3 commits into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion account/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.18'
alias(libs.plugins.protobuf)
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion application/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.18'
alias(libs.plugins.protobuf)
}

repositories {
Expand Down
7 changes: 0 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
7 changes: 7 additions & 0 deletions buildSrc/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
2 changes: 1 addition & 1 deletion cli/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.18'
alias(libs.plugins.protobuf)
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.18'
alias(libs.plugins.protobuf)
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion contract/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.18'
alias(libs.plugins.protobuf)
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion desktop/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
14 changes: 14 additions & 0 deletions docs/dev-update-gradle.md
Original file line number Diff line number Diff line change
@@ -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/
16 changes: 16 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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' }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading