Skip to content

Commit 73c8924

Browse files
authored
Merge branch 'main' into dependabot/gradle/main/com.palantir.gradle.guide-gradle-guide-1.32.0
2 parents 5b1c786 + f6667a2 commit 73c8924

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

‎gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/NativeImageSupport.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.palantir.javaformat.gradle;
1818

19-
import com.palantir.platform.Architecture;
2019
import com.palantir.platform.GradleOperatingSystem;
2120
import com.palantir.platform.OperatingSystem;
2221
import javax.inject.Inject;
@@ -35,11 +34,15 @@ public boolean isNativeImageConfigured() {
3534
return isNativeFlagEnabled() && isNativeImageSupported();
3635
}
3736

37+
/**
38+
* The platforms a native image is published for, and therefore the only ones where it can be
39+
* resolved. macOS is supported on both architectures: the x86-64 image used to be excluded
40+
* because nobody built it, and .github/workflows/ci.yml now does. Windows and musl are still
41+
* absent for the same reason — no job produces them.
42+
*/
3843
private boolean isNativeImageSupported() {
3944
return getOs().getOperatingSystem()
40-
.map(os -> os.equals(OperatingSystem.LINUX_GLIBC)
41-
|| (os.equals(OperatingSystem.MACOS)
42-
&& Architecture.get().equals(Architecture.AARCH64)))
45+
.map(os -> os.equals(OperatingSystem.LINUX_GLIBC) || os.equals(OperatingSystem.MACOS))
4346
.get();
4447
}
4548

0 commit comments

Comments
 (0)