mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
Merge branch 'master' into release-candidate-0.9.0
# Conflicts: # gradle/witness/gradle-witness.gradle
This commit is contained in:
Manfred Karrer
commit
b6361b5ed2
8
CODEOWNERS
Normal file
8
CODEOWNERS
Normal file
@ -0,0 +1,8 @@
|
||||
# This doc specifies who gets requested to review GitHub pull requests.
|
||||
# See https://help.github.com/articles/about-codeowners/.
|
||||
|
||||
* @ManfredKarrer
|
||||
/assets/ @blabno
|
||||
/desktop/ @ripcurlx @ManfredKarrer
|
||||
*gradle* @cbeams
|
||||
/pricenode/ @cbeams
|
||||
@ -1,38 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'maven'
|
||||
}
|
||||
|
||||
group 'network.bisq'
|
||||
version '-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
|
||||
javadoc {
|
||||
options.author = true
|
||||
options.addStringOption('Xdoclint:none', '-quiet')
|
||||
}
|
||||
|
||||
task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||
classifier = 'javadoc'
|
||||
from javadoc.destinationDir
|
||||
}
|
||||
|
||||
artifacts {
|
||||
archives javadocJar
|
||||
}
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':common')
|
||||
compile 'commons-codec:commons-codec:1.9'
|
||||
testCompile 'junit:junit:4.12'
|
||||
}
|
||||
@ -17,8 +17,6 @@
|
||||
|
||||
package bisq.asset;
|
||||
|
||||
import bisq.common.util.Tuple2;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
public class PrintTool {
|
||||
@ -31,14 +29,24 @@ public class PrintTool {
|
||||
.sorted(Comparator.comparing(o -> o.getName().toLowerCase()))
|
||||
.filter(e -> !e.getTickerSymbol().equals("BSQ")) // BSQ is not out yet...
|
||||
.filter(e -> !e.getTickerSymbol().equals("BTC"))
|
||||
.map(e -> new Tuple2(e.getName(), e.getTickerSymbol())) // We want to get rid of duplicated entries for regtest/testnet...
|
||||
.map(e -> new Pair(e.getName(), e.getTickerSymbol())) // We want to get rid of duplicated entries for regtest/testnet...
|
||||
.distinct()
|
||||
.forEach(e -> sb.append("<li>“")
|
||||
.append(e.second)
|
||||
.append(e.right)
|
||||
.append("”, “")
|
||||
.append(e.first)
|
||||
.append(e.left)
|
||||
.append("”</li>")
|
||||
.append("\n"));
|
||||
System.out.println(sb.toString());
|
||||
}
|
||||
|
||||
private static class Pair {
|
||||
String left;
|
||||
String right;
|
||||
|
||||
Pair(String left, String right) {
|
||||
this.left = left;
|
||||
this.right = right;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
320
build.gradle
320
build.gradle
@ -1,3 +1,319 @@
|
||||
plugins {
|
||||
id 'java-base'
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5'
|
||||
classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
|
||||
classpath files('gradle/witness/gradle-witness.jar')
|
||||
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.5.10.RELEASE'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(subprojects) {
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'com.google.osdetector'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
ext {
|
||||
bcVersion = '1.56'
|
||||
codecVersion = '1.9'
|
||||
easyVersion = '4.0.1'
|
||||
jmockitVersion = '1.42'
|
||||
joptVersion = '5.0.3'
|
||||
langVersion = '3.4'
|
||||
libdohjVersion = 'd4ace7bc'
|
||||
lombokVersion = '1.18.2'
|
||||
mockitoVersion = '2.21.0'
|
||||
powermockVersion = '2.0.0-beta.5'
|
||||
protobufVersion = '3.5.1'
|
||||
sparkVersion = '2.5.2'
|
||||
springVersion = '4.3.6.RELEASE'
|
||||
|
||||
os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
|
||||
}
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile 'junit:junit:4.12'
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure([project(':desktop'),
|
||||
project(':monitor'),
|
||||
project(':relay'),
|
||||
project(':seednode'),
|
||||
project(':statsnode')]) {
|
||||
apply plugin: 'application'
|
||||
|
||||
build.dependsOn installDist
|
||||
installDist.destinationDir = file('build/app')
|
||||
distZip.enabled = false
|
||||
}
|
||||
|
||||
|
||||
configure(project(':assets')) {
|
||||
dependencies {
|
||||
compile("network.bisq.libdohj:libdohj-core:$libdohjVersion") {
|
||||
exclude(module: 'protobuf-java')
|
||||
}
|
||||
compile "commons-codec:commons-codec:$codecVersion"
|
||||
compile "org.apache.commons:commons-lang3:$langVersion"
|
||||
compile "org.bouncycastle:bcpg-jdk15on:$bcVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':common')) {
|
||||
apply plugin: 'com.google.protobuf'
|
||||
|
||||
sourceSets.main.java.srcDir "$buildDir/generated/source/proto/main/java"
|
||||
|
||||
protobuf {
|
||||
protoc {
|
||||
artifact = "com.google.protobuf:protoc:$protobufVersion"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.openjfx:javafx-base:11:$os"
|
||||
compile "org.openjfx:javafx-graphics:11:$os"
|
||||
compile "com.google.protobuf:protobuf-java:$protobufVersion"
|
||||
compile 'com.google.code.gson:gson:2.7'
|
||||
compile('com.googlecode.json-simple:json-simple:1.1.1') {
|
||||
exclude(module: 'junit')
|
||||
}
|
||||
compile "org.springframework:spring-core:$springVersion"
|
||||
compile 'org.slf4j:slf4j-api:1.7.22'
|
||||
compile 'ch.qos.logback:logback-core:1.1.10'
|
||||
compile 'ch.qos.logback:logback-classic:1.1.10'
|
||||
compile 'com.google.code.findbugs:jsr305:3.0.1'
|
||||
compile 'com.google.guava:guava:20.0'
|
||||
compile('com.google.inject:guice:4.1.0') {
|
||||
exclude(module: 'guava')
|
||||
}
|
||||
compile("network.bisq.libdohj:libdohj-core:$libdohjVersion") {
|
||||
exclude(module: 'jsr305')
|
||||
exclude(module: 'slf4j-api')
|
||||
exclude(module: 'guava')
|
||||
exclude(module: 'protobuf-java')
|
||||
}
|
||||
compile 'org.jetbrains:annotations:13.0'
|
||||
runtime "org.bouncycastle:bcprov-jdk15on:$bcVersion"
|
||||
compile "org.bouncycastle:bcpg-jdk15on:$bcVersion"
|
||||
compile 'commons-io:commons-io:2.4'
|
||||
compile "org.apache.commons:commons-lang3:$langVersion"
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':p2p')) {
|
||||
dependencies {
|
||||
compile project(':common')
|
||||
compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.2') {
|
||||
exclude(module: 'slf4j-api')
|
||||
}
|
||||
compile('org.apache.httpcomponents:httpclient:4.5.3') {
|
||||
exclude(module: 'commons-logging')
|
||||
}
|
||||
compile "net.sf.jopt-simple:jopt-simple:$joptVersion"
|
||||
compile 'org.fxmisc.easybind:easybind:1.0.3'
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
testCompile 'org.jmockit:jmockit:1.30' // must not use current $jmockitVersion
|
||||
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':core')) {
|
||||
dependencies {
|
||||
compile project(':assets')
|
||||
compile project(':p2p')
|
||||
compile "net.sf.jopt-simple:jopt-simple:$joptVersion"
|
||||
compile('network.bisq.btcd-cli4j:btcd-cli4j-core:3864e1c4') {
|
||||
exclude(module: 'slf4j-api')
|
||||
exclude(module: 'httpclient')
|
||||
exclude(module: 'commons-lang3')
|
||||
exclude(module: 'jackson-core')
|
||||
exclude(module: 'jackson-annotations')
|
||||
exclude(module: 'jackson-databind')
|
||||
}
|
||||
compile('network.bisq.btcd-cli4j:btcd-cli4j-daemon:3864e1c4') {
|
||||
exclude(module: 'slf4j-api')
|
||||
exclude(module: 'httpclient')
|
||||
exclude(module: 'commons-lang3')
|
||||
exclude(module: 'jackson-core')
|
||||
exclude(module: 'jackson-annotations')
|
||||
exclude(module: 'jackson-databind')
|
||||
}
|
||||
compile 'com.fasterxml.jackson.core:jackson-core:2.8.10'
|
||||
compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.10'
|
||||
compile('com.fasterxml.jackson.core:jackson-databind:2.8.10') {
|
||||
exclude(module: 'jackson-annotations')
|
||||
}
|
||||
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
|
||||
testCompile "org.jmockit:jmockit:$jmockitVersion"
|
||||
testCompile("org.mockito:mockito-core:$mockitoVersion") {
|
||||
exclude(module: 'objenesis')
|
||||
}
|
||||
testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
|
||||
testCompile "org.powermock:powermock-api-mockito2:$powermockVersion"
|
||||
testCompile "org.springframework:spring-test:$springVersion"
|
||||
testCompile "com.natpryce:make-it-easy:$easyVersion"
|
||||
testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
|
||||
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
|
||||
test {
|
||||
systemProperty 'jdk.attach.allowAttachSelf', true
|
||||
|
||||
def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
|
||||
jvmArgs "-javaagent:$jmockit"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':desktop')) {
|
||||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
apply plugin: 'witness'
|
||||
apply from: '../gradle/witness/gradle-witness.gradle'
|
||||
|
||||
version = '0.8.0-SNAPSHOT'
|
||||
|
||||
mainClassName = 'bisq.desktop.app.BisqAppMain'
|
||||
|
||||
tasks.withType(AbstractArchiveTask) {
|
||||
preserveFileTimestamps = false
|
||||
reproducibleFileOrder = true
|
||||
}
|
||||
|
||||
sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
|
||||
|
||||
dependencies {
|
||||
compile project(':p2p')
|
||||
compile project(':core')
|
||||
compile project(':common')
|
||||
compile 'org.controlsfx:controlsfx:8.0.6_20'
|
||||
compile 'org.reactfx:reactfx:2.0-M3'
|
||||
compile 'net.glxn:qrgen:1.3'
|
||||
compile 'de.jensd:fontawesomefx:8.0.0'
|
||||
compile 'de.jensd:fontawesomefx-commons:9.1.2'
|
||||
compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2'
|
||||
compile 'com.googlecode.jcsv:jcsv:1.4.0'
|
||||
compile 'com.github.sarxos:webcam-capture:0.3.12'
|
||||
compile "org.openjfx:javafx-controls:11:$os"
|
||||
compile "org.openjfx:javafx-fxml:11:$os"
|
||||
compile "org.openjfx:javafx-swing:11:$os"
|
||||
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
|
||||
testCompile "org.jmockit:jmockit:$jmockitVersion"
|
||||
testCompile("org.mockito:mockito-core:$mockitoVersion") {
|
||||
exclude(module: 'objenesis')
|
||||
}
|
||||
testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
|
||||
testCompile "org.powermock:powermock-api-mockito2:$powermockVersion"
|
||||
testCompile "org.springframework:spring-test:$springVersion"
|
||||
testCompile "com.natpryce:make-it-easy:$easyVersion"
|
||||
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':monitor')) {
|
||||
mainClassName = 'bisq.monitor.MonitorMain'
|
||||
|
||||
dependencies {
|
||||
compile project(':core')
|
||||
compile "com.sparkjava:spark-core:$sparkVersion"
|
||||
compile 'net.gpedro.integrations.slack:slack-webhook:1.1.1'
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':pricenode')) {
|
||||
apply plugin: "org.springframework.boot"
|
||||
|
||||
version = file("src/main/resources/version.txt").text
|
||||
|
||||
jar.manifest.attributes(
|
||||
"Implementation-Title": project.name,
|
||||
"Implementation-Version": version)
|
||||
|
||||
dependencies {
|
||||
compile project(":core")
|
||||
compile project(":assets")
|
||||
compile("org.knowm.xchange:xchange-bitcoinaverage:4.3.3")
|
||||
compile("org.knowm.xchange:xchange-coinmarketcap:4.3.3")
|
||||
compile("org.knowm.xchange:xchange-poloniex:4.3.3")
|
||||
compile("org.springframework.boot:spring-boot-starter-web:1.5.10.RELEASE")
|
||||
compile("org.springframework.boot:spring-boot-starter-actuator")
|
||||
}
|
||||
|
||||
task stage {
|
||||
dependsOn assemble
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':relay')) {
|
||||
mainClassName = 'bisq.relay.RelayMain'
|
||||
|
||||
dependencies {
|
||||
compile project(':common')
|
||||
compile "com.sparkjava:spark-core:$sparkVersion"
|
||||
compile 'com.turo:pushy:0.13.2'
|
||||
compile 'com.google.firebase:firebase-admin:6.2.0'
|
||||
compile "commons-codec:commons-codec:$codecVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':seednode')) {
|
||||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
|
||||
mainClassName = 'bisq.seednode.SeedNodeMain'
|
||||
|
||||
dependencies {
|
||||
compile project(':core')
|
||||
runtime "org.bouncycastle:bcprov-jdk15on:$bcVersion"
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
configure(project(':statsnode')) {
|
||||
mainClassName = 'bisq.statistics.StatisticsMain'
|
||||
|
||||
dependencies {
|
||||
compile project(':core')
|
||||
compileOnly "org.projectlombok:lombok:$lombokVersion"
|
||||
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
// Note, version 1.6.0 of osdetector-gradle-plugin cannot be applied with a plugins block
|
||||
// So a buildscript block is used
|
||||
// See https://github.com/google/osdetector-gradle-plugin/issues/15
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'maven'
|
||||
id 'com.google.protobuf' version '0.8.5'
|
||||
}
|
||||
|
||||
apply plugin: 'com.google.osdetector'
|
||||
|
||||
ext {
|
||||
protobufVersion = '3.5.1'
|
||||
platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
|
||||
}
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
|
||||
sourceSets.main.java.srcDir "$buildDir/generated/source/proto/main/java"
|
||||
|
||||
protobuf {
|
||||
protoc {
|
||||
artifact = "com.google.protobuf:protoc:$protobufVersion"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.openjfx:javafx-base:11:$platform"
|
||||
compile "org.openjfx:javafx-graphics:11:$platform"
|
||||
compile "org.openjfx:javafx-controls:11:$platform"
|
||||
compile "org.openjfx:javafx-fxml:11:$platform"
|
||||
compile "org.openjfx:javafx-swing:11:$platform"
|
||||
|
||||
compile "com.google.protobuf:protobuf-java:$protobufVersion"
|
||||
compile 'com.google.code.gson:gson:2.7'
|
||||
compile('com.googlecode.json-simple:json-simple:1.1.1') {
|
||||
exclude(module: 'junit')
|
||||
}
|
||||
compile 'org.springframework:spring-core:4.3.6.RELEASE'
|
||||
compile 'org.slf4j:slf4j-api:1.7.22'
|
||||
compile 'ch.qos.logback:logback-core:1.1.10'
|
||||
compile 'ch.qos.logback:logback-classic:1.1.10'
|
||||
compile 'com.google.code.findbugs:jsr305:3.0.1'
|
||||
compile 'com.google.guava:guava:20.0'
|
||||
compile('com.google.inject:guice:4.1.0') {
|
||||
exclude(module: 'guava')
|
||||
}
|
||||
compile('network.bisq.libdohj:libdohj-core:d4ace7bc') {
|
||||
exclude(module: 'jsr305')
|
||||
exclude(module: 'slf4j-api')
|
||||
exclude(module: 'guava')
|
||||
exclude(module: 'protobuf-java')
|
||||
}
|
||||
compile 'org.jetbrains:annotations:13.0'
|
||||
runtime 'org.bouncycastle:bcprov-jdk15on:1.56'
|
||||
compile 'org.bouncycastle:bcpg-jdk15on:1.56'
|
||||
compile 'commons-io:commons-io:2.4'
|
||||
compile 'org.apache.commons:commons-lang3:3.4'
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
testCompile 'junit:junit:4.12'
|
||||
|
||||
compile "org.openjfx:javafx-base:11:$platform"
|
||||
compile "org.openjfx:javafx-graphics:11:$platform"
|
||||
compile "org.openjfx:javafx-controls:11:$platform"
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'maven'
|
||||
}
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
|
||||
def jmockitVersion = '1.42'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':assets')
|
||||
compile project(':p2p')
|
||||
compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
|
||||
compile('network.bisq.btcd-cli4j:btcd-cli4j-core:3864e1c4') {
|
||||
exclude(module: 'slf4j-api')
|
||||
exclude(module: 'httpclient')
|
||||
exclude(module: 'commons-lang3')
|
||||
exclude(module: 'jackson-core')
|
||||
exclude(module: 'jackson-annotations')
|
||||
exclude(module: 'jackson-databind')
|
||||
}
|
||||
compile('network.bisq.btcd-cli4j:btcd-cli4j-daemon:3864e1c4') {
|
||||
exclude(module: 'slf4j-api')
|
||||
exclude(module: 'httpclient')
|
||||
exclude(module: 'commons-lang3')
|
||||
exclude(module: 'jackson-core')
|
||||
exclude(module: 'jackson-annotations')
|
||||
exclude(module: 'jackson-databind')
|
||||
}
|
||||
compile 'com.fasterxml.jackson.core:jackson-core:2.8.10'
|
||||
compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.10'
|
||||
compile('com.fasterxml.jackson.core:jackson-databind:2.8.10') {
|
||||
exclude(module: 'jackson-annotations')
|
||||
}
|
||||
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
|
||||
testCompile "org.jmockit:jmockit:$jmockitVersion"
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile('org.mockito:mockito-core:2.21.0') {
|
||||
exclude(module: 'objenesis')
|
||||
}
|
||||
testCompile 'org.powermock:powermock-module-junit4:2.0.0-beta.5'
|
||||
testCompile 'org.powermock:powermock-api-mockito2:2.0.0-beta.5'
|
||||
|
||||
|
||||
testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
|
||||
testCompile 'com.natpryce:make-it-easy:4.0.1'
|
||||
testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
|
||||
testCompileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
|
||||
test {
|
||||
systemProperty 'jdk.attach.allowAttachSelf', true
|
||||
|
||||
def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
|
||||
jvmArgs "-javaagent:$jmockit"
|
||||
}
|
||||
|
||||
@ -1,161 +0,0 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
|
||||
classpath files('gradle/witness/gradle-witness.jar')
|
||||
classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'application'
|
||||
apply plugin: 'maven'
|
||||
apply plugin: 'witness'
|
||||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
apply plugin: 'com.google.osdetector'
|
||||
|
||||
ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '0.8.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
mainClassName = 'bisq.desktop.app.BisqAppMain'
|
||||
|
||||
def jmockitVersion = '1.42'
|
||||
|
||||
tasks.withType(AbstractArchiveTask) {
|
||||
preserveFileTimestamps = false
|
||||
reproducibleFileOrder = true
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
|
||||
sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
maven { url 'https://dl.bintray.com/jerady/maven' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// fixme(chirhonul): currently 'gradle install' using system gradle 4.9 fails with:
|
||||
// A POM cannot have multiple artifacts with the same type and classifier. Already have MavenArtifact bisq:zip:zip:null, trying to add MavenArtifact bisq:zip:zip:null.
|
||||
compile project(':p2p')
|
||||
compile project(':core')
|
||||
compile project(':common')
|
||||
compile 'org.controlsfx:controlsfx:8.0.6_20'
|
||||
compile 'org.reactfx:reactfx:2.0-M3'
|
||||
compile 'net.glxn:qrgen:1.3'
|
||||
compile 'de.jensd:fontawesomefx:8.0.0'
|
||||
compile 'de.jensd:fontawesomefx-commons:9.1.2'
|
||||
compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2'
|
||||
compile 'com.googlecode.jcsv:jcsv:1.4.0'
|
||||
compile 'com.github.sarxos:webcam-capture:0.3.12'
|
||||
compile 'com.jfoenix:jfoenix:9.0.6'
|
||||
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
|
||||
testCompile "org.jmockit:jmockit:$jmockitVersion"
|
||||
testCompile('org.mockito:mockito-core:2.21.0') {
|
||||
exclude(module: 'objenesis')
|
||||
}
|
||||
testCompile 'org.powermock:powermock-module-junit4:2.0.0-beta.5'
|
||||
testCompile 'org.powermock:powermock-api-mockito2:2.0.0-beta.5'
|
||||
testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
|
||||
testCompile 'com.natpryce:make-it-easy:4.0.1'
|
||||
testCompileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
|
||||
test {
|
||||
systemProperty 'jdk.attach.allowAttachSelf', true
|
||||
|
||||
def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
|
||||
jvmArgs "-javaagent:$jmockit"
|
||||
}
|
||||
build.dependsOn installDist
|
||||
installDist.destinationDir = file('build/app')
|
||||
|
||||
// To update the `dependencyVerification` block below:
|
||||
//
|
||||
// 1. Remove the block entirely
|
||||
// 2. Replace the block with the following command:
|
||||
//
|
||||
// ./gradlew -q calculateChecksums | grep -v network.bisq >> desktop/build.gradle
|
||||
//
|
||||
// 3. Run `git diff` to verify that expected hashes have changed
|
||||
// 4. Commit the changes
|
||||
|
||||
dependencyVerification {
|
||||
verify = [
|
||||
'org.controlsfx:controlsfx:b98f1c9507c05600f80323674b33d15674926c71b0116f70085b62bdacf1e573',
|
||||
'org.reactfx:reactfx:81ec8fe545d65661222735711114c2ce427e2187a65f1722e8ac4e4805beeca3',
|
||||
'net.glxn:qrgen:c85d9d8512d91e8ad11fe56259a7825bd50ce0245447e236cf168d1b17591882',
|
||||
'de.jensd:fontawesomefx:73bacc991a0a6f5cf0f911767c8db161e0949dbca61e8371eb4342e3da96887b',
|
||||
'de.jensd:fontawesomefx-materialdesignfont:dbad8dfdd1c85e298d5bbae25b2399aec9e85064db57b2427d10f3815aa98752',
|
||||
'de.jensd:fontawesomefx-commons:5539bb3335ecb822dbf928546f57766eeb9f1516cc1417a064b5709629612149',
|
||||
'com.googlecode.jcsv:jcsv:73ca7d715e90c8d2c2635cc284543b038245a34f70790660ed590e157b8714a2',
|
||||
'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6',
|
||||
'com.github.JesusMcCloud.netlayer:tor.native:de44e782b21838d3426dbff99abbfd1cbb8e5d3f6d5e997441ff4fd8354934fa',
|
||||
'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135',
|
||||
'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342',
|
||||
'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf',
|
||||
'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
|
||||
'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
|
||||
'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
|
||||
'com.google.protobuf:protobuf-java:b5e2d91812d183c9f053ffeebcbcda034d4de6679521940a19064714966c2cd4',
|
||||
'com.google.code.gson:gson:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
|
||||
'com.googlecode.json-simple:json-simple:4e69696892b88b41c55d49ab2fdcc21eead92bf54acc588c0050596c3b75199c',
|
||||
'org.springframework:spring-core:c451e8417adb2ffb2445636da5e44a2f59307c4100037a1fe387c3fba4f29b52',
|
||||
'ch.qos.logback:logback-classic:e66efc674e94837344bc5b748ff510c37a44eeff86cbfdbf9e714ef2eb374013',
|
||||
'org.slf4j:slf4j-api:3a4cd4969015f3beb4b5b4d81dbafc01765fb60b8a439955ca64d8476fef553e',
|
||||
'ch.qos.logback:logback-core:4cd46fa17d77057b39160058df2f21ebbc2aded51d0edcc25d2c1cecc042a005',
|
||||
'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',
|
||||
'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8',
|
||||
'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e',
|
||||
'com.github.JesusMcCloud.netlayer:tor:3896950c56a41985f901ff9475524ac162cba18b2d5a0ed39810b20ddaf5128a',
|
||||
'org.jetbrains.kotlin:kotlin-stdlib-jdk8:841b021d62fc007ce2883963ff9440d5393fb1f6a0604ed68cd016afcaf02967',
|
||||
'com.github.MicroUtils:kotlin-logging:7dbd501cc210d721f730d480c53ee2a6e3c154ae89b07dc7dee224b9c5aca9eb',
|
||||
'org.jetbrains.kotlin:kotlin-stdlib-jdk7:bd8cd4e3ef391cd468434747b7939c49e80f8bf4ae10355a65382bfb54fd633c',
|
||||
'org.jetbrains.kotlin:kotlin-stdlib:e1c39d27f23a7fe2d3e4ac65e80a53e98fdcf60e07de9d53b8b841c5944fc810',
|
||||
'org.jetbrains:annotations:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
|
||||
'org.bouncycastle:bcpg-jdk15on:de3355b821fc81dd32e1f3f560d5b3eca1c678fd2400011d0bfc69fb91bcde85',
|
||||
'commons-io:commons-io:cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581',
|
||||
'org.apache.commons:commons-lang3:734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b',
|
||||
'org.bouncycastle:bcprov-jdk15on:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
|
||||
'com.google.zxing:javase:0ec23e2ec12664ddd6347c8920ad647bb3b9da290f897a88516014b56cc77eb9',
|
||||
'com.nativelibs4java:bridj:101bcd9b6637e6bc16e56deb3daefba62b1f5e8e9e37e1b3e56e3b5860d659cf',
|
||||
'com.cedricwalter:tor-binary-macos:87790e9eade1e44eeadc81f92670f338cd47ef1b39b46a4b022c75d0cf6465fd',
|
||||
'com.cedricwalter:tor-binary-linux32:814f6da3b662c96490bcb09781764dd31dfe497ea9c25c73fe61170d2a78086f',
|
||||
'com.cedricwalter:tor-binary-linux64:9da7f8a166ad0a767a5373ca67c68971c9c0cac17964eed2e0850bfecc228312',
|
||||
'com.cedricwalter:tor-binary-windows:9487a735dadcadc6ede5ffad36a911c2d4a484f996be93d71094f26591b8c29e',
|
||||
'com.github.ravn:jsocks:3c71600af027b2b6d4244e4ad14d98ff2352a379410daebefff5d8cd48d742a4',
|
||||
'org.apache.httpcomponents:httpcore:d7f853dee87680b07293d30855b39b9eb56c1297bd16ff1cd6f19ddb8fa745fb',
|
||||
'commons-codec:commons-codec:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
|
||||
'commons-logging:commons-logging:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
|
||||
'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
|
||||
'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',
|
||||
'com.github.bisq-network.bitcoinj:bitcoinj-core:15e0f4304dd92259c4e9ff0114cbeab7a79abb51a5817b422ce629d3a0a2d551',
|
||||
'com.lambdaworks:scrypt:9a82d218099fb14c10c0e86e7eefeebd8c104de920acdc47b8b4b7a686fb73b4',
|
||||
'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',
|
||||
'com.cedricwalter:tor-binary-geoip:7fc7b5ebf80d65ec53d97dd8d3878b8d2c85dc04f3943e5e85e7ba641655492b',
|
||||
'com.github.JesusMcCloud:jtorctl:c6ef92e46074d8d26db718ce0fe4b64b8cf7b934b7377d164c5d613b4cd7b847',
|
||||
'org.apache.commons:commons-compress:a778bbd659722889245fc52a0ec2873fbbb89ec661bc1ad3dc043c0757c784c4',
|
||||
'org.tukaani:xz:a594643d73cc01928cf6ca5ce100e094ea9d73af760a5d4fb6b75fa673ecec96',
|
||||
'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
|
||||
'net.jcip:jcip-annotations:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
|
||||
'org.bitcoinj:orchid:f836325cfa0466a011cb755c9b0fee6368487a2352eb45f4306ad9e4c18de080',
|
||||
'com.squareup.okhttp:okhttp:b4c943138fcef2bcc9d2006b2250c4aabbedeafc5947ed7c0af7fd103ceb2707',
|
||||
'org.objenesis:objenesis:5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d',
|
||||
'com.squareup.okio:okio:114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266',
|
||||
]
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
See https://github.com/signalapp/gradle-witness#using-witness
|
||||
BIN
desktop/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
desktop/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,6 +0,0 @@
|
||||
#Thu Aug 16 20:34:11 CEST 2018
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
|
||||
@ -1,2 +0,0 @@
|
||||
rootProject.name = 'bisq-desktop'
|
||||
include 'common', 'core', 'p2p', 'assets'
|
||||
76
gradle/witness/gradle-witness.gradle
Normal file
76
gradle/witness/gradle-witness.gradle
Normal file
@ -0,0 +1,76 @@
|
||||
// To update the `dependencyVerification` block below:
|
||||
//
|
||||
// 1. Remove the block entirely
|
||||
// 2. Replace the block with the following command:
|
||||
//
|
||||
// ./gradlew -q calculateChecksums | grep -v network.bisq >> gradle/witness/gradle-witness.gradle
|
||||
//
|
||||
// 3. Run `git diff` to verify that expected hashes have changed
|
||||
// 4. Commit the changes
|
||||
//
|
||||
// See https://github.com/signalapp/gradle-witness#using-witness for further details.
|
||||
|
||||
dependencyVerification {
|
||||
verify = [
|
||||
'org.controlsfx:controlsfx:b98f1c9507c05600f80323674b33d15674926c71b0116f70085b62bdacf1e573',
|
||||
'org.reactfx:reactfx:81ec8fe545d65661222735711114c2ce427e2187a65f1722e8ac4e4805beeca3',
|
||||
'net.glxn:qrgen:c85d9d8512d91e8ad11fe56259a7825bd50ce0245447e236cf168d1b17591882',
|
||||
'de.jensd:fontawesomefx:73bacc991a0a6f5cf0f911767c8db161e0949dbca61e8371eb4342e3da96887b',
|
||||
'de.jensd:fontawesomefx-materialdesignfont:dbad8dfdd1c85e298d5bbae25b2399aec9e85064db57b2427d10f3815aa98752',
|
||||
'de.jensd:fontawesomefx-commons:5539bb3335ecb822dbf928546f57766eeb9f1516cc1417a064b5709629612149',
|
||||
'com.googlecode.jcsv:jcsv:73ca7d715e90c8d2c2635cc284543b038245a34f70790660ed590e157b8714a2',
|
||||
'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6',
|
||||
'com.github.JesusMcCloud.netlayer:tor.native:de44e782b21838d3426dbff99abbfd1cbb8e5d3f6d5e997441ff4fd8354934fa',
|
||||
'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135',
|
||||
'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342',
|
||||
'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf',
|
||||
'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
|
||||
'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
|
||||
'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
|
||||
'com.google.protobuf:protobuf-java:b5e2d91812d183c9f053ffeebcbcda034d4de6679521940a19064714966c2cd4',
|
||||
'com.google.code.gson:gson:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
|
||||
'com.googlecode.json-simple:json-simple:4e69696892b88b41c55d49ab2fdcc21eead92bf54acc588c0050596c3b75199c',
|
||||
'org.springframework:spring-core:c451e8417adb2ffb2445636da5e44a2f59307c4100037a1fe387c3fba4f29b52',
|
||||
'ch.qos.logback:logback-classic:e66efc674e94837344bc5b748ff510c37a44eeff86cbfdbf9e714ef2eb374013',
|
||||
'org.slf4j:slf4j-api:3a4cd4969015f3beb4b5b4d81dbafc01765fb60b8a439955ca64d8476fef553e',
|
||||
'ch.qos.logback:logback-core:4cd46fa17d77057b39160058df2f21ebbc2aded51d0edcc25d2c1cecc042a005',
|
||||
'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',
|
||||
'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8',
|
||||
'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e',
|
||||
'com.github.JesusMcCloud.netlayer:tor:3896950c56a41985f901ff9475524ac162cba18b2d5a0ed39810b20ddaf5128a',
|
||||
'org.jetbrains.kotlin:kotlin-stdlib-jdk8:841b021d62fc007ce2883963ff9440d5393fb1f6a0604ed68cd016afcaf02967',
|
||||
'com.github.MicroUtils:kotlin-logging:7dbd501cc210d721f730d480c53ee2a6e3c154ae89b07dc7dee224b9c5aca9eb',
|
||||
'org.jetbrains.kotlin:kotlin-stdlib-jdk7:bd8cd4e3ef391cd468434747b7939c49e80f8bf4ae10355a65382bfb54fd633c',
|
||||
'org.jetbrains.kotlin:kotlin-stdlib:e1c39d27f23a7fe2d3e4ac65e80a53e98fdcf60e07de9d53b8b841c5944fc810',
|
||||
'org.jetbrains:annotations:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
|
||||
'org.bouncycastle:bcpg-jdk15on:de3355b821fc81dd32e1f3f560d5b3eca1c678fd2400011d0bfc69fb91bcde85',
|
||||
'commons-io:commons-io:cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581',
|
||||
'org.apache.commons:commons-lang3:734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b',
|
||||
'org.bouncycastle:bcprov-jdk15on:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
|
||||
'com.google.zxing:javase:0ec23e2ec12664ddd6347c8920ad647bb3b9da290f897a88516014b56cc77eb9',
|
||||
'com.nativelibs4java:bridj:101bcd9b6637e6bc16e56deb3daefba62b1f5e8e9e37e1b3e56e3b5860d659cf',
|
||||
'com.cedricwalter:tor-binary-macos:87790e9eade1e44eeadc81f92670f338cd47ef1b39b46a4b022c75d0cf6465fd',
|
||||
'com.cedricwalter:tor-binary-linux32:814f6da3b662c96490bcb09781764dd31dfe497ea9c25c73fe61170d2a78086f',
|
||||
'com.cedricwalter:tor-binary-linux64:9da7f8a166ad0a767a5373ca67c68971c9c0cac17964eed2e0850bfecc228312',
|
||||
'com.cedricwalter:tor-binary-windows:9487a735dadcadc6ede5ffad36a911c2d4a484f996be93d71094f26591b8c29e',
|
||||
'com.github.ravn:jsocks:3c71600af027b2b6d4244e4ad14d98ff2352a379410daebefff5d8cd48d742a4',
|
||||
'org.apache.httpcomponents:httpcore:d7f853dee87680b07293d30855b39b9eb56c1297bd16ff1cd6f19ddb8fa745fb',
|
||||
'commons-codec:commons-codec:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
|
||||
'commons-logging:commons-logging:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
|
||||
'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
|
||||
'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',
|
||||
'com.github.bisq-network.bitcoinj:bitcoinj-core:15e0f4304dd92259c4e9ff0114cbeab7a79abb51a5817b422ce629d3a0a2d551',
|
||||
'com.lambdaworks:scrypt:9a82d218099fb14c10c0e86e7eefeebd8c104de920acdc47b8b4b7a686fb73b4',
|
||||
'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',
|
||||
'com.cedricwalter:tor-binary-geoip:7fc7b5ebf80d65ec53d97dd8d3878b8d2c85dc04f3943e5e85e7ba641655492b',
|
||||
'com.github.JesusMcCloud:jtorctl:c6ef92e46074d8d26db718ce0fe4b64b8cf7b934b7377d164c5d613b4cd7b847',
|
||||
'org.apache.commons:commons-compress:a778bbd659722889245fc52a0ec2873fbbb89ec661bc1ad3dc043c0757c784c4',
|
||||
'org.tukaani:xz:a594643d73cc01928cf6ca5ce100e094ea9d73af760a5d4fb6b75fa673ecec96',
|
||||
'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
|
||||
'net.jcip:jcip-annotations:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
|
||||
'org.bitcoinj:orchid:f836325cfa0466a011cb755c9b0fee6368487a2352eb45f4306ad9e4c18de080',
|
||||
'com.squareup.okhttp:okhttp:b4c943138fcef2bcc9d2006b2250c4aabbedeafc5947ed7c0af7fd103ceb2707',
|
||||
'org.objenesis:objenesis:5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d',
|
||||
'com.squareup.okio:okio:114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266',
|
||||
]
|
||||
}
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'application'
|
||||
}
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '0.8.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
mainClassName = 'bisq.monitor.MonitorMain'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':core')
|
||||
compile 'com.sparkjava:spark-core:2.5.2'
|
||||
compile 'net.gpedro.integrations.slack:slack-webhook:1.1.1'
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
|
||||
build.dependsOn installDist
|
||||
installDist.destinationDir = file('build/app')
|
||||
distZip.enabled = false
|
||||
@ -1,33 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'maven'
|
||||
}
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':common')
|
||||
compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.2') {
|
||||
exclude(module: 'slf4j-api')
|
||||
}
|
||||
compile('org.apache.httpcomponents:httpclient:4.5.3') {
|
||||
exclude(module: 'commons-logging')
|
||||
}
|
||||
compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
|
||||
compile 'org.fxmisc.easybind:easybind:1.0.3'
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile 'org.jmockit:jmockit:1.30'
|
||||
testCompileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
plugins {
|
||||
id "java"
|
||||
id "org.springframework.boot" version "1.5.10.RELEASE"
|
||||
}
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
targetCompatibility = 1.10
|
||||
|
||||
version = file("src/main/resources/version.txt").text
|
||||
|
||||
jar.manifest.attributes(
|
||||
"Implementation-Title": rootProject.name,
|
||||
"Implementation-Version": version)
|
||||
|
||||
jar.archiveName "${rootProject.name}.jar"
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url "https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/" }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(":core")
|
||||
compile project(":assets")
|
||||
compile("org.knowm.xchange:xchange-bitcoinaverage:4.3.3")
|
||||
compile("org.knowm.xchange:xchange-coinmarketcap:4.3.3")
|
||||
compile("org.knowm.xchange:xchange-poloniex:4.3.3")
|
||||
compile("org.springframework.boot:spring-boot-starter-web:1.5.10.RELEASE")
|
||||
compile("org.springframework.boot:spring-boot-starter-actuator")
|
||||
}
|
||||
|
||||
task stage {
|
||||
dependsOn assemble
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'application'
|
||||
}
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '0.8.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
mainClassName = 'bisq.monitor.MonitorMain'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(":common")
|
||||
compile("com.sparkjava:spark-core:2.5.2")
|
||||
compile("com.turo:pushy:0.13.2")
|
||||
compile("com.google.firebase:firebase-admin:6.2.0")
|
||||
compile 'commons-codec:commons-codec:1.9'
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
|
||||
build.dependsOn installDist
|
||||
installDist.destinationDir = file('build/app')
|
||||
distZip.enabled = false
|
||||
|
||||
@ -25,7 +25,9 @@ import java.io.InputStream;
|
||||
import java.util.Scanner;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
|
||||
@ -43,8 +45,8 @@ import com.turo.pushy.apns.util.ApnsPayloadBuilder;
|
||||
import com.turo.pushy.apns.util.SimpleApnsPushNotification;
|
||||
import com.turo.pushy.apns.util.concurrent.PushNotificationFuture;
|
||||
|
||||
@Slf4j
|
||||
class RelayService {
|
||||
private static final Logger log = LoggerFactory.getLogger(RelayMain.class);
|
||||
private static final String ANDROID_DATABASE_URL = "https://bisqnotifications.firebaseio.com";
|
||||
// Used in Bisq app to check for success state. We won't want a code dependency just for that string so we keep it
|
||||
// duplicated in core and here. Must not be changed.
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'application'
|
||||
apply plugin: 'maven'
|
||||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '0.8.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
mainClassName = 'bisq.seednode.SeedNodeMain'
|
||||
|
||||
sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':core')
|
||||
runtime 'org.bouncycastle:bcprov-jdk15on:1.56'
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
|
||||
build.dependsOn installDist
|
||||
installDist.destinationDir = file('build/app')
|
||||
distZip.enabled = false
|
||||
@ -1,27 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'application'
|
||||
}
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '0.8.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.10
|
||||
|
||||
mainClassName = 'bisq.statistics.StatisticsMain'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':core')
|
||||
compileOnly 'org.projectlombok:lombok:1.18.2'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.2'
|
||||
}
|
||||
|
||||
build.dependsOn installDist
|
||||
installDist.destinationDir = file('build/app')
|
||||
distZip.enabled = false
|
||||
Loading…
Reference in New Issue
Block a user