Be able to upgrade bitcoinj without upgrading libdohj

This commit is contained in:
Oscar Guindzberg 2019-01-03 15:57:26 -03:00
parent 257a8627e6
commit f4a40ca6f6

View file

@ -34,6 +34,7 @@ configure(subprojects) {
joptVersion = '5.0.3'
langVersion = '3.4'
libdohjVersion = '7be803fa'
bitcoinjVersion = 'cd30ad5b'
logbackVersion = '1.1.10'
lombokVersion = '1.18.2'
mockitoVersion = '2.21.0'
@ -133,6 +134,10 @@ configure(project(':assets')) {
dependencies {
compile("network.bisq.libdohj:libdohj-core:$libdohjVersion") {
exclude(module: 'protobuf-java')
exclude(module: 'bitcoinj-core')
}
compile("com.github.bisq-network.bitcoinj:bitcoinj-core:$bitcoinjVersion") {
exclude(module: 'protobuf-java')
}
compile "commons-codec:commons-codec:$codecVersion"
compile "org.apache.commons:commons-lang3:$langVersion"
@ -170,6 +175,11 @@ configure(project(':common')) {
exclude(module: 'guava')
}
compile("network.bisq.libdohj:libdohj-core:$libdohjVersion") {
exclude(module: 'slf4j-api')
exclude(module: 'protobuf-java')
exclude(module: 'bitcoinj-core')
}
compile("com.github.bisq-network.bitcoinj:bitcoinj-core:$bitcoinjVersion") {
exclude(module: 'jsr305')
exclude(module: 'slf4j-api')
exclude(module: 'guava')