From 485ab25df14f9fdee8c0431ca2f7143052b8b3a3 Mon Sep 17 00:00:00 2001
From: Andreas Marek <andimarek@fastmail.fm>
Date: Tue, 24 Jan 2023 12:04:23 +1000
Subject: [PATCH] use toolchain to specify the java version and upgrade gradle

---
 build.gradle                             | 18 +++++++++---------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index e108b39f6a..e6c2ad6309 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 import java.text.SimpleDateFormat
 
+
 plugins {
     id 'java'
     id 'java-library'
@@ -13,6 +14,14 @@ plugins {
     id "me.champeau.jmh" version "0.6.6"
 }
 
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+
+    }
+}
+
 def getDevelopmentVersion() {
     def gitCheckOutput = new StringBuilder()
     def gitCheckError = new StringBuilder()
@@ -39,15 +48,6 @@ def getDevelopmentVersion() {
     version
 }
 
-if (JavaVersion.current() != JavaVersion.VERSION_11) {
-    def msg = String.format("This build must be run with Java 11 - you are running %s - gradle finds the JDK via JAVA_HOME=%s",
-            JavaVersion.current(), System.getenv("JAVA_HOME"))
-    throw new GradleException(msg)
-}
-
-
-sourceCompatibility = JavaVersion.VERSION_11.toString()
-targetCompatibility = JavaVersion.VERSION_11.toString()
 def reactiveStreamsVersion = '1.0.3'
 def slf4jVersion = '1.7.35'
 def releaseVersion = System.env.RELEASE_VERSION
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e5897b5..070cb702f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists