feat: Support local Gradle installation (#926)

README.md

@@ -223,6 +223,7 @@ This extension supports the following settings which are contributed by the [Jav
 - `java.import.gradle.jvmArguments`: JVM arguments to pass to Gradle
 - `java.import.gradle.wrapper.enabled`: Enable/disable the Gradle wrapper
 - `java.import.gradle.version`: Gradle version, used if the Gradle wrapper is missing or disabled
+- `java.import.gradle.home`: Use Gradle from the specified local installation directory or GRADLE_HOME if the Gradle wrapper is missing or disabled and no 'java.import.gradle.version' is specified.
 
 ### Class References
 

extension/src/util/config.ts

@@ -54,6 +54,12 @@ export function getConfigJavaImportGradleVersion(): string | null {
     .get<string | null>('import.gradle.version', null);
 }
 
+export function getConfigJavaImportGradleHome(): string | null {
+  return vscode.workspace
+    .getConfiguration('java')
+    .get<string | null>('import.gradle.home', null);
+}
+
 export function getConfigIsDebugEnabled(): boolean {
   return vscode.workspace
     .getConfiguration('gradle')
@@ -107,9 +113,13 @@ export function getConfigJavaDebug(
 
 export function getGradleConfig(): GradleConfig {
   const gradleConfig = new GradleConfig();
+  const gradleHome = getConfigJavaImportGradleHome();
   const gradleUserHome = getConfigJavaImportGradleUserHome();
   const gradleJvmArguments = getConfigJavaImportGradleJvmArguments();
   const gradleVersion = getConfigJavaImportGradleVersion();
+  if (gradleHome !== null) {
+    gradleConfig.setGradleHome(gradleHome);
+  }
   if (gradleUserHome !== null) {
     gradleConfig.setUserHome(gradleUserHome);
   }

gradle-server/src/main/java/com/github/badsyntax/gradle/GradleProjectConnector.java

@@ -25,11 +25,15 @@ private static void setConnectorConfig(
       gradleConnector.useGradleUserHomeDir(
           buildGradleUserHomeFile(config.getUserHome(), projectDir));
     }
-    if (!config.getWrapperEnabled() && Strings.isNullOrEmpty(config.getVersion())) {
-      throw new GradleConnectionException("Gradle version is required");
-    }
-    if (!Strings.isNullOrEmpty(config.getVersion())) {
-      gradleConnector.useGradleVersion(config.getVersion());
+    if (!config.getWrapperEnabled()) {
+      if (!Strings.isNullOrEmpty(config.getVersion())) {
+        gradleConnector.useGradleVersion(config.getVersion());
+      } else if (!Strings.isNullOrEmpty(config.getGradleHome())) {
+        gradleConnector.useInstallation(new File(config.getGradleHome()));
+      } else {
+        throw new GradleConnectionException(
+            "java.import.gradle.home is invalid, please check it again.");
+      }
     }
   }
 

gradle-server/src/test/java/com/github/badsyntax/gradle/GradleServerTest.java

@@ -200,7 +200,8 @@ public void getBuild_shouldUseGradleUserHome() throws IOException {
   }
 
   @Test
-  public void getBuild_shouldThrowIfWrapperNotEnabledAndNoVersionSpecified() throws IOException {
+  public void getBuild_shouldThrowIfWrapperNotEnabledAndNoVersionAndNoGradleHomeSpecified()
+      throws IOException {
     StreamObserver<GetBuildReply> mockResponseObserver =
         (StreamObserver<GetBuildReply>) mock(StreamObserver.class);
 
@@ -213,7 +214,9 @@ public void getBuild_shouldThrowIfWrapperNotEnabledAndNoVersionSpecified() throw
     ArgumentCaptor<Throwable> onError = ArgumentCaptor.forClass(Throwable.class);
     stub.getBuild(req, mockResponseObserver);
     verify(mockResponseObserver).onError(onError.capture());
-    assertEquals("INTERNAL: Gradle version is required", onError.getValue().getMessage());
+    assertEquals(
+        "INTERNAL: java.import.gradle.home is invalid, please check it again.",
+        onError.getValue().getMessage());
   }
 
   @Test
@@ -342,7 +345,8 @@ public void runBuild_shouldUseGradleUserHome() throws IOException {
   }
 
   @Test
-  public void runBuild_shouldThrowIfWrapperNotEnabledAndNoVersionSpecified() throws IOException {
+  public void runBuild_shouldThrowIfWrapperNotEnabledAndNoVersionAndNoGradleHomeSpecified()
+      throws IOException {
     StreamObserver<RunBuildReply> mockResponseObserver =
         (StreamObserver<RunBuildReply>) mock(StreamObserver.class);
 
@@ -356,7 +360,9 @@ public void runBuild_shouldThrowIfWrapperNotEnabledAndNoVersionSpecified() throw
     ArgumentCaptor<Throwable> onError = ArgumentCaptor.forClass(Throwable.class);
     stub.runBuild(req, mockResponseObserver);
     verify(mockResponseObserver).onError(onError.capture());
-    assertEquals("INTERNAL: Gradle version is required", onError.getValue().getMessage());
+    assertEquals(
+        "INTERNAL: java.import.gradle.home is invalid, please check it again.",
+        onError.getValue().getMessage());
   }
 
   @Test

proto/gradle.proto

@@ -148,6 +148,7 @@ message DaemonInfo {
 }
 
 message GradleConfig {
+  string gradle_home = 1;
   string user_home = 2;
   string jvm_arguments = 3;
   bool wrapper_enabled = 4;