diff --git a/.cargo/config.toml b/.cargo/config.toml index d4ed40327ba..c56de77287a 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,3 +1,6 @@ +[target.aarch64-pc-windows-msvc] +linker = "rust-lld" + # Windows has stack overflows when calling from Tauri, so we increase the default stack size used by the compiler [target."cfg(windows)"] rustflags = ["-C", "link-args=/STACK:16777220"] diff --git a/.github/scripts/notify-app-build.mjs b/.github/scripts/notify-app-build.mjs index f714f9014c3..355ac6f6dd4 100644 --- a/.github/scripts/notify-app-build.mjs +++ b/.github/scripts/notify-app-build.mjs @@ -15,19 +15,29 @@ const { const PLATFORMS = [ { label: 'Windows', - job: 'Build (namespace-profile-modrinth-app-windows)', + job: 'Build (x86_64-pc-windows-msvc)', artifact: 'App bundle (x86_64-pc-windows-msvc)', }, + { + label: 'Windows ARM', + job: 'Build (aarch64-pc-windows-msvc)', + artifact: 'App bundle (aarch64-pc-windows-msvc)', + }, { label: 'MacOS', - job: 'Build (namespace-profile-modrinth-app-macos)', + job: 'Build (universal-apple-darwin)', artifact: 'App bundle (universal-apple-darwin)', }, { label: 'Linux', - job: 'Build (namespace-profile-modrinth-app-linux)', + job: 'Build (x86_64-unknown-linux-gnu)', artifact: 'App bundle (x86_64-unknown-linux-gnu)', }, + { + label: 'Linux ARM', + job: 'Build (aarch64-unknown-linux-gnu)', + artifact: 'App bundle (aarch64-unknown-linux-gnu)', + }, ] const runUrl = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}` diff --git a/.github/workflows/theseus-build.yml b/.github/workflows/theseus-build.yml index d5b8511c703..1314c051eb5 100644 --- a/.github/workflows/theseus-build.yml +++ b/.github/workflows/theseus-build.yml @@ -50,26 +50,27 @@ env: jobs: build: - name: Build + name: Build (${{ matrix.artifact-target-name }}) env: VITE_STRIPE_PUBLISHABLE_KEY: pk_live_51JbFxJJygY5LJFfKLVVldb10HlLt24p421OWRsTOWc5sXYFOnFUXWieSc6HD3PHo25ktx8db1WcHr36XGFvZFVUz00V9ixrCs5 RUSTC_WRAPPER: 'sccache' strategy: fail-fast: false matrix: - platform: - [ - namespace-profile-modrinth-app-macos, - namespace-profile-modrinth-app-windows, - namespace-profile-modrinth-app-linux, - ] include: - platform: namespace-profile-modrinth-app-macos artifact-target-name: universal-apple-darwin + rust-target: x86_64-apple-darwin - platform: namespace-profile-modrinth-app-windows artifact-target-name: x86_64-pc-windows-msvc + - platform: namespace-profile-modrinth-app-windows-arm64 + artifact-target-name: aarch64-pc-windows-msvc + rust-target: aarch64-pc-windows-msvc + tauri-target-args: --target aarch64-pc-windows-msvc - platform: namespace-profile-modrinth-app-linux artifact-target-name: x86_64-unknown-linux-gnu + - platform: namespace-profile-modrinth-app-linux-arm64 + artifact-target-name: aarch64-unknown-linux-gnu runs-on: ${{ matrix.platform }} @@ -84,7 +85,8 @@ jobs: with: rustflags: '' build-warnings: '' - target: ${{ contains(matrix.artifact-target-name, 'darwin') && 'x86_64-apple-darwin' || '' }} + target: ${{ matrix.rust-target }} + cache: false - name: Setup mold if: contains(matrix.artifact-target-name, 'linux') @@ -216,7 +218,7 @@ jobs: [System.Convert]::FromBase64String("$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64") | Set-Content -Path signer-client-cert.p12 -AsByteStream $env:DIGICERT_ONE_SIGNER_CREDENTIALS = "$env:DIGICERT_ONE_SIGNER_API_KEY|$PWD\signer-client-cert.p12|$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD" $env:JAVA_HOME = "$env:JAVA_HOME_17_X64" - ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || inputs.app-version-override != '') && 'pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json --verbose --bundles "nsis,updater"' || 'pnpm --filter=@modrinth/app run tauri build --config tauri-dev.conf.json --verbose --bundles "nsis,updater" ''--'' --profile release-with-thin-lto' }} + ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || inputs.app-version-override != '') && format('pnpm --filter=@modrinth/app run tauri build {0} --config tauri-release.conf.json --verbose --bundles "nsis,updater"', matrix.tauri-target-args) || format('pnpm --filter=@modrinth/app run tauri build {0} --config tauri-dev.conf.json --verbose --bundles "nsis,updater" ''--'' --profile release-with-thin-lto', matrix.tauri-target-args) }} Remove-Item -Path signer-client-cert.p12 -ErrorAction SilentlyContinue if: contains(matrix.artifact-target-name, 'windows') env: @@ -244,6 +246,9 @@ jobs: target/release/bundle/nsis/Modrinth App_*-setup.exe* target/release-with-thin-lto/bundle/nsis/Modrinth App (dev-*)_*-setup.exe* target/release/bundle/nsis/Modrinth App_*-setup.nsis.zip* + target/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_*-setup.exe* + target/aarch64-pc-windows-msvc/release-with-thin-lto/bundle/nsis/Modrinth App (dev-*)_*-setup.exe* + target/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_*-setup.nsis.zip* - name: Remove bundles from cached target directory if: always() diff --git a/.github/workflows/theseus-release.yml b/.github/workflows/theseus-release.yml index ee52f249be9..c6cbbf4d5b0 100644 --- a/.github/workflows/theseus-release.yml +++ b/.github/workflows/theseus-release.yml @@ -19,7 +19,9 @@ jobs: env: VERSION_TAG: ${{ github.event.workflow_run.head_branch }} LINUX_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-unknown-linux-gnu) + LINUX_ARM64_BUNDLE_ARTIFACT_NAME: App bundle (aarch64-unknown-linux-gnu) WINDOWS_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-pc-windows-msvc) + WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME: App bundle (aarch64-pc-windows-msvc) MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME: App bundle (universal-apple-darwin) LAUNCHER_FILES_BUCKET_BASE_URL: https://launcher-files.modrinth.com @@ -72,7 +74,9 @@ jobs: --rawfile macOsAarch64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \ --rawfile macOsX64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \ --rawfile linuxX64UpdateArtifactSignature "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION_TAG#v}_amd64.AppImage.tar.gz.sig" \ + --rawfile linuxArm64UpdateArtifactSignature "${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION_TAG#v}_aarch64.AppImage.tar.gz.sig" \ --rawfile windowsX64UpdateArtifactSignature "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/nsis/Modrinth App_${VERSION_TAG#v}_x64-setup.nsis.zip.sig" \ + --rawfile windowsArm64UpdateArtifactSignature "${WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME}/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_${VERSION_TAG#v}_arm64-setup.nsis.zip.sig" \ '{ "version": $versionTag, "notes": $releaseNotes, @@ -97,10 +101,24 @@ jobs: @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App-" + $versionTag + "-1.x86_64.rpm")" ] }, + "linux-aarch64": { + "signature": $linuxArm64UpdateArtifactSignature, + "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_aarch64.AppImage.tar.gz")", + "install_urls": [ + @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_arm64.deb")", + @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_aarch64.AppImage")", + @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App-" + $versionTag + "-1.aarch64.rpm")" + ] + }, "windows-x86_64": { "signature": $windowsX64UpdateArtifactSignature, "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_x64-setup.nsis.zip")", "install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_x64-setup.exe")"] + }, + "windows-aarch64": { + "signature": $windowsArm64UpdateArtifactSignature, + "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_arm64-setup.nsis.zip")", + "install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_arm64-setup.exe")"] } } }' > updates.json @@ -133,12 +151,18 @@ jobs: aws s3 cp --recursive \ "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/${linuxBundleType}" \ "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/linux" + aws s3 cp --recursive \ + "${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/${linuxBundleType}" \ + "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/linux" done for windowsBundleType in 'nsis'; do aws s3 cp --recursive \ "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/${windowsBundleType}" \ "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/windows" + aws s3 cp --recursive \ + "${WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME}/aarch64-pc-windows-msvc/release/bundle/${windowsBundleType}" \ + "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/windows" done aws s3 cp updates.json "s3://${AWS_BUCKET}" @@ -153,7 +177,11 @@ jobs: --title "Modrinth App ${VERSION}" \ --notes-file release-notes.md \ "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/nsis/Modrinth App_${VERSION}_x64-setup.exe" \ + "${WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME}/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_${VERSION}_arm64-setup.exe" \ "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/dmg/Modrinth App_${VERSION}_universal.dmg" \ "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION}_amd64.AppImage" \ "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/deb/Modrinth App_${VERSION}_amd64.deb" \ - "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/rpm/Modrinth App-${VERSION}-1.x86_64.rpm" + "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/rpm/Modrinth App-${VERSION}-1.x86_64.rpm" \ + "${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION}_aarch64.AppImage" \ + "${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/deb/Modrinth App_${VERSION}_arm64.deb" \ + "${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/rpm/Modrinth App-${VERSION}-1.aarch64.rpm" diff --git a/Cargo.lock b/Cargo.lock index 98384820be8..19e928c38f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13807,6 +13807,7 @@ dependencies = [ "shlex 2.0.1", "sqlx", "sysinfo 0.38.4", + "tar", "tauri", "tempfile", "thiserror 2.0.21", diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index abf95a03885..f748f23de78 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -548,15 +548,24 @@ "app-marketing.download.download-appimage": { "message": "Download the AppImage" }, + "app-marketing.download.download-appimage-arm64": { + "message": "Download the AppImage (ARM64)" + }, "app-marketing.download.download-beta": { "message": "Download the beta" }, "app-marketing.download.download-deb": { "message": "Download the DEB" }, + "app-marketing.download.download-deb-arm64": { + "message": "Download the DEB (ARM64)" + }, "app-marketing.download.download-rpm": { "message": "Download the RPM" }, + "app-marketing.download.download-rpm-arm64": { + "message": "Download the RPM (ARM64)" + }, "app-marketing.download.flathub": { "message": "Get it on Flathub" }, diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue index 4905abcce0a..222614023e4 100644 --- a/apps/frontend/src/pages/app.vue +++ b/apps/frontend/src/pages/app.vue @@ -42,7 +42,9 @@ interface LauncherUpdates { platforms: { 'darwin-aarch64': LauncherPlatform 'windows-x86_64': LauncherPlatform + 'windows-aarch64'?: LauncherPlatform 'linux-x86_64': LauncherPlatform + 'linux-aarch64'?: LauncherPlatform } } @@ -52,6 +54,7 @@ const downloadWindows = ref(null) const downloadMac = ref(null) const downloadSection = ref(null) const windowsLink = ref(null) +const windowsArm64Link = ref(null) const linuxLinks = reactive({ appImage: null as string | null, @@ -60,6 +63,12 @@ const linuxLinks = reactive({ thirdParty: 'https://support.modrinth.com/en/articles/9298760', }) +const linuxArm64Links = reactive({ + appImage: null as string | null, + deb: null as string | null, + rpm: null as string | null, +}) + const macLinks = reactive({ universal: null as string | null, }) @@ -218,9 +227,13 @@ watch( if (newData?.platforms) { macLinks.universal = newData.platforms['darwin-aarch64']?.install_urls[0] || null windowsLink.value = newData.platforms['windows-x86_64']?.install_urls[0] || null + windowsArm64Link.value = newData.platforms['windows-aarch64']?.install_urls[0] || null linuxLinks.appImage = newData.platforms['linux-x86_64']?.install_urls[1] || null linuxLinks.deb = newData.platforms['linux-x86_64']?.install_urls[0] || null linuxLinks.rpm = newData.platforms['linux-x86_64']?.install_urls[2] || null + linuxArm64Links.appImage = newData.platforms['linux-aarch64']?.install_urls[1] || null + linuxArm64Links.deb = newData.platforms['linux-aarch64']?.install_urls[0] || null + linuxArm64Links.rpm = newData.platforms['linux-aarch64']?.install_urls[2] || null } }, { immediate: true }, @@ -475,6 +488,18 @@ const messages = defineMessages({ id: 'app-marketing.download.download-rpm', defaultMessage: 'Download the RPM', }, + downloadTheAppImageArm64: { + id: 'app-marketing.download.download-appimage-arm64', + defaultMessage: 'Download the AppImage (ARM64)', + }, + downloadTheDEBArm64: { + id: 'app-marketing.download.download-deb-arm64', + defaultMessage: 'Download the DEB (ARM64)', + }, + downloadTheRPMArm64: { + id: 'app-marketing.download.download-rpm-arm64', + defaultMessage: 'Download the RPM (ARM64)', + }, downloadTerms: { id: 'app-marketing.download.terms', defaultMessage: @@ -1011,6 +1036,16 @@ useSeoMeta({ {{ formatMessage(messages.downloadTheBeta) }} + diff --git a/apps/meta-generator/src/import/mojang/library/library-patches.json b/apps/meta-generator/src/import/mojang/library/library-patches.json index df750e02b30..05eb4ba111e 100644 --- a/apps/meta-generator/src/import/mojang/library/library-patches.json +++ b/apps/meta-generator/src/import/mojang/library/library-patches.json @@ -2883,5 +2883,1377 @@ ] } ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-shaderc:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "bc5c99b2eb7e2109c6db21cfced15a6851f8111b", + "size": 3397476, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-shaderc/lwjgl-shaderc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-shaderc-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-spvc:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "e2eaa8f516d43fe11b8253e6243b3d8e1315c9c8", + "size": 1139919, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-spvc/lwjgl-spvc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-spvc-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-vma:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "de40d43c5947c4a4f91376af8f2c00e5396cc109", + "size": 59715, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-vma/lwjgl-vma-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-vma-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-freetype:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "b5492439c7c9a596655d0d0e06801f93ec491e53", + "size": 1256276, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-freetype/lwjgl-freetype-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-freetype-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-glfw:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "b54023af492b4c2c72451f3a7aa0f385e9969474", + "size": 141056, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-glfw/lwjgl-glfw-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-glfw-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-jemalloc:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "1bc2e16e70df7f418d668c2984ac8066f1f6f5b1", + "size": 222196, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-jemalloc/lwjgl-jemalloc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-jemalloc-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-openal:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "fd2c17603c63e8d543cb57d1db77ebd4574f3b7a", + "size": 656568, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-openal/lwjgl-openal-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-openal-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-opengl:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "44de180f79e0b45c9e5bee10ca7540dcb5ddd373", + "size": 79414, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-opengl/lwjgl-opengl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-opengl-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-stb:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "397f588f867e9c4faf1a34231344c9209dabc052", + "size": 256144, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-stb/lwjgl-stb-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-stb-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl-tinyfd:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "7806e57c3d9ea6b6a552c72f5e2597343c4d4138", + "size": 44504, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl-tinyfd/lwjgl-tinyfd-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-tinyfd-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.3.6", + "match": ["org.lwjgl:lwjgl:3.3.6"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "9eeb8887b5e3aa672efd2e1b0973ffa5891a3151", + "size": 117172, + "url": "https://build.lwjgl.org/release/3.3.6/bin/lwjgl/lwjgl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-natives-linux-arm64:3.3.6-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-freetype:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "8f37d0da3386ff602ec54cd06626881895711041", + "size": 1309568, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-freetype/lwjgl-freetype-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-freetype-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-sdl:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "b5a62eb82113b0227077fb270128487a80a20299", + "size": 1434288, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-sdl/lwjgl-sdl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-sdl-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-glfw:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "e5e87034c47118960746077dba46280e8de864b3", + "size": 141530, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-glfw/lwjgl-glfw-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-glfw-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-jemalloc:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "7891964dfb723209c6d02b0401432348fb707cc0", + "size": 238730, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-jemalloc/lwjgl-jemalloc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-jemalloc-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-openal:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "3729b70cdd42df5571b075e051fa2fc8586dc538", + "size": 839895, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-openal/lwjgl-openal-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-openal-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-opengl:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "61a4103e56bbaeb74ad3f19ec14299fd6891c4b0", + "size": 79752, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-opengl/lwjgl-opengl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-opengl-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-stb:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "3bc107f901f931fea07cb0d80b1d74a34b806a2b", + "size": 259116, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-stb/lwjgl-stb-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-stb-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl-tinyfd:3.4.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "20771d2b4e01f5295156912ab62e170508aef618", + "size": 45433, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl-tinyfd/lwjgl-tinyfd-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-tinyfd-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.1", + "match": ["org.lwjgl:lwjgl:3.4.1", "org.lwjgl:lwjgl:3.4.1:unsafe"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "46883f3b622d8b4d7f27b627ca3360cda3db0e0e", + "size": 120615, + "url": "https://build.lwjgl.org/release/3.4.1/bin/lwjgl/lwjgl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-natives-linux-arm64:3.4.1-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-freetype:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "b5fb3db06d1ecb15f54fabda6a4914ae933525ee", + "size": 1319451, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-freetype/lwjgl-freetype-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-freetype-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-shaderc:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "23403f5c295d946d1d2f7785c551f48be2b2fe9b", + "size": 3463790, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-shaderc/lwjgl-shaderc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-shaderc-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-spvc:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "8d7b46d68788d217143eee402126ea286d100683", + "size": 1166742, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-spvc/lwjgl-spvc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-spvc-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-vma:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "c6fb35dd852aedf2266d462c9b7142c41a860298", + "size": 60868, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-vma/lwjgl-vma-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-vma-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-sdl:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "e723c33b467c5ff2af02942a1459db4e3686ce57", + "size": 1455063, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-sdl/lwjgl-sdl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-sdl-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-jemalloc:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "8e51830cf9077fb0a89a6f43fa09df55c8c0e8ef", + "size": 235933, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-jemalloc/lwjgl-jemalloc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-jemalloc-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-openal:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "a3c98570beeffd241263e9bc63d8650147b33c4c", + "size": 866040, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-openal/lwjgl-openal-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-openal-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-opengl:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "52f6e847226e41f60773a62314cfada4f82b578c", + "size": 80853, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-opengl/lwjgl-opengl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-opengl-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-stb:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "30a261559033e22e7eb7f9a4ac1f2ea96d76f4d8", + "size": 258999, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-stb/lwjgl-stb-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-stb-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl-tinyfd:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "03b72a19851c1e4fa0ad51a03f78d08f664afc91", + "size": 45348, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl-tinyfd/lwjgl-tinyfd-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-tinyfd-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.2", + "match": ["org.lwjgl:lwjgl:3.4.2"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "a2229c542e410157bc79aead90243bd50dbcd79c", + "size": 125841, + "url": "https://build.lwjgl.org/release/3.4.2/bin/lwjgl/lwjgl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-natives-linux-arm64:3.4.2-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-freetype:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "6babd5ddf9b4850e91a952d494cfd22b895ce200", + "size": 1300898, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-freetype/lwjgl-freetype-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-freetype-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-shaderc:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "f17eb9b12086809a31e61734dabc1dea80f6b7b2", + "size": 3540777, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-shaderc/lwjgl-shaderc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-shaderc-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-spvc:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "85d2636eb1368a3864fb10faec02a4269020b31e", + "size": 1166740, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-spvc/lwjgl-spvc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-spvc-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-vma:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "0a9e20e7d8ae4d0106cd23ae58a1b72ca151c49f", + "size": 60863, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-vma/lwjgl-vma-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-vma-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-sdl:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "577e41b6d0006f3d3f841c14abe19736e695a760", + "size": 1460461, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-sdl/lwjgl-sdl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-sdl-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-jemalloc:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "b558d38d8eaa32831bb66835aae163428fe69646", + "size": 235928, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-jemalloc/lwjgl-jemalloc-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-jemalloc-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-openal:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "f2083556a7d8a02e4abeb2b933642250ef06c61d", + "size": 866036, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-openal/lwjgl-openal-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-openal-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-opengl:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "84f229d793388be57ae5555b0cfee09b5990fa20", + "size": 80850, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-opengl/lwjgl-opengl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-opengl-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-stb:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "74f1cd22ccf4fd7432b982372b8a34c93cd9aacf", + "size": 258996, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-stb/lwjgl-stb-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-stb-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl-spng:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "a005d6443c79676d4565e4f5a8d0ca3ebedb27e6", + "size": 58046, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl-spng/lwjgl-spng-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-spng-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Add linux-arm64 support for LWJGL 3.4.3", + "match": ["org.lwjgl:lwjgl:3.4.3"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "101c753b129dbdeed565798d259b2b9544ef3878", + "size": 126343, + "url": "https://build.lwjgl.org/release/3.4.3/bin/lwjgl/lwjgl-natives-linux-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-natives-linux-arm64:3.4.3-lwjgl.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "linux-arm64" + } + } + ] + } + ] + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl:3.2.2", "org.lwjgl:lwjgl:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "ae58664f88e18a9bb2c77b063833ca7aaec484cb", + "size": 724243, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "0f46cadcf95675908fd3a550d63d9d709cb68998", + "size": 130064, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl-glfw:3.2.2", "org.lwjgl:lwjgl-glfw:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "cbac1b8d30cb4795149c1ef540f912671a8616d0", + "size": 128801, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl-glfw:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "beda65ee503443e60aa196d58ed31f8d001dc22a", + "size": 123808, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-glfw:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl-jemalloc:3.2.2", "org.lwjgl:lwjgl-jemalloc:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "a817bcf213db49f710603677457567c37d53e103", + "size": 36601, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl-jemalloc:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "cae85c4edb219c88b6a0c26a87955ad98dc9519d", + "size": 114250, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-jemalloc:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl-openal:3.2.2", "org.lwjgl:lwjgl-openal:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "2623a6b8ae1dfcd880738656a9f0243d2e6840bd", + "size": 88237, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl-openal:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "40d65f1a7368a2aa47336f9cb69f5a190cf9975a", + "size": 505234, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-openal:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl-opengl:3.2.2", "org.lwjgl:lwjgl-opengl:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "831a5533a21a5f4f81bbc51bb13e9899319b5411", + "size": 921563, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl-opengl:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "527d78f1e9056aff3ed02ce93019c73c5e8f1721", + "size": 82445, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-opengl:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl-stb:3.2.2", "org.lwjgl:lwjgl-stb:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "b119297cf8ed01f247abe8685857f8e7fcf5980f", + "size": 112380, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl-stb:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "fde63cdd2605c00636721a6c8b961e41d1f6b247", + "size": 216848, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-stb:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } + }, + { + "_comment": "Use a newer version on windows-arm64", + "match": ["org.lwjgl:lwjgl-tinyfd:3.2.2", "org.lwjgl:lwjgl-tinyfd:3.2.1"], + "additionalLibraries": [ + { + "downloads": { + "artifact": { + "sha1": "0ff1914111ef2e3e0110ef2dabc8d8cdaad82347", + "size": 6767, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1.jar" + } + }, + "name": "org.lwjgl:lwjgl-tinyfd:3.3.1", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + }, + { + "downloads": { + "artifact": { + "sha1": "83a5e780df610829ff3a737822b4f931cffecd91", + "size": 109139, + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1-natives-windows-arm64.jar" + } + }, + "name": "org.lwjgl:lwjgl-tinyfd:3.3.1:natives-windows-arm64", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows-arm64" + } + } + ] + } + ], + "override": { + "rules": [ + { + "action": "disallow", + "os": { + "name": "windows-arm64" + } + } + ] + } } ] diff --git a/apps/meta-generator/src/import/mojang/library/mod.rs b/apps/meta-generator/src/import/mojang/library/mod.rs index af642083a1f..dd7d9601d05 100644 --- a/apps/meta-generator/src/import/mojang/library/mod.rs +++ b/apps/meta-generator/src/import/mojang/library/mod.rs @@ -144,6 +144,44 @@ mod tests { assert_eq!(patched.last().unwrap().name, "org.lwjgl:lwjgl:3.2.2"); } + #[test] + fn lwjgl_unsafe_classifier_gets_linux_arm64_natives() { + let library: Library = serde_json::from_value(serde_json::json!({ + "name": "org.lwjgl:lwjgl:3.4.1:unsafe" + })) + .unwrap(); + assert!(patch_library(library).iter().any(|library| { + library.name == "org.lwjgl:lwjgl-natives-linux-arm64:3.4.1-lwjgl.1" + })); + } + + #[test] + fn old_lwjgl_uses_a_newer_version_on_windows_arm64() { + let library: Library = serde_json::from_value(serde_json::json!({ + "name": "org.lwjgl:lwjgl:3.2.2" + })) + .unwrap(); + let patched = patch_library(library); + for name in [ + "org.lwjgl:lwjgl:3.3.1", + "org.lwjgl:lwjgl:3.3.1:natives-windows-arm64", + ] { + let library = + patched.iter().find(|library| library.name == name).unwrap(); + let rules = + serde_json::to_string(library.rules.as_ref().unwrap()).unwrap(); + assert!(rules.contains("windows-arm64")); + } + let original = patched.last().unwrap(); + let rules = + serde_json::to_string(original.rules.as_ref().unwrap()).unwrap(); + assert!( + rules.contains( + r#""action":"disallow","os":{"name":"windows-arm64"}"# + ) + ); + } + #[test] fn unmatched_library_is_unchanged() { let library: Library = serde_json::from_value(serde_json::json!({ diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml index 305f7854a0f..f7d34d23ad9 100644 --- a/packages/app-lib/Cargo.toml +++ b/packages/app-lib/Cargo.toml @@ -95,6 +95,7 @@ sqlx = { workspace = true, features = [ "uuid", ] } sysinfo = { workspace = true, features = ["disk", "system"] } +tar = { workspace = true } tauri = { workspace = true, features = ["unstable"], optional = true } tempfile = { workspace = true } thiserror = { workspace = true } diff --git a/packages/app-lib/src/api/jre.rs b/packages/app-lib/src/api/jre.rs index 2aa07b94eb5..d15cb14e1b8 100644 --- a/packages/app-lib/src/api/jre.rs +++ b/packages/app-lib/src/api/jre.rs @@ -8,11 +8,12 @@ use crate::state::JavaVersion; use crate::util::fetch::{ FetchProgressFn, fetch_advanced, fetch_advanced_with_progress, fetch_json, }; +use bytes::Bytes; use dashmap::DashMap; use reqwest::Method; use serde::Deserialize; use std::future::Future; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::pin::Pin; use sysinfo::{MemoryRefreshKind, RefreshKind}; @@ -113,6 +114,134 @@ fn java_step_progress(current: u64) -> InstallProgress { } } +/// Older Java runs on x64 under emulation, as Mojang ships no Windows arm64 +/// runtime for it. +const WINDOWS_ARM64_MIN_NATIVE_JAVA: u32 = 17; +/// Azul publishes a Windows arm64 JDK for Java 17, but no JRE. +const WINDOWS_ARM64_JDK_ONLY_JAVA: u32 = 17; + +#[derive(Debug, PartialEq, Eq)] +struct JavaPackageQuery { + os: &'static str, + arch: &'static str, + archive_type: &'static str, + package_type: &'static str, +} + +impl JavaPackageQuery { + fn new(os: &'static str, arch: &'static str, java_version: u32) -> Self { + match (os, arch) { + ("linux", "aarch64") => Self { + os: "linux-glibc", + arch, + archive_type: "tar.gz", + package_type: "jre", + }, + ("windows", "aarch64") + if java_version < WINDOWS_ARM64_MIN_NATIVE_JAVA => + { + Self { + os, + arch: "x86_64", + archive_type: "zip", + package_type: "jre", + } + } + ("windows", "aarch64") + if java_version == WINDOWS_ARM64_JDK_ONLY_JAVA => + { + Self { + os, + arch, + archive_type: "zip", + package_type: "jdk", + } + } + _ => Self { + os, + arch, + archive_type: "zip", + package_type: "jre", + }, + } + } +} + +static JAVA_INSTALL_LOCK: tokio::sync::Mutex<()> = + tokio::sync::Mutex::const_new(()); + +fn java_executable(install_dir: &Path) -> PathBuf { + #[cfg(target_os = "macos")] + { + install_dir + .join("Contents") + .join("Home") + .join("bin") + .join("java") + } + + #[cfg(not(target_os = "macos"))] + { + install_dir.join("bin").join(jre::JAVA_BIN) + } +} + +/// Extracts a Java archive to staging, then moves it into place unless a +/// working copy of the same package is already installed. +async fn install_java_archive( + file: Bytes, + archive_type: &'static str, + directory_name: &str, + java_versions_dir: &Path, +) -> crate::Result { + io::create_dir_all(java_versions_dir).await?; + let staging = tempfile::tempdir_in(java_versions_dir) + .map_err(|err| io::IOError::with_path(err, java_versions_dir))?; + let staging = tokio::task::spawn_blocking(move || { + if archive_type == "tar.gz" { + let decoder = flate2::read::GzDecoder::new(file.as_ref()); + tar::Archive::new(decoder).unpack(staging.path()).context( + ErrorKind::InputError( + "failed to extract java tar.gz".to_string(), + ), + )?; + } else { + let mut archive = zip::ZipArchive::new(std::io::Cursor::new(file)) + .context(ErrorKind::InputError( + "failed to read java zip".to_string(), + ))?; + archive + .extract(staging.path()) + .context(ErrorKind::InputError( + "failed to extract java zip".to_string(), + ))?; + } + crate::Result::Ok(staging) + }) + .await??; + + let extracted_dir = staging.path().join(directory_name); + if !java_executable(&extracted_dir).is_file() { + bail!(ErrorKind::InputError( + "Java archive does not contain the expected executable".to_string() + )); + } + + let install_dir = java_versions_dir.join(directory_name); + let java_path = java_executable(&install_dir); + let _install_guard = JAVA_INSTALL_LOCK.lock().await; + if jre::check_java_at_filepath(&java_path).await.is_err() { + if install_dir.exists() { + io::remove_dir_all(&install_dir).await?; + } + tokio::fs::rename(&extracted_dir, &install_dir) + .await + .map_err(|err| io::IOError::with_path(err, &install_dir))?; + } + + Ok(java_path) +} + async fn auto_install_java_inner( java_version: u32, show_loading: bool, @@ -152,11 +281,18 @@ async fn auto_install_java_inner( Some(java_step_progress(1)), ) .await?; - let metadata_url = format!( - "https://api.azul.com/metadata/v1/zulu/packages?arch={}&java_version={}&os={}&archive_type=zip&javafx_bundled=false&java_package_type=jre&page_size=1", + let JavaPackageQuery { + os, + arch, + archive_type, + package_type, + } = JavaPackageQuery::new( + std::env::consts::OS, std::env::consts::ARCH, java_version, - std::env::consts::OS + ); + let metadata_url = format!( + "https://api.azul.com/metadata/v1/zulu/packages?arch={arch}&java_version={java_version}&os={os}&archive_type={archive_type}&javafx_bundled=false&java_package_type={package_type}&crac_supported=false&release_status=ga&availability_types=CA&page_size=1", ); if let Some(reporter) = &reporter { reporter @@ -284,36 +420,22 @@ async fn auto_install_java_inner( ) .await?; } - let mut archive = zip::ZipArchive::new(std::io::Cursor::new(file)) + let directory_name = download + .name + .file_name() + .and_then(|name| name.to_str()) + .and_then(|name| name.strip_suffix(&format!(".{archive_type}"))) + .filter(|dir| { + !dir.contains(['\\', ':']) + && matches!( + std::path::Path::new(dir).components().next(), + Some(std::path::Component::Normal(_)) + ) + }) .context(ErrorKind::InputError( - "failed to read java zip".to_string(), + "invalid Java archive directory".to_string(), ))?; - let names = archive.file_names().collect::, _>>()?; - // removes the old installation of java - if let Some(file) = names.first() - && let Some(dir) = file.split('/').next() - { - if dir.is_empty() - || dir == "." - || dir == ".." - || dir.contains(['\\', ':']) - || !matches!( - std::path::Path::new(dir).components().next(), - Some(std::path::Component::Normal(_)) - ) - { - bail!(ErrorKind::InputError( - "invalid Java archive directory".to_string() - )); - } - let path = path.join(dir); - - if path.exists() { - io::remove_dir_all(path).await?; - } - } - if let Some(loading_bar) = &loading_bar { emit_loading(loading_bar, 0.0, Some("Extracting java"))?; } @@ -338,42 +460,17 @@ async fn auto_install_java_inner( ) .await?; } - archive.extract(&path).context(ErrorKind::InputError( - "failed to extract java zip".to_string(), - ))?; + let java_path = + install_java_archive(file, archive_type, directory_name, &path) + .await?; if let Some(loading_bar) = &loading_bar { emit_loading(loading_bar, 10.0, Some("Done extracting java"))?; } - let mut base_path = path.join( - download - .name - .file_stem() - .unwrap_or_default() - .to_string_lossy() - .to_string(), - ); - #[cfg(target_os = "macos")] - { - base_path = base_path - .join("Contents") - .join("Home") - .join("bin") - .join("java") - } - - #[cfg(not(target_os = "macos"))] - { - base_path = base_path.join("bin").join(jre::JAVA_BIN) - } - - Ok(base_path) + Ok(java_path) } else { bail!(ErrorKind::LauncherError(format!( - "no Java Version found for Java version {}, OS {}, and Architecture {}", - java_version, - std::env::consts::OS, - std::env::consts::ARCH, + "no Java Version found for Java version {java_version}, OS {os}, and Architecture {arch}", ))) } } @@ -429,3 +526,211 @@ pub fn default_memory_max_mb() -> u32 { pub async fn get_max_memory() -> crate::Result { Ok(system_memory_bytes() / 1024) } + +#[cfg(test)] +mod tests { + use super::JavaPackageQuery; + #[cfg(unix)] + use super::{install_java_archive, java_executable}; + #[cfg(unix)] + use bytes::Bytes; + #[cfg(unix)] + use std::{io::Write, os::unix::fs::PermissionsExt, path::Path}; + + #[cfg(unix)] + const PACKAGE: &str = "zulu-test"; + #[cfg(unix)] + const WORKING_JAVA: &[u8] = + b"#!/bin/sh\necho os.arch=aarch64\necho java.version=21.0.1\n"; + #[cfg(unix)] + const BROKEN_JAVA: &[u8] = b"#!/bin/sh\nexit 1\n"; + + #[cfg(unix)] + fn java_entry() -> String { + java_executable(Path::new(PACKAGE)) + .to_string_lossy() + .into_owned() + } + + #[cfg(unix)] + fn tar_gz(path: &str, contents: &[u8]) -> Bytes { + let encoder = flate2::write::GzEncoder::new( + Vec::new(), + flate2::Compression::fast(), + ); + let mut builder = tar::Builder::new(encoder); + let mut header = tar::Header::new_gnu(); + header.set_size(contents.len() as u64); + header.set_mode(0o755); + header.set_cksum(); + builder.append_data(&mut header, path, contents).unwrap(); + builder.into_inner().unwrap().finish().unwrap().into() + } + + #[cfg(unix)] + fn zip_archive(path: &str, contents: &[u8]) -> Bytes { + let mut writer = zip::ZipWriter::new(std::io::Cursor::new(Vec::new())); + let options = zip::write::SimpleFileOptions::default() + .compression_method(zip::CompressionMethod::Stored) + .unix_permissions(0o755); + writer.start_file(path, options).unwrap(); + writer.write_all(contents).unwrap(); + writer.finish().unwrap().into_inner().into() + } + + #[cfg(unix)] + fn write_java( + java_versions_dir: &Path, + contents: &[u8], + ) -> std::path::PathBuf { + let java = java_executable(&java_versions_dir.join(PACKAGE)); + std::fs::create_dir_all(java.parent().unwrap()).unwrap(); + std::fs::write(&java, contents).unwrap(); + std::fs::set_permissions(&java, std::fs::Permissions::from_mode(0o755)) + .unwrap(); + java + } + + #[cfg(unix)] + fn assert_no_staging_left(java_versions_dir: &Path) { + let entries = std::fs::read_dir(java_versions_dir) + .unwrap() + .map(|entry| entry.unwrap().file_name()) + .collect::>(); + assert_eq!(entries, [PACKAGE]); + } + + #[cfg(unix)] + #[tokio::test] + async fn installs_archives_with_executable_java() { + for (archive_type, file) in [ + ("tar.gz", tar_gz(&java_entry(), WORKING_JAVA)), + ("zip", zip_archive(&java_entry(), WORKING_JAVA)), + ] { + let dir = tempfile::tempdir().unwrap(); + let java = + install_java_archive(file, archive_type, PACKAGE, dir.path()) + .await + .unwrap(); + assert_eq!(java, java_executable(&dir.path().join(PACKAGE))); + assert_eq!(std::fs::read(&java).unwrap(), WORKING_JAVA); + let mode = std::fs::metadata(&java).unwrap().permissions().mode(); + assert_ne!(mode & 0o111, 0); + assert_no_staging_left(dir.path()); + } + } + + #[cfg(unix)] + #[tokio::test] + async fn rejected_archive_leaves_existing_install_untouched() { + let dir = tempfile::tempdir().unwrap(); + let java = write_java(dir.path(), BROKEN_JAVA); + let file = tar_gz(&format!("{PACKAGE}/readme.txt"), b"no java here"); + install_java_archive(file, "tar.gz", PACKAGE, dir.path()) + .await + .unwrap_err(); + assert_eq!(std::fs::read(java).unwrap(), BROKEN_JAVA); + assert_no_staging_left(dir.path()); + } + + #[cfg(unix)] + #[tokio::test] + async fn broken_install_is_replaced() { + let dir = tempfile::tempdir().unwrap(); + let java = write_java(dir.path(), BROKEN_JAVA); + let stale = dir.path().join(PACKAGE).join("stale.txt"); + std::fs::write(&stale, "stale").unwrap(); + let file = tar_gz(&java_entry(), WORKING_JAVA); + install_java_archive(file, "tar.gz", PACKAGE, dir.path()) + .await + .unwrap(); + assert_eq!(std::fs::read(java).unwrap(), WORKING_JAVA); + assert!(!stale.exists()); + } + + #[cfg(unix)] + #[tokio::test] + async fn working_install_is_kept() { + let dir = tempfile::tempdir().unwrap(); + write_java(dir.path(), WORKING_JAVA); + let marker = dir.path().join(PACKAGE).join("in-use.txt"); + std::fs::write(&marker, "in use").unwrap(); + let file = tar_gz(&java_entry(), WORKING_JAVA); + install_java_archive(file, "tar.gz", PACKAGE, dir.path()) + .await + .unwrap(); + assert!(marker.exists()); + assert_no_staging_left(dir.path()); + } + + #[cfg(unix)] + #[tokio::test] + async fn parallel_installs_of_one_package_all_succeed() { + let dir = tempfile::tempdir().unwrap(); + let file = tar_gz(&java_entry(), WORKING_JAVA); + let (first, second, third) = tokio::join!( + install_java_archive(file.clone(), "tar.gz", PACKAGE, dir.path()), + install_java_archive(file.clone(), "tar.gz", PACKAGE, dir.path()), + install_java_archive(file, "tar.gz", PACKAGE, dir.path()), + ); + let java = first.unwrap(); + assert_eq!(second.unwrap(), java); + assert_eq!(third.unwrap(), java); + assert_no_staging_left(dir.path()); + } + + #[test] + fn linux_arm64_uses_glibc_tarballs() { + assert_eq!( + JavaPackageQuery::new("linux", "aarch64", 16), + JavaPackageQuery { + os: "linux-glibc", + arch: "aarch64", + archive_type: "tar.gz", + package_type: "jre", + } + ); + } + + #[test] + fn windows_arm64_runs_older_java_under_emulation() { + for java_version in [8, 16] { + let query = + JavaPackageQuery::new("windows", "aarch64", java_version); + assert_eq!(query.arch, "x86_64"); + assert_eq!(query.package_type, "jre"); + } + } + + #[test] + fn windows_arm64_uses_native_java_from_17() { + let query = JavaPackageQuery::new("windows", "aarch64", 17); + assert_eq!(query.arch, "aarch64"); + assert_eq!(query.package_type, "jdk"); + for java_version in [21, 25] { + let query = + JavaPackageQuery::new("windows", "aarch64", java_version); + assert_eq!(query.arch, "aarch64"); + assert_eq!(query.package_type, "jre"); + } + } + + #[test] + fn other_platforms_use_native_zips() { + for (os, arch) in [ + ("linux", "x86_64"), + ("windows", "x86_64"), + ("macos", "aarch64"), + ] { + assert_eq!( + JavaPackageQuery::new(os, arch, 8), + JavaPackageQuery { + os, + arch, + archive_type: "zip", + package_type: "jre", + } + ); + } + } +} diff --git a/packages/app-lib/src/util/platform.rs b/packages/app-lib/src/util/platform.rs index 4726cd84512..43730a53e9a 100644 --- a/packages/app-lib/src/util/platform.rs +++ b/packages/app-lib/src/util/platform.rs @@ -79,7 +79,7 @@ pub fn os_rule( if let Some(name) = &rule.name { if minecraft_updated - && (name != &Os::LinuxArm64 || name != &Os::LinuxArm32) + && (name != &Os::LinuxArm64 && name != &Os::LinuxArm32) { rule_match &= Os::native() == name.get_os() || &Os::native_arch(java_arch) == name; @@ -113,3 +113,22 @@ pub fn classpath_separator(java_arch: &str) -> &'static str { Os::Windows | Os::WindowsArm64 => ";", } } + +#[cfg(all(test, target_os = "linux"))] +mod tests { + use super::*; + + fn arm64_rule() -> OsRule { + OsRule { + name: Some(Os::LinuxArm64), + version: None, + arch: None, + } + } + + #[test] + fn linux_arm64_rule_only_matches_arm64_java() { + assert!(os_rule(&arm64_rule(), "aarch64", true)); + assert!(!os_rule(&arm64_rule(), "x86_64", true)); + } +}