Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Task Server jdk search compatibility check #1547

Merged
merged 4 commits into from
Aug 1, 2024
Merged

Fix: Task Server jdk search compatibility check #1547

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
206ff50
Fix: Task server jdk search sequence
Jiaaming Aug 1, 2024
ca36674
Fix: typo
Jiaaming Aug 1, 2024
33112b2
rename & add change log
Jiaaming Aug 1, 2024
62d2613
rename & add change log
Jiaaming Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions extension/src/server/serverUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import {
checkEnvJavaExecutable,
findValidJavaHome,
getConfigJavaImportGradleJavaHome,
getNeededConfigJavaImportGradleJavaHome,
getRedHatJavaEmbeddedJRE,
REQUIRED_JDK_VERSION,
} from "../util/config";
import { GRADLE_SERVER_BASE_JVM_OPTS } from "../constant";

Expand All @@ -26,7 +27,10 @@ export function quoteArg(arg: string): string {
}

export async function getGradleServerEnv(): Promise<ProcessEnv | undefined> {
const javaHome = getConfigJavaImportGradleJavaHome() || getRedHatJavaEmbeddedJRE() || (await findValidJavaHome());
const javaHome =
(await getNeededConfigJavaImportGradleJavaHome(REQUIRED_JDK_VERSION)) ||
getRedHatJavaEmbeddedJRE() ||
(await findValidJavaHome());
const env = { ...process.env };
if (javaHome) {
Object.assign(env, {
Expand Down
13 changes: 12 additions & 1 deletion extension/src/util/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as fse from "fs-extra";
import * as path from "path";
import { findDefaultRuntimeFromSettings, getMajorVersion, listJdks } from "./jdkUtils";
type AutoDetect = "on" | "off";
const REQUIRED_JDK_VERSION = 17;
export const REQUIRED_JDK_VERSION = 17;

export function getConfigIsAutoDetectionEnabled(rootProject: RootProject): boolean {
return (
Expand All @@ -29,6 +29,17 @@ export function getConfigJavaImportGradleJavaHome(): string | null {
return vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.java.home", null);
}

export async function getNeededConfigJavaImportGradleJavaHome(requiredJdkVersion: number): Promise<string | null> {
const javaHome = vscode.workspace.getConfiguration("java").get<string | null>("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);
}
Expand Down
Loading