Merge branch 'upcoming'

# Conflicts:
#	LICENSE
#	src/renderer/index.js

resources/afterPack.js

@@ -0,0 +1,18 @@
+exports.default = function(context) {
+    const { execSync } = require('child_process')
+
+    if (process.platform !== 'darwin')
+        return
+        
+    console.log('Castlabs-evs update start')
+    execSync('python3 -m pip install --upgrade castlabs-evs')
+    console.log('Castlabs-evs update complete')
+
+
+
+    console.log('VMP signing start')
+
+    execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'})
+    
+    console.log('VMP signing complete')
+}

resources/entitlements.mac.plist

@@ -2,11 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
+    <!-- https://github.com/electron/electron-notarize#prerequisites -->
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
     <true/>
+    <!-- https://github.cm/electron-userland/electron-builder/issues/3940 -->
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <false/>
   </dict>
-</plist>
+</plist>

resources/notarize.js

@@ -0,0 +1,20 @@
+
+  
+require('dotenv').config();
+  const { notarize } = require('electron-notarize');
+  
+exports.default = async function notarizing(context) {
+    const { electronPlatformName, appOutDir } = context;  
+    if (electronPlatformName !== 'darwin') {
+      return;
+    }
+  
+    const appName = context.packager.appInfo.productFilename;
+  
+    return await notarize({
+      appBundleId: 'com.ciderapp.cider',
+      appPath: `${appOutDir}/${appName}.app`,
+      appleId: process.env.APPLEID,
+      appleIdPassword: process.env.APPLEIDPASS,
+    });
+};