From 56de66e68e86c4d140552cc749f1a06bacd6aa02 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Mon, 23 Oct 2023 09:17:44 +0200
Subject: [PATCH] test with universal support

---
 gui/build/notarize_macos.js |  5 +++--
 gui/electron-builder.json5  | 10 +++++++---
 modem/static.py             |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gui/build/notarize_macos.js b/gui/build/notarize_macos.js
index 313b7502..6cbb37a0 100644
--- a/gui/build/notarize_macos.js
+++ b/gui/build/notarize_macos.js
@@ -2,12 +2,13 @@ const { notarize } = require('@electron/notarize');
 
 async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
-    console.log("platform:" + electronPlatformName)
+    console.log("Notarization...")
   if (electronPlatformName !== 'darwin') {
-  console.log("not a APPLE system")
+  console.log("--> Platform:" + electronPlatformName + " detected: not a APPLE system. Skipping")
     return;
   }
 
+  console.log("--> Platform:" + electronPlatformName + " detected: Trying to notarize app.")
   const appName = context.packager.appInfo.productFilename;
 
   return await notarize({
diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5
index fe82e817..3dfef970 100644
--- a/gui/electron-builder.json5
+++ b/gui/electron-builder.json5
@@ -5,7 +5,7 @@
   "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json",
   "appId": "app.freedata",
   "asar": true,
-  "afterPack": "build/notarize_macos.js",
+  "afterSign": "build/notarize_macos.js",
   "productName": "FreeDATA",
   "directories": {
     "output": "release"
@@ -30,14 +30,18 @@
 
   "mac": {
     "target": [
-      "dmg"
+      "default"
     ],
+    "arch": [
+        "x64",
+        "universal"
+      ],
       "icon": "build/icon.png",
       "hardenedRuntime": true,
       "entitlements": "build/entitlements.plist",
       "entitlementsInherit": "build/entitlements.plist",
       "gatekeeperAssess": false,
-    "artifactName": "${productName}-Mac-${version}-Installer.${ext}"
+      "artifactName": "${productName}-Mac-${version}-Installer.${ext}"
   },
   "win": {
     "icon": "build/icon.png",
diff --git a/modem/static.py b/modem/static.py
index 13ca89cb..6a034c9f 100644
--- a/modem/static.py
+++ b/modem/static.py
@@ -134,7 +134,7 @@ class TCIParam:
 
 @dataclass 
 class Modem:
-    version = "0.11.0-alpha.1-vuejs"
+    version = "0.11.0-alpha.2"
     host: str = "0.0.0.0"
     port: int = 3000
     SOCKET_TIMEOUT: int = 1  # seconds