From 5c65251549f64ceedf127b84206c7b2213628944 Mon Sep 17 00:00:00 2001
From: Dmytro Vyazelenko <696855+vyazelenko@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:16:16 +0100
Subject: [PATCH] [Java] Use different URI for early access JDK build.

---
 build.gradle | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e5a50b44e..c96c6a86c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,8 +22,14 @@ plugins {
 
 defaultTasks 'clean', 'build'
 
+static def rawBuildJavaVersion()
+{
+    return System.getenv('BUILD_JAVA_VERSION') ?: JavaVersion.current().getMajorVersion()
+}
+boolean isEarlyAccessJavaVersion = rawBuildJavaVersion().endsWith("-ea")
+
 static def getBuildJavaVersion() {
-    def buildJavaVersion = System.getenv('BUILD_JAVA_VERSION') ?: JavaVersion.current().getMajorVersion()
+    def buildJavaVersion = rawBuildJavaVersion()
     if (buildJavaVersion.indexOf('.') > 0) {
         buildJavaVersion = buildJavaVersion.substring(0, buildJavaVersion.indexOf('.'))
     }
@@ -193,6 +199,8 @@ subprojects {
             mkdir 'build/resources/main' // Avoid Javac warning about non-existing directory
         }
 
+        options.compilerArgs.add('--release')
+        options.compilerArgs.add(java.sourceCompatibility.majorVersion)
         options.compilerArgs.addAll(['-Xlint:all', '-Werror']) // Enable all warnings and treat them as errors
         options.encoding = 'UTF-8'
         options.deprecation = true
@@ -231,7 +239,7 @@ subprojects {
         options.encoding = 'UTF-8'
         options.docEncoding = 'UTF-8'
         options.charSet = 'UTF-8'
-        if (buildJavaVersion > 23) { // early access JavaDoc location is different
+        if (isEarlyAccessJavaVersion) {
             options.links("https://download.java.net/java/early_access/jdk${buildJavaVersion}/docs/api/")
         }
         else {