mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
4ec69f082e
# Conflicts: # build.gradle # src/main/java/bisq/core/CoreModule.java # src/main/java/bisq/core/dao/DaoModule.java # src/main/java/bisq/core/dao/DaoSetup.java # src/main/java/bisq/core/dao/vote/blindvote/BlindVoteService.java # src/main/java/bisq/core/dao/vote/proposal/ProposalService.java # src/main/java/bisq/core/dao/vote/votereveal/VoteRevealService.java # src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java # src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java # src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java # src/main/resources/i18n/displayStrings_de.properties # src/main/resources/i18n/displayStrings_el.properties # src/main/resources/i18n/displayStrings_es.properties # src/main/resources/i18n/displayStrings_hu.properties # src/main/resources/i18n/displayStrings_pt.properties # src/main/resources/i18n/displayStrings_ro.properties # src/main/resources/i18n/displayStrings_ru.properties # src/main/resources/i18n/displayStrings_sr.properties # src/main/resources/i18n/displayStrings_zh.properties Merge branch 'master' into voting # Conflicts: # src/main/java/bisq/common/UserThread.java # src/main/proto/pb.proto Merge branch 'master' into voting # Conflicts: # src/main/java/bisq/desktop/app/BisqAppMain.java # src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
174 lines
11 KiB
Groovy
174 lines
11 KiB
Groovy
buildscript {
|
|
repositories {
|
|
mavenLocal()
|
|
jcenter()
|
|
}
|
|
dependencies {
|
|
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
|
|
classpath files('gradle/witness/gradle-witness.jar')
|
|
}
|
|
}
|
|
|
|
apply plugin: 'java'
|
|
apply plugin: 'application'
|
|
apply plugin: 'maven'
|
|
apply plugin: 'witness'
|
|
apply plugin: 'com.github.johnrengelman.shadow'
|
|
|
|
group = 'network.bisq'
|
|
version = '0.7.1-SNAPSHOT'
|
|
|
|
sourceCompatibility = 1.8
|
|
|
|
mainClassName = 'bisq.desktop.app.BisqAppMain'
|
|
|
|
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 {
|
|
mavenLocal()
|
|
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 {
|
|
compile 'network.bisq:bisq-common:-SNAPSHOT'
|
|
compile 'network.bisq:bisq-core:-SNAPSHOT'
|
|
compile 'network.bisq:bisq-p2p:-SNAPSHOT'
|
|
compile 'network.bisq:bisq-grpc:-SNAPSHOT'
|
|
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:8.15'
|
|
compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
|
|
compile 'com.googlecode.jcsv:jcsv:1.4.0'
|
|
compileOnly 'org.projectlombok:lombok:1.16.16'
|
|
// annotationProcessor 'org.projectlombok:lombok:1.16.16'
|
|
testCompile('org.mockito:mockito-core:2.8.9') {
|
|
exclude(module: 'objenesis')
|
|
}
|
|
testCompile 'org.jmockit:jmockit:1.30'
|
|
testCompile 'org.powermock:powermock-module-junit4:1.7.1'
|
|
testCompile 'org.powermock:powermock-api-mockito2:1.7.1'
|
|
testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
|
|
testCompile 'com.natpryce:make-it-easy:4.0.1'
|
|
testCompileOnly 'org.projectlombok:lombok:1.16.16'
|
|
// testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
|
|
}
|
|
|
|
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:bisq- >> 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:8f700556bbfdc4a581224d3bd6ff869b8a03f6670bd7e0fc78884bd2f31fdb64',
|
|
'de.jensd:fontawesomefx-commons:e1505a31433f1b2902478217651afc78dae5ab09670336afc46e582a1dea1e4d',
|
|
'com.googlecode.jcsv:jcsv:73ca7d715e90c8d2c2635cc284543b038245a34f70790660ed590e157b8714a2',
|
|
/*
|
|
TODO investigate why it fails if that is set. prob. related to master using diff. version and handling in jitpack...
|
|
'network.bisq.btcd-cli4j:btcd-cli4j-daemon:cf19fddccfd9c5302498dfdb29a7fead8faff04912285bfdaacad1fd7a27f646',
|
|
'network.bisq.btcd-cli4j:btcd-cli4j-core:cc063c3a501ee6dd6f2e2e98ce59e82d720a52522acc1ec0751434dece4851e4',
|
|
*/
|
|
'io.grpc:grpc-alts:9cb1d830d8f465ff3011904bad3211192e6eec6562e61a88b2823c8de71c2f37',
|
|
'io.grpc:grpc-protobuf:0acf523d0eacae11e2c094112737c77af39789cb30332f2359004a6ab67e36a1',
|
|
'com.google.api.grpc:proto-google-common-protos:cfe1da4c0e82820c32a83c4bf25b42f4d3b7113177321c437a9fff3c42e1f4c9',
|
|
'com.google.protobuf:protobuf-java-util:8bd8a5de6d7e05dce16c8198c8013ebd9c703e10db957fb6dfab0ad24bcd8adc',
|
|
'com.google.protobuf:protobuf-java:b5e2d91812d183c9f053ffeebcbcda034d4de6679521940a19064714966c2cd4',
|
|
'io.grpc:grpc-netty:631526592a1496ef2850154f58b45bef63682653c9910facccd550408baf1dc3',
|
|
'io.grpc:grpc-stub:b72069a9b331fb7e638e3f684968df78b995c41dec89a3cc4d31d554050d663b',
|
|
'io.grpc:grpc-protobuf-lite:1f81c360acd3d61b32a4ffb065d34fccdf951076490f2dd05070fb3169263d05',
|
|
'io.grpc:grpc-core:63e02c0fd675797c19861cbd7d254c629145f943a593032febd5676d77bc8678',
|
|
'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',
|
|
'network.bisq.libdohj:libdohj-core:cef7db8a2032ffbc229ccacc29b7d13e8ee1daf1cd60ee8f988cdfa60a041d8e',
|
|
'com.github.JesusMcCloud.netlayer:tor.native:de44e782b21838d3426dbff99abbfd1cbb8e5d3f6d5e997441ff4fd8354934fa',
|
|
'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:8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c',
|
|
'org.bouncycastle:bcprov-jdk15on:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
|
|
'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342',
|
|
'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
|
|
'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
|
|
'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
|
|
'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135',
|
|
'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf',
|
|
'io.netty:netty-tcnative-boringssl-static:762aa9b16025e373f73534e8b78bf1552b60bfb1c2c9b579de49e9e5517680de',
|
|
'com.google.zxing:javase:0ec23e2ec12664ddd6347c8920ad647bb3b9da290f897a88516014b56cc77eb9',
|
|
'commons-logging:commons-logging:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
|
|
'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
|
|
'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',
|
|
'com.github.bisq-network.bitcoinj:bitcoinj-core:05c94cc68f1524ed08f5aa815f5f09d99a3aae5ab277527d7729ee74d0aece13',
|
|
'com.lambdaworks:scrypt:9a82d218099fb14c10c0e86e7eefeebd8c104de920acdc47b8b4b7a686fb73b4',
|
|
'commons-codec:commons-codec:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
|
|
'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',
|
|
'io.netty:netty-codec-http2:6c616bf4dee8fd4bfd9e133b7dba8f6e115042e8dc347aef8f184027b1f9821f',
|
|
'io.netty:netty-handler-proxy:1d7931e5511890a146303a07819863b6261fdd7b3c22c2c50634f82e362f336c',
|
|
'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',
|
|
'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
|
|
'net.jcip:jcip-annotations:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
|
|
'org.bitcoinj:orchid:f836325cfa0466a011cb755c9b0fee6368487a2352eb45f4306ad9e4c18de080',
|
|
'com.squareup.okhttp:okhttp:b4c943138fcef2bcc9d2006b2250c4aabbedeafc5947ed7c0af7fd103ceb2707',
|
|
'com.cedricwalter:tor-binary-geoip:7fc7b5ebf80d65ec53d97dd8d3878b8d2c85dc04f3943e5e85e7ba641655492b',
|
|
'com.github.JesusMcCloud:jtorctl:c6ef92e46074d8d26db718ce0fe4b64b8cf7b934b7377d164c5d613b4cd7b847',
|
|
'org.apache.commons:commons-compress:a778bbd659722889245fc52a0ec2873fbbb89ec661bc1ad3dc043c0757c784c4',
|
|
'org.tukaani:xz:a594643d73cc01928cf6ca5ce100e094ea9d73af760a5d4fb6b75fa673ecec96',
|
|
'io.grpc:grpc-context:817a68c7e5ef48eaede2ab16be9417af5b8ca37d08e90f26925690b9dd6730ca',
|
|
'com.google.errorprone:error_prone_annotations:de3c873b5dc06060f7a2a4d9b872a3f4dc1955c18095ef9702d13477e437782a',
|
|
'io.opencensus:opencensus-contrib-grpc-metrics:21c37058d708ff7aed46cc7e0f226d6816190376b086574eafab2c5fa05724fe',
|
|
'io.opencensus:opencensus-api:f4457f4a81b9021188c44884eb7184d938a35fc0623f1aa0b1eba6f6b96e93a2',
|
|
'io.netty:netty-codec-http:6de1a2ce4dc8b284aa49dcaa6183c20f5e978c70e28cf8905682fabc5f208612',
|
|
'io.netty:netty-handler:bfcc1716f57641c4d1521fe2d8988c412fc6d28b0eca773b53e0a262efd7fcfe',
|
|
'io.netty:netty-codec-socks:7cdd49bcde53f563547ff3313778dcaa7c68cfb07540c0b362953645538d5698',
|
|
'io.netty:netty-codec:536ea827a0506c5e1a800ffa64a8b5485ff87a40102b169389c57e280fa40d86',
|
|
'io.netty:netty-transport:08250e03630c66048eaf7257020bef8b11c0d77dafd699a15e795a4d3db19ab3',
|
|
'com.squareup.okio:okio:114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266',
|
|
'org.objenesis:objenesis:5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d',
|
|
'io.netty:netty-buffer:11c6333d88de70d8ca392b7e65a7256829ef6d3344e58788d9ee0da3e8087a63',
|
|
'io.netty:netty-resolver:623743441feb2db7df48501e0b78f4c34037eae624b732941213a149de293fc1',
|
|
'io.netty:netty-common:469193e9df5c82505aa2ba0ba1417adcadf493313d7dade36998b9c18997cfcc',
|
|
]
|
|
}
|