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
${jdkPath}
- `).join('\n')}
+ `
+ )
+ .join('\n')}
\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', () => {
8
- \${env.JAVA_HOME_8_X64}
+ /jdks/foo_8
@@ -48,7 +48,7 @@ describe('predefined-toolchains', () => {
11
- \${env.JAVA_HOME_11_X64}
+ /jdks/foo_11
@@ -57,7 +57,7 @@ describe('predefined-toolchains', () => {
21
- \${env.JAVA_HOME_21_ARM64}
+ /jdks/foo_21
@@ -81,7 +81,7 @@ describe('predefined-toolchains', () => {
8
- \${env.JAVA_HOME_8_X64}
+ /jdks/foo_8
@@ -98,7 +98,7 @@ describe('predefined-toolchains', () => {
8
- \${env.JAVA_HOME_8_X64}
+ /jdks/foo_8
@@ -109,7 +109,7 @@ describe('predefined-toolchains', () => {
11
- \${env.JAVA_HOME_11_X64}
+ /jdks/foo_11