From 8a3acbedd2b0e52c0057f56b92684efef2ef379e Mon Sep 17 00:00:00 2001
From: Nicklas Ansman <nicklas@ansman.se>
Date: Thu, 11 Jun 2026 21:47:49 -0400
Subject: [PATCH] Fix Gradle toolchain provisioning

---
 build-logic/settings.gradle.kts     |  6 +++++-
 build.gradle.kts                    |  5 +++++
 gradle/gradle-daemon-jvm.properties | 20 ++++++++++----------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index bcdc373ad..32cf20ea1 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -5,6 +5,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
 dependencyResolutionManagement {
     @Suppress("UnstableApiUsage")
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
@@ -22,4 +26,4 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "build-logic"
\ No newline at end of file
+rootProject.name = "build-logic"
diff --git a/build.gradle.kts b/build.gradle.kts
index 7804d506e..37c900ce4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,6 +29,11 @@ val version: String = providers.gradleProperty("version").get()
 
 val latestRelease: String = providers.gradleProperty("latestRelease").get()
 
+tasks.named<UpdateDaemonJvm>("updateDaemonJvm") {
+    languageVersion = JavaLanguageVersion.of(libs.versions.java.get())
+    vendor = JvmVendorSpec.AZUL
+}
+
 val isSnapshotVersion = version.endsWith("-SNAPSHOT")
 val dokkaProjects = subprojects
     .map { it.isolated }
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
index f7109b45f..b6eca8c8e 100644
--- a/gradle/gradle-daemon-jvm.properties
+++ b/gradle/gradle-daemon-jvm.properties
@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3dac61fa3520418a24463c8ab0fb657d/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/36e49ee8ccae613ad2644d8500f772a5/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3dac61fa3520418a24463c8ab0fb657d/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/36e49ee8ccae613ad2644d8500f772a5/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/122eb1e53c9765ae8af90e56755ed282/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9c6285812d65d1cd3bc24546a886d321/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3dac61fa3520418a24463c8ab0fb657d/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/36e49ee8ccae613ad2644d8500f772a5/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/152e833b9fbc59a4d5e9396b9177ad43/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/a3f8aebbf6729e583b14b905c35cff7a/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/8072023b56baadc7174700b008847717/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/41e430b5c9d3027234fcaabca84d2883/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/8072023b56baadc7174700b008847717/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/41e430b5c9d3027234fcaabca84d2883/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/b4213c36e8a475e37b12ff9ffa49c828/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0058d583559422cbe8d2e351b422eb85/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/8072023b56baadc7174700b008847717/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/41e430b5c9d3027234fcaabca84d2883/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/32cc98ecfdb44230e9385eb46a0da918/redirect
+toolchainVendor=AZUL
 toolchainVersion=23