fix - Use 'java.import.gradle.java.home' when it's specified (#1552)

microsoft · Aug 2, 2024 · b71fcb2 · b71fcb2
1 parent 4b505ad
commit b71fcb2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -35,7 +35,7 @@
       "request": "attach",
       "hostName": "localhost",
       "port": "8089",
-      "projectName": "com.github.badsyntax.gradle"
+      "projectName": "gradle-server"
     },
     {
       "name": "Debug Gradle Server & Extension",

diff --git a/extension/src/util/config.ts b/extension/src/util/config.ts
@@ -201,6 +201,7 @@ export function getGradleConfig(): GradleConfig {
     const gradleUserHome = getConfigJavaImportGradleUserHome();
     const gradleJvmArguments = getConfigJavaImportGradleJvmArguments();
     const gradleVersion = getConfigJavaImportGradleVersion();
+    const javaHome = getConfigJavaImportGradleJavaHome();
     if (gradleHome !== null) {
         gradleConfig.setGradleHome(gradleHome);
     }
@@ -213,6 +214,9 @@ export function getGradleConfig(): GradleConfig {
     if (gradleVersion !== null) {
         gradleConfig.setVersion(gradleVersion);
     }
+    if (javaHome !== null) {
+        gradleConfig.setJavaHome(javaHome);
+    }
     gradleConfig.setWrapperEnabled(getConfigJavaImportGradleWrapperEnabled());
     const javaExtension = vscode.extensions.getExtension("redhat.java");
     if (javaExtension) {

diff --git a/gradle-server/src/main/java/com/github/badsyntax/gradle/GradleBuildRunner.java b/gradle-server/src/main/java/com/github/badsyntax/gradle/GradleBuildRunner.java
@@ -2,6 +2,7 @@
 
 import com.github.badsyntax.gradle.exceptions.GradleBuildRunnerException;
 import com.google.common.base.Strings;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -112,6 +113,10 @@ private void runBuild(ProjectConnection connection) throws GradleBuildRunnerExce
 			build.setJvmArguments(gradleConfig.getJvmArguments());
 		}
 
+		if (!Strings.isNullOrEmpty(gradleConfig.getJavaHome())) {
+			build.setJavaHome(new File(gradleConfig.getJavaHome()));
+		}
+
 		build.run();
 	}
 

diff --git a/gradle-server/src/main/java/com/github/badsyntax/gradle/handlers/GetBuildHandler.java b/gradle-server/src/main/java/com/github/badsyntax/gradle/handlers/GetBuildHandler.java
@@ -121,6 +121,9 @@ public void run() {
 			action.withCancellationToken(cancellationToken).addProgressListener(progressListener, progressEvents)
 					.setStandardOutput(standardOutputListener).setStandardError(standardErrorListener)
 					.setColorOutput(req.getShowOutputColors());
+			if (!Strings.isNullOrEmpty(req.getGradleConfig().getJavaHome())) {
+				action.setJavaHome(new File(req.getGradleConfig().getJavaHome()));
+			}
 			GradleProjectModel gradleModel = action.run();
 			if (gradleModel == null) {
 				throw new Exception("Error occurs in querying custom model.");
@@ -193,13 +196,15 @@ private Environment buildEnvironment(ProjectConnection connection) {
 			BuildEnvironment environment = buildEnvironment.get();
 			org.gradle.tooling.model.build.GradleEnvironment gradleEnvironment = environment.getGradle();
 			org.gradle.tooling.model.build.JavaEnvironment javaEnvironment = environment.getJava();
+			String javaHome = Strings.isNullOrEmpty(req.getGradleConfig().getJavaHome())
+					? javaEnvironment.getJavaHome().getAbsolutePath()
+					: req.getGradleConfig().getJavaHome();
 			return Environment.newBuilder()
 					.setGradleEnvironment(GradleEnvironment.newBuilder()
 							.setGradleUserHome(gradleEnvironment.getGradleUserHome().getAbsolutePath())
 							.setGradleVersion(gradleEnvironment.getGradleVersion()))
-					.setJavaEnvironment(
-							JavaEnvironment.newBuilder().setJavaHome(javaEnvironment.getJavaHome().getAbsolutePath())
-									.addAllJvmArgs(javaEnvironment.getJvmArguments()))
+					.setJavaEnvironment(JavaEnvironment.newBuilder().setJavaHome(javaHome)
+							.addAllJvmArgs(javaEnvironment.getJvmArguments()))
 					.build();
 		} finally {
 			GradleBuildCancellation.clearToken(req.getCancellationKey());

diff --git a/proto/gradle.proto b/proto/gradle.proto
@@ -153,6 +153,7 @@ message GradleConfig {
   bool wrapper_enabled = 4;
   string version = 5;
   string java_extension_version = 6;
+  string java_home = 7;
 }
 
 message GradleBuild { GradleProject project = 1; }