diff --git a/README.md b/README.md index 9fd81ace..62c99d64 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This repository contains the WPILib VS Code extension, along with the standalone ## Build Dependencies * Node JS - Tested with Node 8. -* Java - Tested with Java 11 +* Java - Tested with Java 17 * VS Code - For development/debugging. * TS Lint Extension * Chrome Debug Extension diff --git a/vscode-wpilib/locale/zh-cn/message.yaml b/vscode-wpilib/locale/zh-cn/message.yaml index 157276a8..16a10045 100644 --- a/vscode-wpilib/locale/zh-cn/message.yaml +++ b/vscode-wpilib/locale/zh-cn/message.yaml @@ -1,4 +1,4 @@ -Java 11 required, but not found. Might have compilation errors.: 没有找到需要的 Java 11,可能会产生编译错误。 +Java 17 required, but not found. Might have compilation errors.: 没有找到需要的 Java 17,可能会产生编译错误。 # This project is not compatible with this version of the extension. Please create a new project. # It is recommended to run a "Build" after a WPILib update to ensure dependencies are installed correctly. Would you like to do this now? # It is recommended to run a "Build" and update tools after a WPILib update to ensure dependencies are installed correctly. Would you like to do this now? diff --git a/vscode-wpilib/src/extension.ts b/vscode-wpilib/src/extension.ts index a8a2d339..cb0a63ed 100644 --- a/vscode-wpilib/src/extension.ts +++ b/vscode-wpilib/src/extension.ts @@ -110,7 +110,7 @@ async function handleAfterTrusted(externalApi: ExternalAPI, context: vscode.Exte } setJavaHome(jdkLoc); } else { - vscode.window.showErrorMessage(i18n('message', 'Java 11 required, but not found. Might have compilation errors.')); + vscode.window.showErrorMessage(i18n('message', 'Java 17 required, but not found. Might have compilation errors.')); } // Activate the C++ parts of the extension diff --git a/vscode-wpilib/src/jdkdetector.ts b/vscode-wpilib/src/jdkdetector.ts index d8e8c62c..83768a9a 100644 --- a/vscode-wpilib/src/jdkdetector.ts +++ b/vscode-wpilib/src/jdkdetector.ts @@ -43,7 +43,7 @@ export async function findJdkPath(api: IExternalAPI): Promise= 11) { + if (javaVersion >= 17) { logger.log(`Found Java Home Version: ${javaVersion} at ${vscodeJavaHome}`); return vscodeJavaHome; } else { @@ -60,7 +60,7 @@ export async function findJdkPath(api: IExternalAPI): Promise= 11) { + if (javaVersion >= 17) { logger.log(`Found Java Home Version: ${javaVersion} at ${frcHomeJava}`); return frcHomeJava; } else {