From 65667cf4e7f1213f6ec05ae5eb910d497888d870 Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Fri, 8 Sep 2023 13:02:04 +0200
Subject: [PATCH 1/2] Add Gradle Toolchain Resolver

---
 gradle/verification-metadata.xml | 26 ++++++++++++++++++++++++++
 settings.gradle                  | 14 ++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 67c9b8bf69..6f9917f32b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -312,6 +312,14 @@
             <sha256 value="afded6e6a690fbf3ad4ae65ada397f0a90a5f630b303d1b741b9c97926fdd4de" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.code.gson" name="gson" version="2.9.1">
+         <artifact name="gson-2.9.1.jar">
+            <sha256 value="378534e339e6e6d50b1736fb3abb76f1c15d1be3f4c13cec6d536412e23da603" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gson-2.9.1.pom">
+            <sha256 value="e5966323d7142570b37a4be979e21bc2dae848107e4dc416d8f44d9aa3f02903" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.code.gson" name="gson-parent" version="2.8.5">
          <artifact name="gson-parent-2.8.5.pom">
             <sha256 value="8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27" origin="Generated by Gradle"/>
@@ -327,6 +335,11 @@
             <sha256 value="b16e026e63427c1972ad0fc68703ec379b1576e411ba49c32fa9a31ab0bbcffb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.code.gson" name="gson-parent" version="2.9.1">
+         <artifact name="gson-parent-2.9.1.pom">
+            <sha256 value="7ca0845e73685618de3e46bd3434d03a4a373d520fab93a680318ad6c8cb2a79" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.2.0">
          <artifact name="error_prone_annotations-2.2.0.jar">
             <sha256 value="6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a" origin="Generated by Gradle"/>
@@ -1260,6 +1273,19 @@
             <sha256 value="33deb55529b1a8bad499ae2fab7551720b4158ca414174c29fb61f0040423a50" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.gradle.toolchains" name="foojay-resolver" version="0.7.0">
+         <artifact name="foojay-resolver-0.7.0.jar">
+            <sha256 value="93672b4740a0fdbfbb5baf08353db8ae9a9bb25f6b10a93c078126c717db3ac0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foojay-resolver-0.7.0.module">
+            <sha256 value="ed6746a09f32bfaddb90b029102ae62326e248129a68b74662a4a433d55314b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.toolchains.foojay-resolver" name="org.gradle.toolchains.foojay-resolver.gradle.plugin" version="0.7.0">
+         <artifact name="org.gradle.toolchains.foojay-resolver.gradle.plugin-0.7.0.pom">
+            <sha256 value="6dc13c3cff026122be388b2ddf75aea5feb1a18994bba5c2106884bb75ec4e59" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.hamcrest" name="hamcrest" version="2.2">
          <artifact name="hamcrest-2.2.jar">
             <sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1" origin="Generated by Gradle"/>
diff --git a/settings.gradle b/settings.gradle
index 5f45142f94..4f3b196ff9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,6 +5,20 @@ pluginManagement {
     includeBuild('build-logic')
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver") version "0.7.0"
+}
+
+toolchainManagement {
+    jvm {
+        javaRepositories {
+            repository("foojay") {
+                resolverClass = org.gradle.toolchains.foojay.FoojayToolchainResolver
+            }
+        }
+    }
+}
+
 include 'proto'
 include 'assets'
 include 'common'

From 990ed8b1e67bf84dc7e8a772e1b53d34765c8411 Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Fri, 8 Sep 2023 13:03:29 +0200
Subject: [PATCH 2/2] Gradle: Enforce same JDK everywhere

---
 .github/workflows/build.yml                              | 2 +-
 .../commons/src/main/groovy/bisq.java-conventions.gradle | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d272641a21..2a9d58af82 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
         matrix:
             os: [ubuntu-latest, macOS-latest, windows-latest]
-            java: [ '11', '11.0.3', '15', '15.0.5']
+            java: ['11']
     name: Test Java ${{ matrix.Java }}, ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4.0.0
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 08c9fb5d90..99e87d2026 100644
--- a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
+++ b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
@@ -8,8 +8,13 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+        vendor = JvmVendorSpec.AZUL
+        implementation = JvmImplementation.VENDOR_SPECIFIC
+    }
+}
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'