Add official Java 15 support

bisq-network · Nov 16, 2021 · 4e4d71f · 4e4d71f
1 parent 90ea4fc
commit 4e4d71f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,8 +8,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
-
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+            os: [ubuntu-18.04, macOS-latest, windows-2016]
+            java: [ '11', '11.0.3', '15', '15.0.5']
+    name: Test Java ${{ matrix.Java }}, ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
       with:
@@ -20,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: ${{ matrix.java }}
         distribution: 'zulu'
         cache: 'gradle'
 

diff --git a/apitest/docs/api-beta-test-guide.md b/apitest/docs/api-beta-test-guide.md
@@ -17,7 +17,7 @@ option adjustments to compensate.
 
 **Shell**:  Bash
 
-**Java SDK**:  Version 10, 11, or 12
+**Java SDK**:  Version 10, 11, 12 or 15
 
 **Bitcoin-Core**:  Version 0.19, 0.20, or 0.21
 

diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle
@@ -7,8 +7,8 @@ task jpackageSanityChecks {
     description 'Interactive sanity checks on the version of the code that will be packaged'
 
     doLast {
-        // Enforce JDK 11 for compiling and building
-        assert JavaVersion.current().isJava11(): "JDK 11 is required"
+        // Enforce JDK 15 for compiling and building
+        assert JavaVersion.current() == JavaVersion.VERSION_15: "JDK 15 is required"
 
         executeCmd("git --no-pager log -5 --oneline")
         ant.input(message: "Above you see the current HEAD and its recent history.\n" +

diff --git a/docs/build.md b/docs/build.md
@@ -45,7 +45,7 @@
 
 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 11 only. JDK 12 and above are not supported. You can find out which
+2. Bisq currently works with JDK 11 and JDK 15. You can find out which
    version you have with:
 
    ```sh

diff --git a/docs/release-process.md b/docs/release-process.md
@@ -69,10 +69,10 @@ Use VirtualBox > 6.1 with following configuration:
 #### For every OS
 
 * Install latest security updates
-* Install/Upgrade to latest Java 11 SDK
-  * macOS (brew option): `brew upgrade openjdk@11`
-  * Ubuntu (brew option): `brew upgrade java11`
-  * Windows: Download latest version from https://www.oracle.com/java/technologies/javase-jdk11-downloads.html
+* Install/Upgrade to latest Java 15 SDK
+  * macOS (brew option): `brew upgrade zulu15`
+  * Ubuntu (brew option): `brew upgrade zulu15`
+  * Windows: Download latest version from https://www.oracle.com/java/technologies/javase/jdk15-archive-downloads.html
 
 #### For Windows