From 928e2572000cd2c179f00883f6bfe5cb1cef4a29 Mon Sep 17 00:00:00 2001 From: Adam Parod Date: Tue, 26 Aug 2025 20:38:27 -0500 Subject: [PATCH 1/2] Elixir / NextLS: Add support for the OSX_arm64 platform and update to release v0.23.4 --- .../elixir_tools/elixir_tools.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/solidlsp/language_servers/elixir_tools/elixir_tools.py b/src/solidlsp/language_servers/elixir_tools/elixir_tools.py index 5f6a9794..1986c062 100644 --- a/src/solidlsp/language_servers/elixir_tools/elixir_tools.py +++ b/src/solidlsp/language_servers/elixir_tools/elixir_tools.py @@ -108,6 +108,7 @@ class ElixirTools(SolidLanguageServer): valid_platforms = [ PlatformId.LINUX_x64, + PlatformId.LINUX_arm64, PlatformId.OSX_x64, PlatformId.OSX_arm64, ] @@ -115,20 +116,30 @@ class ElixirTools(SolidLanguageServer): next_ls_dir = os.path.join(cls.ls_resources_dir(solidlsp_settings), "next-ls") + NEXTLS_VERSION = "v0.23.4" + # Define runtime dependencies inline runtime_deps = { PlatformId.LINUX_x64: RuntimeDependency( id="next_ls_linux_amd64", platform_id="linux-x64", - url="https://github.com/elixir-tools/next-ls/releases/download/v0.23.3/next_ls_linux_amd64", + url=f"https://github.com/elixir-tools/next-ls/releases/download/{NEXTLS_VERSION}/next_ls_linux_amd64", archive_type="binary", binary_name="next_ls_linux_amd64", extract_path="next_ls", ), + PlatformId.LINUX_arm64: RuntimeDependency( + id="next_ls_linux_arm64", + platform_id="linux-arm64", + url=f"https://github.com/elixir-tools/next-ls/releases/download/{NEXTLS_VERSION}/next_ls_linux_arm64", + archive_type="binary", + binary_name="next_ls_linux_arm64", + extract_path="next_ls", + ), PlatformId.OSX_x64: RuntimeDependency( id="next_ls_darwin_amd64", platform_id="osx-x64", - url="https://github.com/elixir-tools/next-ls/releases/download/v0.23.3/next_ls_darwin_amd64", + url=f"https://github.com/elixir-tools/next-ls/releases/download/{NEXTLS_VERSION}/next_ls_darwin_amd64", archive_type="binary", binary_name="next_ls_darwin_amd64", extract_path="next_ls", @@ -136,7 +147,7 @@ class ElixirTools(SolidLanguageServer): PlatformId.OSX_arm64: RuntimeDependency( id="next_ls_darwin_arm64", platform_id="osx-arm64", - url="https://github.com/elixir-tools/next-ls/releases/download/v0.23.3/next_ls_darwin_arm64", + url=f"https://github.com/elixir-tools/next-ls/releases/download/{NEXTLS_VERSION}/next_ls_darwin_arm64", archive_type="binary", binary_name="next_ls_darwin_arm64", extract_path="next_ls", From f1fc0dc888f9c1e56d38900dcdb6327a402b38a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Quang=20Tr=C6=B0=E1=BB=9Dng?= Date: Wed, 27 Aug 2025 13:58:24 +0700 Subject: [PATCH 2/2] build: upgrade gradle to 8.14.2 and disable wrapper for fava 21 compatibility --- src/solidlsp/language_servers/eclipse_jdtls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/solidlsp/language_servers/eclipse_jdtls.py b/src/solidlsp/language_servers/eclipse_jdtls.py index d664fb7a..912a09d0 100644 --- a/src/solidlsp/language_servers/eclipse_jdtls.py +++ b/src/solidlsp/language_servers/eclipse_jdtls.py @@ -167,7 +167,7 @@ class EclipseJDTLS(SolidLanguageServer): runtime_dependencies = { "gradle": { "platform-agnostic": { - "url": "https://services.gradle.org/distributions/gradle-7.3.3-bin.zip", + "url": "https://services.gradle.org/distributions/gradle-8.14.2-bin.zip", "archiveType": "zip", "relative_extraction_path": ".", } @@ -244,7 +244,7 @@ class EclipseJDTLS(SolidLanguageServer): gradle_path = str( PurePath( cls.ls_resources_dir(solidlsp_settings), - "gradle-7.3.3", + "gradle-8.14.2", ) ) @@ -531,7 +531,7 @@ class EclipseJDTLS(SolidLanguageServer): }, "gradle": { "enabled": True, - "wrapper": {"enabled": True}, + "wrapper": {"enabled": False}, "version": None, "home": "abs(static/gradle-7.3.3)", "java": {"home": "abs(static/launch_jres/21.0.7-linux-x86_64)"},