Add support for Apple silicon to the platform enums.

Author: ntwigg

durian-swt.os/src/main/java/com/diffplug/common/swt/os/Arch.java

@@ -17,7 +17,7 @@
 
 /** Enum for handling different processor architectures supported by SWT. */
 public enum Arch {
-	x86, x64;
+	x86, x64, arm64;
 
 	/** Returns the appropriate value depending on the arch. */
 	public <T> T x86x64(T val86, T val64) {
@@ -31,6 +31,32 @@ public <T> T x86x64(T val86, T val64) {
 		}
 	}
 
+	/** Returns the appropriate value depending on the arch. */
+	public <T> T x64arm64(T val64, T arm64) {
+		switch (this) {
+		case x64:
+			return val64;
+		case arm64:
+			return arm64;
+		default:
+			throw unsupportedException(this);
+		}
+	}
+
+	/** Returns the appropriate value depending on the arch. */
+	public <T> T x86x64arm64(T val86, T val64, T arm64) {
+		switch (this) {
+		case x86:
+			return val86;
+		case x64:
+			return val64;
+		case arm64:
+			return arm64;
+		default:
+			throw unsupportedException(this);
+		}
+	}
+
 	/** Returns the Arch for the native platform: 32-bit JVM on 64-bit Windows returns Arch.x64. */
 	public static Arch getNative() {
 		return OS.getNative().getArch();

durian-swt.os/src/main/java/com/diffplug/common/swt/os/OS.java

@@ -21,7 +21,7 @@
 
 /** Enum representing an OS and its underlying CPU architecture. */
 public enum OS {
-	WIN_x64, WIN_x86, LINUX_x64, LINUX_x86, MAC_x64;
+	WIN_x64, WIN_x86, LINUX_x64, LINUX_x86, MAC_x64, MAC_silicon;
 
 	public boolean isWindows() {
 		return this == WIN_x64 || this == WIN_x86;
@@ -32,7 +32,7 @@ public boolean isLinux() {
 	}
 
 	public boolean isMac() {
-		return this == MAC_x64;
+		return this == MAC_x64 || this == MAC_silicon;
 	}
 
 	public boolean isMacOrLinux() {
@@ -62,6 +62,8 @@ public Arch getArch() {
 		case WIN_x86:
 		case LINUX_x86:
 			return Arch.x86;
+		case MAC_silicon:
+			return Arch.arm64;
 		default:
 			throw unsupportedException(this);
 		}
@@ -74,7 +76,7 @@ public String os() {
 
 	/** SWT-style x86/x86_64 */
 	public String arch() {
-		return getArch().x86x64("x86", "x86_64");
+		return getArch().x86x64arm64("x86", "x86_64", "aarch64");
 	}
 
 	/** os().arch() */
@@ -84,7 +86,7 @@ public String osDotArch() {
 
 	/** windowing.os.arch */
 	public String toSwt() {
-		return winMacLinux("win32", "cocoa", "gtk") + "." + winMacLinux("win32", "macosx", "linux") + "." + getArch().x86x64("x86", "x86_64");
+		return winMacLinux("win32", "cocoa", "gtk") + "." + winMacLinux("win32", "macosx", "linux") + "." + getArch().x86x64arm64("x86", "x86_64", "aarch64");
 	}
 
 	/** Returns the native OS: 32-bit JVM on 64-bit Windows returns OS.WIN_64. */
@@ -135,7 +137,7 @@ private static OS calculateRunning() {
 		Arch runningArch = runningJvm();
 		return NATIVE_OS.winMacLinux(
 				runningArch.x86x64(OS.WIN_x86, OS.WIN_x64),
-				OS.MAC_x64,
+				runningArch.x64arm64(OS.MAC_x64, OS.MAC_silicon),
 				runningArch.x86x64(OS.LINUX_x86, OS.LINUX_x64));
 	}
 

durian-swt.os/src/main/java/com/diffplug/common/swt/os/SwtPlatform.java

@@ -129,7 +129,7 @@ public static SwtPlatform getRunning() {
 	public static SwtPlatform fromOS(OS raw) {
 		String ws = raw.winMacLinux("win32", "cocoa", "gtk");
 		String os = raw.winMacLinux("win32", "macosx", "linux");
-		String arch = raw.getArch().x86x64("x86", "x86_64");
+		String arch = raw.getArch().x86x64arm64("x86", "x86_64", "aarch64");
 		return new SwtPlatform(ws, os, arch);
 	}