diff --git a/src/multilspy/language_servers/eclipse_jdtls/eclipse_jdtls.py b/src/multilspy/language_servers/eclipse_jdtls/eclipse_jdtls.py index ed4bfae..62cab0d 100644 --- a/src/multilspy/language_servers/eclipse_jdtls/eclipse_jdtls.py +++ b/src/multilspy/language_servers/eclipse_jdtls/eclipse_jdtls.py @@ -156,17 +156,18 @@ def setupRuntimeDependencies(self, logger: MultilspyLogger, config: MultilspyCon # "win-x64", # ], "Only linux-x64 platform is supported for in multilspy at the moment" + gradle_version = runtimeDependencies["gradle"]["platform-agnostic"]["version"] gradle_path = str( PurePath( os.path.abspath(os.path.dirname(__file__)), - "static/gradle-7.3.3", + f"static/gradle-{gradle_version}", ) ) if not os.path.exists(gradle_path): FileUtils.download_and_extract_archive( logger, - runtimeDependencies["gradle"]["platform-agnostic"]["url"], + runtimeDependencies["gradle"]["platform-agnostic"]["url"].format(version=gradle_version), str(PurePath(gradle_path).parent), runtimeDependencies["gradle"]["platform-agnostic"]["archiveType"], ) diff --git a/src/multilspy/language_servers/eclipse_jdtls/runtime_dependencies.json b/src/multilspy/language_servers/eclipse_jdtls/runtime_dependencies.json index c224c69..f0775f5 100644 --- a/src/multilspy/language_servers/eclipse_jdtls/runtime_dependencies.json +++ b/src/multilspy/language_servers/eclipse_jdtls/runtime_dependencies.json @@ -2,70 +2,71 @@ "_description": "This file lists the runtime dependencies for the Java Language Server", "gradle": { "platform-agnostic": { - "url": "https://services.gradle.org/distributions/gradle-7.3.3-bin.zip", + "version": "7.6.6", + "url": "https://services.gradle.org/distributions/gradle-{version}-bin.zip", "archiveType": "zip", "relative_extraction_path": "." } }, "vscode-java": { "darwin-arm64": { - "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/java@darwin-arm64-1.23.0.vsix", + "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.46.0/java-darwin-arm64-1.46.0-711.vsix", "archiveType": "zip", "relative_extraction_path": "vscode-java" }, "osx-arm64": { - "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/java@darwin-x64-1.23.0.vsix", + "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.46.0/java-darwin-arm64-1.46.0-711.vsix", "archiveType": "zip", "relative_extraction_path": "vscode-java", - "jre_home_path": "extension/jre/17.0.8.1-macosx-x86_64", - "jre_path": "extension/jre/17.0.8.1-macosx-x86_64/bin/java", - "lombok_jar_path": "extension/lombok/lombok-1.18.30.jar", - "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", + "jre_home_path": "extension/jre/21.0.8-macosx-aarch64", + "jre_path": "extension/jre/21.0.8-macosx-aarch64/bin/java", + "lombok_jar_path": "extension/lombok/lombok-1.18.39-4050.jar", + "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", "jdtls_readonly_config_path": "extension/server/config_mac_arm" }, "osx-x64": { - "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/java@darwin-x64-1.23.0.vsix", + "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.46.0/java-darwin-x64-1.46.0-711.vsix", "archiveType": "zip", "relative_extraction_path": "vscode-java", - "jre_home_path": "extension/jre/17.0.8.1-macosx-x86_64", - "jre_path": "extension/jre/17.0.8.1-macosx-x86_64/bin/java", - "lombok_jar_path": "extension/lombok/lombok-1.18.30.jar", - "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", + "jre_home_path": "extension/jre/21.0.8-macosx-x86_64", + "jre_path": "extension/jre/21.0.8-macosx-x86_64/bin/java", + "lombok_jar_path": "extension/lombok/lombok-1.18.39-4050.jar", + "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", "jdtls_readonly_config_path": "extension/server/config_mac" }, "linux-arm64": { - "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/java@linux-arm64-1.23.0.vsix", + "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.46.0/java-linux-arm64-1.46.0-711.vsix", "archiveType": "zip", "relative_extraction_path": "vscode-java" }, "linux-x64": { - "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/java@linux-x64-1.23.0.vsix", + "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.46.0/java-linux-x64-1.46.0-711.vsix", "archiveType": "zip", "relative_extraction_path": "vscode-java", - "jre_home_path": "extension/jre/17.0.8.1-linux-x86_64", - "jre_path": "extension/jre/17.0.8.1-linux-x86_64/bin/java", - "lombok_jar_path": "extension/lombok/lombok-1.18.30.jar", - "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", + "jre_home_path": "extension/jre/21.0.8-linux-x86_64", + "jre_path": "extension/jre/21.0.8-linux-x86_64/bin/java", + "lombok_jar_path": "extension/lombok/lombok-1.18.39-4050.jar", + "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", "jdtls_readonly_config_path": "extension/server/config_linux" }, "win-x64": { - "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/java@win32-x64-1.23.0.vsix", + "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.46.0/java-win32-x64-1.46.0-711.vsix", "archiveType": "zip", "relative_extraction_path": "vscode-java", - "jre_home_path": "extension/jre/17.0.8.1-win32-x86_64", - "jre_path": "extension/jre/17.0.8.1-win32-x86_64/bin/java.exe", - "lombok_jar_path": "extension/lombok/lombok-1.18.30.jar", - "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", + "jre_home_path": "extension/jre/21.0.8-win32-x86_64", + "jre_path": "extension/jre/21.0.8-win32-x86_64/bin/java.exe", + "lombok_jar_path": "extension/lombok/lombok-1.18.39-4050.jar", + "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", "jdtls_readonly_config_path": "extension/server/config_win" } }, "intellicode": { "platform-agnostic": { - "url": "https://VisualStudioExptTeam.gallery.vsassets.io/_apis/public/gallery/publisher/VisualStudioExptTeam/extension/vscodeintellicode/1.2.30/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage", - "alternate_url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/VisualStudioExptTeam/vsextensions/vscodeintellicode/1.2.30/vspackage", + "url": "https://VisualStudioExptTeam.gallery.vsassets.io/_apis/public/gallery/publisher/VisualStudioExptTeam/extension/vscodeintellicode/1.3.2/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage", + "alternate_url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/VisualStudioExptTeam/vsextensions/vscodeintellicode/1.3.2/vspackage", "archiveType": "zip", "relative_extraction_path": "intellicode", - "intellicode_jar_path": "extension/dist/com.microsoft.jdtls.intellicode.core-0.7.0.jar", + "intellicode_jar_path": "extension/dist/com.microsoft.jdtls.intellicode.core-0.7.1.jar", "intellisense_members_path": "extension/dist/bundledModels/java_intellisense-members" } }