From 5028c1eeca328667bd9c68bef7b59639c8b0126e Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Tue, 23 Oct 2018 16:59:31 -0700 Subject: [PATCH 1/4] Update travis.yml to oraclejdk11 and openjdk11 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca6bb7fec80..7c54e66b18e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: java -jdk: openjdk10 +jdk: + - oraclejdk11 + - openjdk11 before_install: grep -v '^#' src/main/resources/META-INF/services/bisq.asset.Asset | sort --check --dictionary-order --ignore-case notifications: From c9a4a02a312515c8ac451028c25768dc0f76c847 Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Tue, 23 Oct 2018 17:00:03 -0700 Subject: [PATCH 2/4] Update README for JDK11 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 637ba732862..e2d7b8bfa8b 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 OpenJDK [JDK 10](https://jdk.java.net/10/) installed to complete the following instructions. +You will need OpenJDK [JDK 11](https://jdk.java.net/11/) installed to complete the following instructions. 1. Clone the Bisq source code and cd into `bisq` From 3cfc6bc26a247f82516d33412a1fe93628445774 Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Tue, 23 Oct 2018 23:18:03 -0700 Subject: [PATCH 3/4] Update README with both Oracle JDK and OpenJDK --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2d7b8bfa8b..1da4df95de6 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 OpenJDK [JDK 11](https://jdk.java.net/11/) installed to complete the following instructions. +You will need either [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html) or [OpenJDK JDK 11](https://jdk.java.net/11/) installed to complete the following instructions. 1. Clone the Bisq source code and cd into `bisq` From 829ae0ed8cb2dfacdd3f851c2579b39898ff84d5 Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Tue, 23 Oct 2018 23:28:07 -0700 Subject: [PATCH 4/4] Use latest Gradle release 4.10.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a95009c3b9e..e0b3fb8d70b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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