From 00f3b38f880d3ee6ddece9fd08a9afdc03685336 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 28 May 2026 13:53:25 -0700
Subject: [PATCH] fix(ci): cache JetBrains JDK and simplify daemon JVM config
 (#5650)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/actions/gradle-setup/action.yml |  8 ++++++++
 gradle/gradle-daemon-jvm.properties     | 11 -----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/actions/gradle-setup/action.yml b/.github/actions/gradle-setup/action.yml
index 29aafda950..a88fc4a859 100644
--- a/.github/actions/gradle-setup/action.yml
+++ b/.github/actions/gradle-setup/action.yml
@@ -30,6 +30,14 @@ runs:
         distribution: ${{ inputs.jdk_distribution }}
         token: ${{ github.token }}
 
+    - name: Restore cached JetBrains JDK 21
+      if: inputs.install_jetbrains_jdk == 'true'
+      id: cache-jbr
+      uses: actions/cache@v4
+      with:
+        path: ${{ runner.tool_cache }}/Java_JetBrains_jdk
+        key: jbr-21-${{ runner.os }}-${{ runner.arch }}
+
     - name: Set up JetBrains JDK 21 (for Compose Desktop)
       if: inputs.install_jetbrains_jdk == 'true'
       uses: actions/setup-java@v5
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
index 16c0c7b144..52234b5ce8 100644
--- a/gradle/gradle-daemon-jvm.properties
+++ b/gradle/gradle-daemon-jvm.properties
@@ -1,12 +1 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/f257be9f04bfdf169051808541767806/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/1dcbacacca32618bd21ec5465779ade1/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1e91f45234d88a64dafb961c93ddc75a/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/5a88b04b5e582b332d2e6bc12b45f1b9/redirect
 toolchainVersion=21