From faf1d7ca7a3424babe9ed2a8ac069f66896135ad Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Sat, 18 Jan 2025 10:30:15 -0700
Subject: [PATCH] Copy the raw JDK path into toolchains.xml

Previously we were relying on Gradle to substitute JDK environment variables
in toolchains.xml. With this change, the actual path to the JDK is encoded instead.
This should avoid issues where Gradle is not able to successfully resolve the
envioronment variable.
---
 sources/src/caching/gradle-user-home-utils.ts   |  8 +++++---
 sources/test/jest/predefined-toolchains.test.ts | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sources/src/caching/gradle-user-home-utils.ts b/sources/src/caching/gradle-user-home-utils.ts
index d20bc22..0bc89ae 100644
--- a/sources/src/caching/gradle-user-home-utils.ts
+++ b/sources/src/caching/gradle-user-home-utils.ts
@@ -16,9 +16,9 @@ export function getPredefinedToolchains(): string | null {
     // Get the version and path for each JAVA_HOME env var
     const javaHomeEnvs = Object.entries(process.env)
         .filter(([key]) => key.startsWith('JAVA_HOME_') && process.env[key])
-        .map(([key, _value]) => ({
+        .map(([key, value]) => ({
             jdkVersion: key.match(/JAVA_HOME_(\d+)_/)?.[1] ?? null,
-            jdkPath: `\${env.${key}}`
+            jdkPath: value as string
         }))
         .filter(env => env.jdkVersion !== null)
 
@@ -40,7 +40,9 @@ ${javaHomeEnvs
     <configuration>
       <jdkHome>${jdkPath}</jdkHome>
     </configuration>
-  </toolchain>`).join('\n')}
+  </toolchain>`
+    )
+    .join('\n')}
 </toolchains>\n`
 }
 
diff --git a/sources/test/jest/predefined-toolchains.test.ts b/sources/test/jest/predefined-toolchains.test.ts
index 4e4f01e..637d9b9 100644
--- a/sources/test/jest/predefined-toolchains.test.ts
+++ b/sources/test/jest/predefined-toolchains.test.ts
@@ -39,7 +39,7 @@ describe('predefined-toolchains', () => {
       <version>8</version>
     </provides>
     <configuration>
-      <jdkHome>\${env.JAVA_HOME_8_X64}</jdkHome>
+      <jdkHome>/jdks/foo_8</jdkHome>
     </configuration>
   </toolchain>
   <toolchain>
@@ -48,7 +48,7 @@ describe('predefined-toolchains', () => {
       <version>11</version>
     </provides>
     <configuration>
-      <jdkHome>\${env.JAVA_HOME_11_X64}</jdkHome>
+      <jdkHome>/jdks/foo_11</jdkHome>
     </configuration>
   </toolchain>
   <toolchain>
@@ -57,7 +57,7 @@ describe('predefined-toolchains', () => {
       <version>21</version>
     </provides>
     <configuration>
-      <jdkHome>\${env.JAVA_HOME_21_ARM64}</jdkHome>
+      <jdkHome>/jdks/foo_21</jdkHome>
     </configuration>
   </toolchain>
 </toolchains>
@@ -81,7 +81,7 @@ describe('predefined-toolchains', () => {
       <version>8</version>
     </provides>
     <configuration>
-      <jdkHome>\${env.JAVA_HOME_8_X64}</jdkHome>
+      <jdkHome>/jdks/foo_8</jdkHome>
     </configuration>
   </toolchain>
 </toolchains>
@@ -98,7 +98,7 @@ describe('predefined-toolchains', () => {
       <version>8</version>
     </provides>
     <configuration>
-      <jdkHome>\${env.JAVA_HOME_8_X64}</jdkHome>
+      <jdkHome>/jdks/foo_8</jdkHome>
     </configuration>
   </toolchain>
 
@@ -109,7 +109,7 @@ describe('predefined-toolchains', () => {
       <version>11</version>
     </provides>
     <configuration>
-      <jdkHome>\${env.JAVA_HOME_11_X64}</jdkHome>
+      <jdkHome>/jdks/foo_11</jdkHome>
     </configuration>
   </toolchain>
 </toolchains>