diff --git a/Makefile b/Makefile index 076c22a5e3..037cec174e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # # - Linux, macOS or similar *nix with standard tools like `make` # - bitcoind and bitcoin-cli (`brew install bitcoin` on macOS) -# - JDK 10 to build and run Bisq binaries; see +# - JDK 11 to build and run Bisq binaries; see # https://www.oracle.com/java/technologies/java-archive-javase10-downloads.html # # diff --git a/docs/build.md b/docs/build.md index b33ad3f7d7..8512c9465b 100644 --- a/docs/build.md +++ b/docs/build.md @@ -43,14 +43,14 @@ 1. You do _not_ need to install Gradle to build Bisq. The `gradlew` shell script will install it for you, if necessary. -2. Bisq currently works with JDK 10 and 11 only. JDK 12 and above are not supported. You can find out which +2. Bisq currently works with JDK 11 only. JDK 12 and above are not supported. You can find out which version you have with: ```sh javac -version ``` -If your Java version is not 10 or 11, check out scripts in the [scripts](../scripts) directory (or online at https://github.com/bisq-network/bisq/tree/master/scripts). +If your Java version is not 11, check out scripts in the [scripts](../scripts) directory (or online at https://github.com/bisq-network/bisq/tree/master/scripts). ## Running Bisq diff --git a/docs/idea-import.md b/docs/idea-import.md index 7b68c852cb..398d6a22c7 100644 --- a/docs/idea-import.md +++ b/docs/idea-import.md @@ -11,8 +11,8 @@ Most Bisq contributors use IDEA for development. The following instructions have 1. In the `Import Project from Gradle` screen, check the `Use auto-import` option and click `OK` 1. When prompted whether to overwrite the existing `.idea` directory, click `Yes` (This step was not required with 2019.2 but is kept here in case you are running an older version) 1. In the `Project` tool window, right click on the root-level `.idea` folder, select `Git->Revert...` and click OK in the dialog that appears (to restore source-controlled `.idea` configuration files that get overwritten during project import) - 1. If you did not yet setup JDK10 in IntelliJ, Go to `File->Project Structure->Project` and under the `Project SDK` option locate your JAVA_HOME folder, then in `Project language level` beneath select `10 - ...`. (JDK10 is no longer supported but you can still download it from the [archive](https://jdk.java.net/archive/)) - 1. Select JDK 10 for gradle as well. Go to `Preferences->Build, Execution, Deployment->Build Tools->Gradle` and select the JDK10 location for Gradle JVM + 1. If you did not yet setup JDK11 in IntelliJ, Go to `File->Project Structure->Project` and under the `Project SDK` option locate your JAVA_HOME folder, then in `Project language level` beneath select `11 - ...`. + 1. Select JDK 11 for gradle as well. Go to `Preferences->Build, Execution, Deployment->Build Tools->Gradle` and select the JDK11 location for Gradle JVM 1. Go to `Build->Build Project`. Everything should build cleanly. You should be able to run tests, run `main` methods in any component, etc. > TIP: If you encounter compilation errors in IDEA related to the `protobuf.*` classes, it is probably because you didn't build Bisq at the command line as instructed above. You need to run the `generateProto` task in the `common` project. You can do this via the Gradle tool window in IDEA, or you can do it the command line with `./gradlew :common:generateProto`. Once you've done that, run `Build->Build Project` again and you should have no errors.