diff --git a/buildSrc/src/main/java/io/github/qupath/gradle/PlatformPlugin.java b/buildSrc/src/main/java/io/github/qupath/gradle/PlatformPlugin.java index 0e05e7695..fb4969086 100644 --- a/buildSrc/src/main/java/io/github/qupath/gradle/PlatformPlugin.java +++ b/buildSrc/src/main/java/io/github/qupath/gradle/PlatformPlugin.java @@ -35,7 +35,7 @@ public enum Platform { MAC("macosx", "darwin-x86_64", "icns", "pkg"), MAC_AARCH64("macosx", "darwin-aarch64", "icns", "pkg"), LINUX("linux", "linux-x86_64", "png", "deb"), - LINUX_AARCH64("linux-arm64", "linux-arm64", "png", "deb"), + LINUX_AARCH64("linux", "linux-aarch64", "png", "deb"), UNKNOWN(); private final String platformName; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9029677ee..56a626658 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ bioformats = "8.0.1" bioimageIoSpec = "0.1.0" omeZarrReader = "0.5.2" -blosc = "1.21.5" +blosc = "1.21.6+01" commonmark = "0.24.0" commonsMath3 = "3.6.1" @@ -39,7 +39,7 @@ logviewer = "0.2.0" javadocviewer = "0.1.1" -openslide = "4.0.0.3" +openslide = "4.0.0.6" picocli = "4.7.6" qupath-fxtras = "0.1.5" diff --git a/qupath-extension-bioformats/build.gradle.kts b/qupath-extension-bioformats/build.gradle.kts index fe0afea19..7cc859b6d 100644 --- a/qupath-extension-bioformats/build.gradle.kts +++ b/qupath-extension-bioformats/build.gradle.kts @@ -56,12 +56,7 @@ dependencies { exclude(group="ome", module="formats-api") // Through bioformats_package } - // TODO: Don't have linux aarch64 support yet - if (platform == PlatformPlugin.Platform.LINUX_AARCH64) { - println("c-blosc native library not yet provided for linux-arm64") - } else { - implementation("io.github.qupath:blosc:${libs.versions.blosc.get()}:${platform.classifier}") - } + implementation("io.github.qupath:blosc:${libs.versions.blosc.get()}:${platform.classifier}") // testImplementation("ome:bioformats_package:${bioformatsVersion}") testImplementation("ome:bio-formats_plugins:${bioformatsVersion}") diff --git a/qupath-extension-openslide/build.gradle.kts b/qupath-extension-openslide/build.gradle.kts index 00a0d8a1e..5850233b1 100644 --- a/qupath-extension-openslide/build.gradle.kts +++ b/qupath-extension-openslide/build.gradle.kts @@ -18,11 +18,7 @@ val platform = Utils.currentPlatform() dependencies { implementation(project(":qupath-core")) implementation(project(":qupath-gui-fx")) - if (platform == PlatformPlugin.Platform.LINUX_AARCH64) { - println("OpenSlide native libraries not yet available for linux-arm64") - } else { - implementation("io.github.qupath:openslide:${libs.versions.openslide.get()}:${platform.classifier}") - } + implementation("io.github.qupath:openslide:${libs.versions.openslide.get()}:${platform.classifier}") implementation(libs.jna) implementation(libs.qupath.fxtras) }