From 0bdb90a07f2d2f7df704b8491d6517182f85da65 Mon Sep 17 00:00:00 2001
From: Lutz Roeder <lutzroeder@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:38:02 -0800
Subject: [PATCH] Update to electron-builder 22.10.4 (#627)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 Makefile                      | 4 ++--
 electron-builder.yml          | 7 +++++--
 package.json                  | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0a5a397842..fff8b527cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           case "${{ matrix.os }}" in
             macos*)
-              CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder --mac --publish never -c.mac.identity=null
+              CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder --mac --universal --publish never -c.mac.identity=null
               ;;
             ubuntu*)
               npx electron-builder --linux appimage --publish never
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b21264898d..6c94184407 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -53,7 +53,7 @@ jobs:
             macos*)
               mkdir -p ~/.private_keys
               echo '${{ secrets.API_KEY }}' > ~/.private_keys/AuthKey_${{ secrets.API_KEY_ID }}.p8
-              npx electron-builder --mac --publish always
+              npx electron-builder --mac --universal --publish always
               ;;
             ubuntu*)
               sudo snap install snapcraft --classic
diff --git a/Makefile b/Makefile
index f2bcea5853..3a2fb8b98f 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ build_python: install
 	python ./setup.py build --version bdist_wheel
 
 build_electron: install
-	CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder --mac --publish never
+	CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder --mac --universal --publish never
 	npx electron-builder --win --publish never
 	npx electron-builder --linux appimage --publish never
 	npx electron-builder --linux snap --publish never
@@ -64,7 +64,7 @@ publish_python: build_python
 	python -m twine upload --non-interactive --skip-existing --verbose dist/dist/*
 
 publish_electron: install
-	npx electron-builder --mac --publish always
+	npx electron-builder --mac --universal --publish always
 	npx electron-builder --win --publish always
 	npx electron-builder --linux appimage --publish always
 	npx electron-builder --linux snap --publish always
diff --git a/electron-builder.yml b/electron-builder.yml
index e6dbbf30e1..a9327eb223 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -70,11 +70,12 @@ publish:
   - provider: github
     releaseType: release
 mac:
+  artifactName: ${productName}-${version}-mac.${ext}
   category: public.app-category.developer-tools
   darkModeSupport: true
-  hardenedRuntime: true
   gatekeeperAssess: false
-  target: 
+  hardenedRuntime: true
+  target:
   - dmg
   - zip
 linux:
@@ -96,6 +97,8 @@ win:
   - sha256
   verifyUpdateCodeSignature: false
 dmg:
+  artifactName: ${productName}-${version}.${ext}
+  title: "${productName} ${version}"
   iconSize: 160
   contents:
   - x: 180
diff --git a/package.json b/package.json
index fc6e164af5..a0528bbe1b 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     },
     "devDependencies": {
         "electron": "11.1.0",
-        "electron-builder": "22.9.1",
+        "electron-builder": "22.10.4",
         "electron-notarize": "1.0.0",
         "eslint": "7.16.0",
         "xmldom": "0.4.0"