Merge pull request #1657 from Automattic/merge-release-1.9-into-develop

Merge release 1.9 into develop

.circleci/config.yml

@@ -41,6 +41,8 @@ jobs:
             openssl aes-256-cbc -md md5 -d -in ./resources/secrets/config.json.enc -out ./config.json -k ${SECRETS_ENCRYPTION_KEY}
       - *npm_restore_cache
       - run: npm ci
+      - run: patch -p1 < ./resources/macos/macPackager-patch.diff
+      - run: patch -p1 < ./resources/macos/scheme-patch.diff
       - run: make build
       - run: make test
       - persist_to_workspace:
@@ -58,6 +60,8 @@ jobs:
       - *npm_restore_cache
       - *install_linux_deps
       - run: npm ci
+      - run: patch -p1 < ./resources/macos/macPackager-patch.diff
+      - run: patch -p1 < ./resources/macos/scheme-patch.diff
       - *npm_save_cache
       - run: make package-linux SKIP_BUILD=true
       - run:
@@ -73,7 +77,7 @@ jobs:
 
   mac:
     macos:
-      xcode: '9.4.1'
+      xcode: '10.0.0'
     shell: /bin/bash --login
     working_directory: /Users/distiller/simplenote
     steps:
@@ -82,6 +86,8 @@ jobs:
           at: /Users/distiller/simplenote
       - *npm_restore_cache
       - run: npm ci
+      - run: patch -p1 < ./resources/macos/macPackager-patch.diff
+      - run: patch -p1 < ./resources/macos/scheme-patch.diff
       - *npm_save_cache
       - run:
           name: Build Mac

after_sign_hook.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const path = require('path');
+var electron_notarize = require('electron-notarize');
+
+module.exports = async function(params) {
+  // Only notarize the app on Mac OS only.
+  if (process.platform !== 'darwin') {
+    return;
+  }
+  console.log('afterSign hook triggered', params);
+
+  if (!process.env.CIRCLE_TAG || process.env.CIRCLE_TAG.length === 0) {
+    console.log('Not on a tag. Skipping notarization');
+    return;
+  }
+
+  // Same appId in electron-builder.
+  let appId = 'com.automattic.simplenote';
+
+  let appPath = params.appOutDir
+    ? path.join(
+        params.appOutDir,
+        `${params.packager.appInfo.productFilename}.app`
+      )
+    : params.artifactPaths[0].replace(new RegExp('.blockmap'), '');
+
+  if (!fs.existsSync(appPath)) {
+    throw new Error(`Cannot find application at: ${appPath}`);
+  }
+
+  console.log(`Notarizing ${appId} found at ${appPath}`);
+
+  try {
+    await electron_notarize.notarize({
+      appBundleId: appId,
+      appPath: appPath,
+      appleId: process.env.NOTARIZATION_ID,
+      appleIdPassword: process.env.NOTARIZATION_PWD,
+      ascProvider: 'AutomatticInc',
+    });
+  } catch (error) {
+    console.error(error);
+  }
+
+  console.log(`Done notarizing ${appId}`);
+};

appveyor.yml

@@ -20,6 +20,8 @@ install:
   - ps: Install-Product node 10
   - cinst make
   - npm ci
+  - patch -p1 < ./resources/macos/macPackager-patch.diff
+  - patch -p1 < ./resources/macos/scheme-patch.diff
 
 for:
   # default build / .exe / signed

electron-builder.json

@@ -13,7 +13,10 @@
   "mac": {
     "icon": "./resources/images/app-icon.icns",
     "category": "public.app-category.social-networking",
-    "artifactName": "Simplenote-macOS-${version}.${ext}"
+    "artifactName": "Simplenote-macOS-${version}.${ext}",
+    "entitlements": "./resources/macos/entitlements.mac.plist",
+    "entitlementsInherit": "./resources/macos/entitlements.mac.inherit.plist",
+    "hardenedRuntime": true
   },
   "dmg": {
     "title": "Simplenote Installer",
@@ -100,5 +103,7 @@
   },
   "deb": {
     "depends": ["gconf2"]
-  }
+  },
+  "afterSign": "./after_sign_hook.js",
+  "afterAllArtifactBuild": "./after_sign_hook.js"
 }