From 751097b2a025de5908ce3064c55d8372483f6312 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 18 Sep 2018 22:16:53 -0500 Subject: [PATCH 1/2] Update readme (Java version) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46d25b14025..0b397590343 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ For more information, see https://bisq-network/intro and for step-by-step gettin ## Building Bisq -You will need [JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) installed to complete the following instructions. +You will need [JDK 10](https://www.oracle.com/technetwork/java/javase/downloads/jdk10-downloads-4416644.html) installed to complete the following instructions. 1. Clone the Bisq source code and cd into `bisq` From ede7d989ba792cd245d8613491f477ba858f8e55 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 18 Sep 2018 23:44:19 -0500 Subject: [PATCH 2/2] Fix gradle build files --- pricenode/build.gradle | 1 + relay/build.gradle | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pricenode/build.gradle b/pricenode/build.gradle index 46912983bfd..4096ee60041 100644 --- a/pricenode/build.gradle +++ b/pricenode/build.gradle @@ -22,6 +22,7 @@ repositories { 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") diff --git a/relay/build.gradle b/relay/build.gradle index 4893a113c87..b0cdca7a491 100644 --- a/relay/build.gradle +++ b/relay/build.gradle @@ -1,24 +1,19 @@ plugins { - id "java" - id "org.springframework.boot" version "1.5.10.RELEASE" + id 'java' + id 'application' } -sourceCompatibility = 1.10 -targetCompatibility = 1.10 - -version = file("src/main/resources/version.txt").text +group = 'network.bisq' +version = '0.8.0-SNAPSHOT' -jar.manifest.attributes( - "Implementation-Title": rootProject.name, - "Implementation-Version": version) +sourceCompatibility = 1.10 -jar.archiveName "${rootProject.name}.jar" +mainClassName = 'bisq.monitor.MonitorMain' repositories { - mavenLocal() jcenter() maven { url "https://jitpack.io" } - maven { url "https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/" } + maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' } } dependencies { @@ -26,11 +21,12 @@ dependencies { 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' + annotationProcessor 'org.projectlombok:lombok:1.18.2' } -task stage { - dependsOn assemble -} +build.dependsOn installDist +installDist.destinationDir = file('build/app') +distZip.enabled = false +