From bd0bbfca8d550ab3b714738758f7b853e17e9a6c Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 16 Nov 2021 13:13:09 +0100 Subject: [PATCH 1/3] Add official Java 15 support --- .github/workflows/build.yml | 10 +++++++--- apitest/docs/api-beta-test-guide.md | 2 +- desktop/package/package.gradle | 4 ++-- docs/build.md | 2 +- docs/release-process.md | 8 ++++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aed781a49f6..958f3777bc3 100644 --- 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 index 8c1b41112bc..c3ff01b724e 100644 --- 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 index aaba761f66c..40a390a9ce7 100644 --- 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 index 499f06142bd..6df3d750544 100644 --- 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 index 6ee6fa354d7..3ee31e5ecd9 100644 --- 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 From c3811836d0302cd38fa2cf953f5cae64a34fc24d Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 18 Nov 2021 09:40:06 +0100 Subject: [PATCH 2/3] Remove gradle cache --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 958f3777bc3..a4fafc823ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,6 @@ jobs: with: java-version: ${{ matrix.java }} distribution: 'zulu' - cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew From 6c37ea6af1fb971744e8cea33180af8ac43ece05 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 18 Nov 2021 10:55:13 +0100 Subject: [PATCH 3/3] Print dependency report if failure --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4fafc823ef..7db5baae698 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, macOS-latest, windows-2016] + os: [ubuntu-latest, macOS-latest, windows-latest] java: [ '11', '11.0.3', '15', '15.0.5'] name: Test Java ${{ matrix.Java }}, ${{ matrix.os }} steps: @@ -35,3 +35,8 @@ jobs: - name: Build with Gradle run: ./gradlew build + + - name: Print Dependency Verification Report + if: ${{ failure() }} + run: cat build/reports/dependency-verification/*/*.html + shell: bash