Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bisq-network/bisq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17abc0bc8dc93ab836040662017f81a5c391c436
Choose a base ref
...
head repository: bisq-network/bisq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c737a203673263c7c599ee6624e5803ec6af83df
Choose a head ref

Commits on Jul 31, 2023

  1. Bump gradle/gradle-build-action from 2.6.1 to 2.7.0

    Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.6.1 to 2.7.0.
    - [Release notes](https://github.com/gradle/gradle-build-action/releases)
    - [Commits](gradle/gradle-build-action@v2.6.1...v2.7.0)
    
    ---
    updated-dependencies:
    - dependency-name: gradle/gradle-build-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jul 31, 2023
    Copy the full SHA
    04f76e3 View commit details

Commits on Aug 4, 2023

  1. Copy the full SHA
    8258fe1 View commit details
  2. Copy the full SHA
    eb3a663 View commit details
  3. Copy the full SHA
    71c7054 View commit details
  4. Copy the full SHA
    9c17783 View commit details
  5. Copy the full SHA
    edd4363 View commit details
  6. Copy the full SHA
    6fdf2a2 View commit details
  7. Copy the full SHA
    b35dcef View commit details
  8. Copy the full SHA
    3d94833 View commit details
  9. Copy the full SHA
    41eafd2 View commit details
  10. Copy the full SHA
    af6b664 View commit details
  11. Copy the full SHA
    5576493 View commit details
  12. Copy the full SHA
    8bd51f2 View commit details
  13. Copy the full SHA
    d3419ec View commit details
  14. Merge pull request #6787 from bisq-network/dependabot/github_actions/…

    …gradle/gradle-build-action-2.7.0
    
    Bump gradle/gradle-build-action from 2.6.1 to 2.7.0
    alejandrogarcia83 authored Aug 4, 2023
    Copy the full SHA
    e42f13f View commit details
  15. Merge pull request #6789 from alvasw/gradle_centralize_javafx_setup

    Gradle: Centralize JavaFX Setup
    alejandrogarcia83 authored Aug 4, 2023
    Copy the full SHA
    36169be View commit details
  16. Merge pull request #6791 from alvasw/gradle_move_statsnode_configs_to…

    …_own_build_gradle
    
    statsnode: Move build configuration to its own build.gradle
    alejandrogarcia83 authored Aug 4, 2023
    Copy the full SHA
    6d9586f View commit details

Commits on Aug 5, 2023

  1. Copy the full SHA
    b54fec0 View commit details
  2. Copy the full SHA
    168fbaa View commit details
  3. Copy the full SHA
    fa0f207 View commit details
  4. Copy the full SHA
    457c6f8 View commit details
  5. Copy the full SHA
    4639951 View commit details
  6. Copy the full SHA
    9ce8f83 View commit details
  7. Copy the full SHA
    44ab029 View commit details
  8. Copy the full SHA
    4464a2d View commit details
  9. Copy the full SHA
    55f113c View commit details
  10. Copy the full SHA
    e999e8e View commit details
  11. Merge pull request #6790 from alvasw/gradle_move_seednode_configs_to_…

    …own_build_gradle
    
    seednode: Move build configuration to its own build.gradle
    alejandrogarcia83 authored Aug 5, 2023
    Copy the full SHA
    7a21160 View commit details
  12. Merge pull request #6792 from alvasw/gradle_move_apitest_configs_to_o…

    …wn_build_gradle
    
    apitest: Move build configuration to its own build.gradle
    alejandrogarcia83 authored Aug 5, 2023
    Copy the full SHA
    3b1d79a View commit details

Commits on Aug 6, 2023

  1. Merge pull request #6793 from alvasw/seednode_disable_shadow_jar

    Seednode: Disable ShadowJar
    alejandrogarcia83 authored Aug 6, 2023
    Copy the full SHA
    e735967 View commit details
  2. Merge pull request #6794 from alvasw/gradle_centralize_application_setup

    Gradle: Centralize Application Setup
    alejandrogarcia83 authored Aug 6, 2023
    Copy the full SHA
    f6d7bfc View commit details
  3. Merge pull request #6795 from alvasw/gradle_apply_shadow_only_to_desk…

    …top_module
    
    Gradle: Apply shadow plugin only to desktop module
    alejandrogarcia83 authored Aug 6, 2023
    Copy the full SHA
    0353ff9 View commit details
  4. Merge pull request #6796 from alvasw/move_jvm_args_to_build_gradle_files

    Move JVM args to build.gradle files
    alejandrogarcia83 authored Aug 6, 2023
    Copy the full SHA
    c737a20 View commit details
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -26,6 +26,6 @@ jobs:
distribution: 'zulu'

- name: Build with Gradle
uses: gradle/gradle-build-action@v2.6.1
uses: gradle/gradle-build-action@v2.7.0
with:
arguments: build --scan
2 changes: 1 addition & 1 deletion .github/workflows/codacy-coverage-reporter.yml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ jobs:
distribution: 'zulu'

- name: Build with Gradle
uses: gradle/gradle-build-action@v2.6.1
uses: gradle/gradle-build-action@v2.7.0
with:
arguments: build jacocoTestReport testCodeCoverageReport --scan

104 changes: 103 additions & 1 deletion apitest/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,105 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.application'
}

application {
mainClass = 'bisq.apitest.ApiTestMain'
applicationDefaultJvmArgs = ['-Dlogback.configurationFile=apitest/build/resources/main/logback.xml']
}

// The external dao-setup.gradle file contains tasks to install and clean dao-setup
// files downloaded from
// https://github.com/bisq-network/bisq/raw/master/docs/dao-setup.zip
// These tasks are not run by the default build, but they can can be run during
// full or partial builds, or by themselves.
// To run the regular clean + build + test (non api), and install dao-setup files:
// ./gradlew clean build :apitest:installDaoSetup
// To install or re-install dao-setup file only:
// ./gradlew :apitest:installDaoSetup -x test
// To clean installed dao-setup files:
// ./gradlew :apitest:cleanDaoSetup -x test
apply from: 'dao-setup.gradle'

// We have to disable the :apitest 'test' task by default because we do not want
// to interfere with normal builds. To run JUnit tests in this subproject:
// Run a normal build and install dao-setup files first, then run:
// 'gradle :apitest:test -DrunApiTests=true'
test.enabled = System.getProperty("runApiTests") == "true"

sourceSets {
main {
resources {
exclude 'dao-setup'
exclude 'dao-setup.zip'
}
}
}

test {
outputs.upToDateWhen { false } // Don't use previously cached test outputs.
testLogging {
showStackTraces = true // Show full stack traces in the console.
exceptionFormat = "full"
// Show passed & failed tests, and anything printed to stderr by the tests in the console.
// Do not show skipped tests in the console; they are shown in the html report.
events "passed", "failed", "standardError"
}

afterSuite { desc, result ->
if (!desc.parent) {
println("${result.resultType} " +
"[${result.testCount} tests, " +
"${result.successfulTestCount} passed, " +
"${result.failedTestCount} failed, " +
"${result.skippedTestCount} skipped] html report contains skipped test info")

// Show report link if all tests passed in case you want to see more detail, stdout, skipped, etc.
if (result.resultType == TestResult.ResultType.SUCCESS) {
DirectoryReport htmlReport = getReports().getHtml()
String reportUrl = new org.gradle.internal.logging.ConsoleRenderer()
.asClickableFileUrl(htmlReport.getEntryPoint())
println("REPORT " + reportUrl)
}
}
}
}

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':proto')
implementation project(':common')
implementation project(':core')
implementation project(':seednode')
implementation project(':desktop')
implementation project(':daemon')
implementation project(':cli')
annotationProcessor libs.lombok
compileOnly libs.javax.annotation
compileOnly libs.lombok
implementation libs.logback.classic
implementation libs.logback.core
implementation libs.google.gson
implementation libs.google.guava
implementation libs.jopt
implementation libs.apache.commons.lang3
implementation libs.slf4j.api
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation(libs.grpc.protobuf) {
exclude(module: 'animal-sniffer-annotations')
exclude(module: 'guava')
}
implementation(libs.grpc.stub) {
exclude(module: 'animal-sniffer-annotations')
exclude(module: 'guava')
}
testAnnotationProcessor libs.lombok
testCompileOnly libs.lombok
testRuntimeOnly libs.javax.annotation
}
4 changes: 4 additions & 0 deletions build-logic/commons/build.gradle
Original file line number Diff line number Diff line change
@@ -5,3 +5,7 @@ plugins {
repositories {
gradlePluginPortal()
}

dependencies {
implementation libs.openjfx.javafx.plugin
}
47 changes: 47 additions & 0 deletions build-logic/commons/src/main/groovy/bisq.application.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
plugins {
id 'bisq.java-conventions'
id 'application'
}

build.dependsOn installDist
installDist.destinationDir = file('build/app')
distZip.enabled = false
distTar.enabled = false

// the 'installDist' and 'startScripts' blocks below configure bisq executables to put
// generated shell scripts in the root project directory, such that users can easily
// discover and invoke e.g. ./bisq-desktop, ./bisq-seednode, etc.
// See https://stackoverflow.com/q/46327736 for details.

installDist {
doLast {
// copy generated shell scripts, e.g. `bisq-desktop` directly to the project
// root directory for discoverability and ease of use

copy {
from "$destinationDir/bin"
into rootProject.projectDir
}
// copy libs required for generated shell script classpaths to 'lib' dir under
// the project root directory
copy {
from "$destinationDir/lib"
into "${rootProject.projectDir}/lib"
}

// edit generated shell scripts such that they expect to be executed in the
// project root dir as opposed to a 'bin' subdirectory
def windowsScriptFile = file("${rootProject.projectDir}/bisq-${applicationName}.bat")
windowsScriptFile.text = windowsScriptFile.text.replace(
'set APP_HOME=%DIRNAME%..', 'set APP_HOME=%DIRNAME%')

def unixScriptFile = file("${rootProject.projectDir}/bisq-$applicationName")
unixScriptFile.text = unixScriptFile.text.replace(
'APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit', 'APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit')
}
}

startScripts {
// rename scripts from, e.g. `desktop` to `bisq-desktop`
applicationName = "bisq-$applicationName"
}
7 changes: 7 additions & 0 deletions build-logic/commons/src/main/groovy/bisq.javafx.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
plugins {
id 'org.openjfx.javafxplugin'
}

javafx {
version = "16"
}
473 changes: 0 additions & 473 deletions build.gradle

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.application'
}

distTar.enabled = true
40 changes: 40 additions & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.javafx'
}

javafx {
modules = ['javafx.graphics']
}

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':proto')
annotationProcessor libs.lombok
compileOnly libs.javax.annotation
compileOnly libs.lombok
implementation libs.logback.classic
implementation libs.logback.core
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation libs.google.findbugs
implementation libs.google.gson
implementation libs.google.guava
implementation(libs.google.guice) {
exclude(module: 'guava')
}
implementation libs.commons.io
implementation libs.jopt
implementation libs.apache.commons.lang3
implementation libs.bouncycastle.bcpg.jdk15on
implementation libs.kotlin.stdlib.jdk8
implementation libs.jetbrains.annotations
implementation libs.slf4j.api
runtimeOnly(libs.grpc.netty.shaded) {
exclude(module: 'animal-sniffer-annotations')
exclude(module: 'guava')
}
}
65 changes: 65 additions & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,68 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.javafx'
}

javafx {
modules = ['javafx.base']
}

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':proto')
implementation project(':assets')
implementation project(':common')
implementation project(':p2p')
annotationProcessor libs.lombok
compileOnly libs.javax.annotation
compileOnly libs.lombok
implementation libs.logback.classic
implementation libs.logback.core
implementation libs.jackson.annotations
implementation libs.jackson.core
implementation libs.google.findbugs
implementation libs.google.gson
implementation libs.google.guava
implementation libs.commons.codec
implementation libs.commons.io
implementation libs.jopt
implementation libs.apache.commons.lang3
implementation libs.apache.httpcore
implementation libs.fxmisc.easybind
implementation libs.jetbrains.annotations
implementation libs.slf4j.api
implementation(libs.jackson.databind) {
exclude(module: 'jackson-annotations')
}
implementation(libs.netlayer.tor.external) {
exclude(module: 'slf4j-api')
}
implementation(libs.netlayer.tor.native) {
exclude(module: 'slf4j-api')
}
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation(libs.jsonrpc4j) {
exclude(module: 'base64')
exclude(module: 'httpcore-nio')
}
implementation(libs.google.guice) {
exclude(module: 'guava')
}
implementation(libs.apache.httpclient) {
exclude(module: 'commons-codec')
}
testAnnotationProcessor libs.lombok
testCompileOnly libs.lombok
testImplementation libs.natpryce.make.it.easy
}

test {
systemProperty 'jdk.attach.allowAttachSelf', true
}
2 changes: 1 addition & 1 deletion daemon/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.application'
}

distTar.enabled = true
80 changes: 79 additions & 1 deletion desktop/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,81 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.application'
id 'bisq.javafx'
id "com.github.johnrengelman.shadow" version "5.2.0"
}

application {
mainClass = 'bisq.desktop.app.BisqAppMain'
applicationDefaultJvmArgs = ['-XX:MaxRAM=8g', '-Xss1280k', '-XX:+UseG1GC', '-XX:MaxHeapFreeRatio=10',
'-XX:MinHeapFreeRatio=5', '-XX:+UseStringDeduplication',
'-Djava.net.preferIPv4Stack=true']
}

apply from: 'package/package.gradle'

shadowDistTar.enabled = false
shadowDistZip.enabled = false

javafx {
modules = ['javafx.controls', 'javafx.fxml']
}

version = file("src/main/resources/version.txt").text.trim()

jar.manifest.attributes(
"Implementation-Title": project.name,
"Implementation-Version": version)

mainClassName = 'bisq.desktop.app.BisqAppMain'

jar {
preserveFileTimestamps = false
reproducibleFileOrder = true
}

sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':assets')
implementation project(':common')
implementation project(':proto')
implementation project(':p2p')
implementation project(':core')
annotationProcessor libs.lombok
compileOnly libs.lombok
implementation libs.logback.classic
implementation libs.logback.core
implementation libs.google.gson
implementation libs.google.guava
implementation libs.jcsv
implementation libs.jfoenix
implementation libs.commons.io
implementation libs.fontawesomefx
implementation libs.fontawesomefx.commons
implementation libs.fontawesomefx.materialdesign.font
implementation libs.qrgen
implementation libs.apache.commons.lang3
implementation libs.bouncycastle.bcpg.jdk15on
implementation libs.fxmisc.easybind
implementation libs.jetbrains.annotations
implementation libs.slf4j.api
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation(libs.google.guice) {
exclude(module: 'guava')
}
testAnnotationProcessor libs.lombok
testCompileOnly libs.lombok
testImplementation libs.natpryce.make.it.easy
}

test {
systemProperty 'jdk.attach.allowAttachSelf', true
}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ lombok = { strictly = '1.18.22' }
mockito = { strictly = '4.0.0' }
natpryce-make-it-easy = { strictly = '4.0.1' }
netlayer = { strictly = '0.7.6' }
openjfx-javafx-plugin = { strictly = '0.0.10' }
protobuf = { strictly = '3.19.1' }
qrgen = { strictly = '1.3' }
slf4j = { strictly = '1.7.30' }
@@ -103,6 +104,7 @@ natpryce-make-it-easy = { module = "com.natpryce:make-it-easy", version.ref = "n
netlayer-tor-external = { module = "com.github.bisq-network.netlayer:tor.external", version.ref = "netlayer" }
netlayer-tor-native = { module = "com.github.bisq-network.netlayer:tor.native", version.ref = "netlayer" }

openjfx-javafx-plugin = { module = "org.openjfx:javafx-plugin", version.ref = "openjfx-javafx-plugin" }
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
qrgen = { module = "net.glxn:qrgen", version.ref = "qrgen" }
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
5 changes: 5 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
@@ -249,6 +249,11 @@
<sha256 value="54468f4cf5d16864b46dca4e96cd9359a6b720a3cfbff6d403f2486e31cf88f9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="5.2.0">
<artifact name="com.github.johnrengelman.shadow.gradle.plugin-5.2.0.pom">
<sha256 value="3d7e7bd33bb8b7b67db9e45601cc5f0a2080bc4ce830d976b1ad2f3e4a091a0b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google" name="google" version="1">
<artifact name="google-1.pom">
<sha256 value="cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81" origin="Generated by Gradle"/>
41 changes: 41 additions & 0 deletions p2p/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.javafx'
}

javafx {
modules = ['javafx.base']
}

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':proto')
implementation project(':common')
annotationProcessor libs.lombok
compileOnly libs.lombok
implementation libs.google.guava
implementation libs.fxmisc.easybind
implementation libs.slf4j.api
implementation(libs.netlayer.tor.external) {
exclude(module: 'slf4j-api')
}
implementation(libs.netlayer.tor.native) {
exclude(module: 'slf4j-api')
}
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation(libs.google.guice) {
exclude(module: 'guava')
}
implementation(libs.apache.httpclient) {
exclude(module: 'commons-codec')
}
testAnnotationProcessor libs.lombok
testCompileOnly libs.lombok
testImplementation libs.logback.classic
testImplementation libs.logback.core
testImplementation libs.apache.commons.lang3
}
20 changes: 19 additions & 1 deletion seednode/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.application'
}

mainClassName = 'bisq.seednode.SeedNodeMain'

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':common')
implementation project(':proto')
implementation project(':p2p')
implementation project(':core')
implementation libs.protobuf.java
annotationProcessor libs.lombok
compileOnly libs.lombok
implementation libs.google.guava
implementation libs.slf4j.api
implementation(libs.google.guice) {
exclude(module: 'guava')
}
}
16 changes: 15 additions & 1 deletion statsnode/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
plugins {
id 'bisq.java-conventions'
id 'bisq.application'
}

mainClassName = 'bisq.statistics.StatisticsMain'

dependencies {
implementation project(':common')
implementation project(':p2p')
implementation project(':core')
annotationProcessor libs.lombok
compileOnly libs.lombok
implementation libs.slf4j.api
implementation(libs.google.guice) {
exclude(module: 'guava')
}
}