From ca571fae847b5382efa55e1b46a652a2d5ee666e Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 4 Jun 2026 21:02:34 +0200 Subject: [PATCH 1/3] chore: bump Gradle daemon JDK to 25 Co-Authored-By: Claude Sonnet 4.6 (1M context) --- gradle/gradle-daemon-jvm.properties | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index aee9a3c9b42..fa4ed510e60 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ -#This file is generated by updateDaemonJvm `./gradlew updateDaemonJvm --jvm-version=21` -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect -toolchainVersion=21 +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect +toolchainVersion=25 From dcb09106c35c664866e8216ed85011e9c88cc4b7 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 4 Jun 2026 21:44:19 +0200 Subject: [PATCH 2/3] fix: upgrade Kotlin plugin to 2.1.20 and fix javadoc link for JDK 25 Kotlin 2.0.21 fails to parse JDK 25 version strings (IllegalArgumentException in JavaVersion.parse). Kotlin 2.1.20 resolves this. JDK 25 javadoc rejects the old Oracle Java 8 docs URL which now redirects; replace with the stable canonical URL. Co-Authored-By: Claude Sonnet 4.6 (1M context) --- gradle/java_no_deps.gradle | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index d309406e8b4..060e82a6b59 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -214,7 +214,7 @@ tasks.named("javadoc", Javadoc) { setMemberLevel(JavadocMemberLevel.PUBLIC) setAuthor(true) - links = ["https://docs.oracle.com/javase/8/docs/api/"] + links = ["https://docs.oracle.com/en/java/javase/8/docs/api/"] source = 8 } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba7e784ffe5..1727e634c27 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ groovy = "3.0.25" ## Kotlin kotlin = "1.6.21" -kotlin-plugin = "2.0.21" +kotlin-plugin = "2.1.20" kotlinx-coroutines = "1.3.0" ## Scala From f4d61fdbe67dc43955441f75435581709a8eeaf9 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 4 Jun 2026 22:39:21 +0200 Subject: [PATCH 3/3] fix: run javadoc task with JDK 8 toolchain JDK 25 javadoc treats HTTP redirects as hard errors; Oracle's Java 8 API URL now redirects. Running javadoc with the JDK 8 tool is semantically correct (source=8) and avoids the redirect restriction. Co-Authored-By: Claude Sonnet 4.6 (1M context) --- gradle/java_no_deps.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index 060e82a6b59..955fcf65659 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -207,6 +207,9 @@ tasks.withType(Javadoc).configureEach { } tasks.named("javadoc", Javadoc) { + javadocTool = javaToolchains.javadocToolFor { + languageVersion = JavaLanguageVersion.of(8) + } source = sourceSets.main.java.srcDirs classpath = configurations.compileClasspath @@ -214,7 +217,7 @@ tasks.named("javadoc", Javadoc) { setMemberLevel(JavadocMemberLevel.PUBLIC) setAuthor(true) - links = ["https://docs.oracle.com/en/java/javase/8/docs/api/"] + links = ["https://docs.oracle.com/javase/8/docs/api/"] source = 8 } }