fix: set GradleExecution jdk use java.import.gradle.java.home (#1491)

microsoft · May 29, 2024 · 4e76ebc · 4e76ebc
1 parent 44a4bfc
commit 4e76ebc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/extension/src/views/gradleDaemons/services/GradleLocalInstallation.ts b/extension/src/views/gradleDaemons/services/GradleLocalInstallation.ts
@@ -1,5 +1,8 @@
 import { GradleExecution } from "./GradleExecution";
 import { execAsync } from "../../../util/execAsync";
+import { getConfigJavaImportGradleJavaHome } from "../../../util/config";
+import { logger } from "../../../logger";
+
 export class GradleLocalInstallation implements GradleExecution {
     private gradleHomePath: string;
 
@@ -15,13 +18,17 @@ export class GradleLocalInstallation implements GradleExecution {
         const command = `${this.gradleHomePath} ${args.join(" ")}`;
 
         try {
-            const { stdout, stderr } = await execAsync(command);
+            const jdkPath = getConfigJavaImportGradleJavaHome();
+            const env = jdkPath ? { ...process.env, JAVA_HOME: jdkPath } : process.env;
+
+            const { stdout, stderr } = await execAsync(command, { env });
             if (stderr) {
-                throw new Error(`Error running gradle: ${stderr}`);
+                logger.error(stderr);
             }
             return stdout;
         } catch (error) {
-            throw new Error(`Error running gradle: ${error.message}`);
+            logger.error(error.message);
+            throw new Error(`Error running gradle local installation: ${error.message}`);
         }
     }
 }
diff --git a/extension/src/views/gradleDaemons/services/GradleWrapper.ts b/extension/src/views/gradleDaemons/services/GradleWrapper.ts
@@ -2,9 +2,12 @@ import * as fse from "fs-extra";
 import { execAsync } from "../../../util/execAsync";
 import { GradleExecution } from "./GradleExecution";
 import * as path from "path";
+import { getConfigJavaImportGradleJavaHome } from "../../../util/config";
+import { logger } from "../../../logger";
 
 export class GradleWrapper implements GradleExecution {
     private gradleWrapperPath: string;
+
     constructor(private projectRoot: string) {
         const wrapperName = process.platform === "win32" ? "gradlew.bat" : "gradlew";
         this.gradleWrapperPath = path.join(projectRoot, wrapperName);
@@ -17,12 +20,16 @@ export class GradleWrapper implements GradleExecution {
 
         const command = `${this.gradleWrapperPath} ${args.join(" ")}`;
         try {
-            const { stdout, stderr } = await execAsync(command, { cwd: this.projectRoot });
+            const jdkPath = getConfigJavaImportGradleJavaHome();
+            const env = jdkPath ? { ...process.env, JAVA_HOME: jdkPath } : process.env;
+
+            const { stdout, stderr } = await execAsync(command, { cwd: this.projectRoot, env });
             if (stderr) {
-                throw new Error(`Error running gradle wrapper: ${stderr}`);
+                logger.error(stderr);
             }
             return stdout;
         } catch (error) {
+            logger.error(error.message);
             throw new Error(`Error running gradle wrapper: ${error.message}`);
         }
     }