diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index d182c2e97a..ac582004df 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -34,6 +34,7 @@ Release with new features and bugfixes: * https://github.com/devonfw/IDEasy/issues/1884[#1884]: Fix java unzipping losing symlink information * https://github.com/devonfw/IDEasy/issues/1716[#1716]: Add commandlet for Claude Code CLI * https://github.com/devonfw/IDEasy/issues/1844[#1844]: Fix vscode installation hanging indefinitely in WSL Linux environments +* https://github.com/devonfw/IDEasy/issues/863[#863]: Mac x64 / ARM android-studio 2024 releases missing — accept .dmg downloads alongside .zip * https://github.com/devonfw/IDEasy/issues/1904[#1904]: Add Inso CLI to IDEasy commandlets * https://github.com/devonfw/IDEasy/issues/1952[#1952]: Ability for platform specific dependencies * https://github.com/devonfw/IDEasy/issues/1950[#1950]: Fix exit autocompletion diff --git a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java index 052e654300..eb9301e700 100644 --- a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java @@ -44,17 +44,22 @@ protected void addVersion(UrlVersion urlVersion, AndroidJsonItem jsonVersionItem for (AndroidJsonDownload download : jsonVersionItem.download()) { - if (download.link().contains("windows.zip")) { - doAddVersion(urlVersion, download.link(), WINDOWS, X64, download.checksum()); - } else if (download.link().contains("linux.tar.gz")) { - doAddVersion(urlVersion, download.link(), LINUX, X64, download.checksum()); - } else if (download.link().contains("mac.zip")) { - doAddVersion(urlVersion, download.link(), MAC, X64, download.checksum()); - } else if (download.link().contains("mac_arm.zip")) { - doAddVersion(urlVersion, download.link(), MAC, ARM64, download.checksum()); + String link = download.link(); + // windows.exe would otherwise match the "windows." branch below, but IDEasy cannot extract it + if (link.endsWith(".exe")) { + continue; + } + if (link.contains("windows.")) { + doAddVersion(urlVersion, link, WINDOWS, X64, download.checksum()); + } else if (link.contains("linux.")) { + doAddVersion(urlVersion, link, LINUX, X64, download.checksum()); + } else if (link.contains("mac_arm.")) { + doAddVersion(urlVersion, link, MAC, ARM64, download.checksum()); + } else if (link.contains("mac.")) { + doAddVersion(urlVersion, link, MAC, X64, download.checksum()); } else { logger.info("Unknown architecture for tool {} version {} and download {}.", getToolWithEdition(), - jsonVersionItem.version(), download.link()); + jsonVersionItem.version(), link); } } }