Skip to content

Add support for osx-arm64 for Java and Rust #8

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

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Add support for osx-arm64 for Java and Rust #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions src/multilspy/language_servers/eclipse_jdtls/eclipse_jdtls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ def setupRuntimeDependencies(self, logger: MultilspyLogger, config: MultilspyCon

os.makedirs(str(PurePath(os.path.abspath(os.path.dirname(__file__)), "static")), exist_ok=True)

assert platformId.value in [
"linux-x64",
"win-x64",
], "Only linux-x64 platform is supported for in multilspy at the moment"
# assert platformId.value in [
# "linux-x64",
# "win-x64",
# ], "Only linux-x64 platform is supported for in multilspy at the moment"

gradle_path = str(
PurePath(
Expand Down
9 changes: 7 additions & 2 deletions src/multilspy/language_servers/eclipse_jdtls/runtime_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@
"archiveType": "zip",
"relative_extraction_path": "vscode-java"
},
"darwin-x64": {
"osx-arm64": {
"url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/[email protected]",
"archiveType": "zip",
"relative_extraction_path": "vscode-java"
"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",
"jdtls_readonly_config_path": "extension/server/config_mac_arm"
},
"linux-arm64": {
"url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/[email protected]",
Expand Down
8 changes: 8 additions & 0 deletions src/multilspy/language_servers/rust_analyzer/runtime_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"_description": "Used to download the runtime dependencies for running RustAnalyzer. Obtained from https://github.com/rust-lang/rust-analyzer/releases",
"runtimeDependencies": [
{
"id": "RustAnalyzer",
"description": "RustAnalyzer for Linux (x64)",
"url": "https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-aarch64-apple-darwin.gz",
"platformId": "osx-arm64",
"archiveType": "gz",
"binaryName": "rust_analyzer"
},
{
"id": "RustAnalyzer",
"description": "RustAnalyzer for Linux (x64)",
Expand Down
8 changes: 4 additions & 4 deletions src/multilspy/language_servers/rust_analyzer/rust_analyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ def setup_runtime_dependencies(self, logger: MultilspyLogger, config: MultilspyC
d = json.load(f)
del d["_description"]

assert platform_id.value in [
"linux-x64",
"win-x64",
], "Only linux-x64 and win-x64 platform is supported for in multilspy at the moment"
# assert platform_id.value in [
# "linux-x64",
# "win-x64",
# ], "Only linux-x64 and win-x64 platform is supported for in multilspy at the moment"

runtime_dependencies = d["runtimeDependencies"]
runtime_dependencies = [
Expand Down
Loading