From 7ae04bfc396ce5a3d38ba63b98c9a243aedad709 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Tue, 31 Oct 2023 17:47:29 +0100 Subject: [PATCH 1/2] Remove Azul JDK Enforcement This is not needed anymore. --- .../commons/src/main/groovy/bisq.java-conventions.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle index 8ece77c0e49..e1ab92e95c9 100644 --- a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle +++ b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle @@ -12,8 +12,6 @@ repositories { java { toolchain { languageVersion = JavaLanguageVersion.of(11) - vendor = JvmVendorSpec.AZUL - implementation = JvmImplementation.VENDOR_SPECIFIC } } From 294fcb34592d79384e9cc953c510481ec724f24c Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Tue, 31 Oct 2023 17:50:21 +0100 Subject: [PATCH 2/2] Fallback to Java 15 on macOS --- .../commons/src/main/groovy/bisq.java-conventions.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle index e1ab92e95c9..af2524a9aaa 100644 --- a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle +++ b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.taskdefs.condition.Os + plugins { id 'java' id 'jacoco' @@ -11,7 +13,11 @@ repositories { java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + if (Os.isFamily(Os.FAMILY_MAC)) { + languageVersion = JavaLanguageVersion.of(15) + } else { + languageVersion = JavaLanguageVersion.of(11) + } } }