diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/com.microsoft.gradle.bs.importer.tp.target b/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/com.microsoft.gradle.bs.importer.tp.target
index 65fafd057..4d5f4d344 100644
--- a/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/com.microsoft.gradle.bs.importer.tp.target
+++ b/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/com.microsoft.gradle.bs.importer.tp.target
@@ -33,7 +33,7 @@
-
+
diff --git a/extension/src/server/serverUtil.ts b/extension/src/server/serverUtil.ts
index 192795d02..427d229d2 100644
--- a/extension/src/server/serverUtil.ts
+++ b/extension/src/server/serverUtil.ts
@@ -1,10 +1,4 @@
-import {
- checkEnvJavaExecutable,
- findValidJavaHome,
- getConfigJavaImportGradleJavaHomeIfHigherThan,
- getRedHatJavaEmbeddedJRE,
- REQUIRED_JDK_VERSION,
-} from "../util/config";
+import { checkEnvJavaExecutable, findValidJavaHome, getRedHatJavaEmbeddedJRE } from "../util/config";
import { GRADLE_SERVER_BASE_JVM_OPTS } from "../constant";
export function getGradleServerCommand(): string {
@@ -27,10 +21,7 @@ export function quoteArg(arg: string): string {
}
export async function getGradleServerEnv(): Promise {
- const javaHome =
- (await getConfigJavaImportGradleJavaHomeIfHigherThan(REQUIRED_JDK_VERSION)) ||
- getRedHatJavaEmbeddedJRE() ||
- (await findValidJavaHome());
+ const javaHome = getRedHatJavaEmbeddedJRE() || (await findValidJavaHome());
const env = { ...process.env };
if (javaHome) {
Object.assign(env, {
diff --git a/extension/src/util/config.ts b/extension/src/util/config.ts
index 76dd213f5..88c146e93 100644
--- a/extension/src/util/config.ts
+++ b/extension/src/util/config.ts
@@ -29,25 +29,12 @@ export function getConfigJavaImportGradleJavaHome(): string | null {
return vscode.workspace.getConfiguration("java").get("import.gradle.java.home", null);
}
-export async function getConfigJavaImportGradleJavaHomeIfHigherThan(
- requiredJdkVersion: number
-): Promise {
- const javaHome = vscode.workspace.getConfiguration("java").get("import.gradle.java.home", null);
- if (javaHome) {
- const javaVersion = await getMajorVersion(javaHome);
- if (javaVersion >= requiredJdkVersion) {
- return javaHome;
- }
- }
- return null;
-}
-
export function getJavaExecutablePathFromJavaHome(javaHome: string): string {
return path.join(javaHome, "bin", JAVA_FILENAME);
}
export async function findValidJavaHome(): Promise {
- const javaHomeGetters = [getJdtlsConfigJavaHome, getConfigJavaHome];
+ const javaHomeGetters = [getConfigJavaImportGradleJavaHome, getJdtlsConfigJavaHome, getConfigJavaHome];
let javaHome: string | undefined = undefined;
let javaVersion = 0;