Skip to content

Commit aa2c58b

Browse files
author
Markus Fleischauer
committed
switch to temurin jre for linux and mac 2
1 parent ff8109b commit aa2c58b

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

buildSrc/src/main/java/SiriusPlatform.java

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727

2828
//@Slf4j
2929
public enum SiriusPlatform {
30-
WIN_x86_64("win", "win32-x86-64", "win-x86-64", "windows-amd64", "windows-x64", "win64", "win_x64", "windows-x64"),
31-
WIN_x86_32(null, "win32-x86", null, null, null, "win32", null, null),
32-
WIN_ARM64(null, null, "win-arm64", "windows-aarch64", "windows-aarch64", "win64-arm", null, "windows-aarch64"),
33-
WIN_ARM32(null, null, null, null, null, null, null, null),
34-
LINUX_x86_64("linux", "linux-x86-64", "linux-x86-64", "linux-amd64", "linux-x64", "linux64", "linux_x64", "linux-x64"),
35-
LINUX_x86_32(null, "linux-x86", null, null, null, null, null, null),
36-
LINUX_ARM64("linux-aarch64", "linux-aarch64", "linux-arm64", "linux-aarch64", "linux-aarch64", "linux64-arm", "linux_aarch64", "linux-aarch64"),
37-
LINUX_ARM32(null, "linux-arm", null, null, null, null, null, null),
38-
MAC_x86_64("mac", "darwin-x86-64", "mac-x86-64", "macos-amd64", "osx-x64", "mac", "macosx_x64", "macos-x64"),
39-
MAC_ARM64("mac-aarch64", "darwin-aarch64", "mac-arm64", "macos-aarch64", "osx-aarch64", "mac-arm", "macosx_aarch64", "macos-aarch64");
30+
WIN_x86_64("win", "win32-x86-64", "win-x86-64", "windows-amd64", "windows-x64", "win64", "win_x64", "windows-x64", "x64_windows"),
31+
WIN_x86_32(null, "win32-x86", null, null, null, "win32", null, null, null),
32+
WIN_ARM64(null, null, "win-arm64", "windows-aarch64", "windows-aarch64", "win64-arm", null, "windows-aarch64", "aarch64_windows"),
33+
WIN_ARM32(null, null, null, null, null, null, null, null, null),
34+
LINUX_x86_64("linux", "linux-x86-64", "linux-x86-64", "linux-amd64", "linux-x64", "linux64", "linux_x64", "linux-x64","x64_linux"),
35+
LINUX_x86_32(null, "linux-x86", null, null, null, null, null, null, null),
36+
LINUX_ARM64("linux-aarch64", "linux-aarch64", "linux-arm64", "linux-aarch64", "linux-aarch64", "linux64-arm", "linux_aarch64", "linux-aarch64", "aarch64_linux"),
37+
LINUX_ARM32(null, "linux-arm", null, null, null, null, null, null, null),
38+
MAC_x86_64("mac", "darwin-x86-64", "mac-x86-64", "macos-amd64", "osx-x64", "mac", "macosx_x64", "macos-x64", "x64_mac"),
39+
MAC_ARM64("mac-aarch64", "darwin-aarch64", "mac-arm64", "macos-aarch64", "osx-aarch64", "mac-arm", "macosx_aarch64", "macos-aarch64", "aarch64_mac");
4040

4141
private final String jfxClassifier;
4242
private final String inchiClassifier;
@@ -46,8 +46,9 @@ public enum SiriusPlatform {
4646
private final String jxClassifier; // classifier for jxbrowser
4747
private final String zuluClassifier; // classifier for jxbrowser
4848
private final String msClassifier; // classifier for jxbrowser
49+
private final String adoptClassifier; // classifier for jxbrowser
4950

50-
SiriusPlatform(String jfxClassifier, String inchiClassifier, String jenaClassifier, String bellClassifier, String jbrClassifier, String jxClassifier, String zuluClassifier, String msClassifier) {
51+
SiriusPlatform(String jfxClassifier, String inchiClassifier, String jenaClassifier, String bellClassifier, String jbrClassifier, String jxClassifier, String zuluClassifier, String msClassifier, String adoptClassifier) {
5152
this.jfxClassifier = jfxClassifier;
5253
this.inchiClassifier = inchiClassifier;
5354
this.jenaClassifier = jenaClassifier;
@@ -56,6 +57,7 @@ public enum SiriusPlatform {
5657
this.jxClassifier = jxClassifier;
5758
this.zuluClassifier = zuluClassifier;
5859
this.msClassifier = msClassifier;
60+
this.adoptClassifier = adoptClassifier;
5961
}
6062

6163
public boolean isMac() {
@@ -103,6 +105,10 @@ public Optional<String> msClassifier() {
103105
return Optional.ofNullable(msClassifier);
104106
}
105107

108+
public Optional<String> adoptClassifier() {
109+
return Optional.ofNullable( adoptClassifier);
110+
}
111+
106112

107113
public static List<SiriusPlatform> allBut(SiriusPlatform exclude) {
108114
return Arrays.stream(SiriusPlatform.values()).filter(it -> it != exclude).toList();

0 commit comments

Comments
 (0)