From 4de9134ccdb10e46544f668601a9565919a6ceb0 Mon Sep 17 00:00:00 2001 From: George Karagkiaouris Date: Fri, 22 Nov 2019 10:05:18 -0500 Subject: [PATCH 1/4] Try to sign using package --- package.json | 5 +++-- yarn.lock | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8a6ed52dc..272cacd43 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "babel-eslint": "^10.0.3", "electron": "6.0.9", "electron-builder": "^21.2.0", + "electron-builder-notarize": "^1.0.1", "eslint-config-xo-react": "^0.20.0", "eslint-plugin-react": "^7.14.3", "eslint-plugin-react-hooks": "^2.0.1", @@ -118,7 +119,7 @@ }, "build": { "appId": "com.wulkano.kap", - "afterSign": "./notarize.js", + "afterSign": "electron-builder-notarize", "files": [ "**/*", "!renderer", @@ -130,7 +131,7 @@ "minimumSystemVersion": "10.12.0", "darkModeSupport": true, "hardenedRuntime": true, - "entitlements": "./build/entitlements.mac.inherit.plist", + "entitlements": "./node_modules/electron-builder-notarize/entitlements.mac.inherit.plist", "extendInfo": { "NSMicrophoneUsageDescription": "Kap needs access to the microphone to be able to record audio for screen recordings.", "NSUserNotificationAlertStyle": "alert", diff --git a/yarn.lock b/yarn.lock index 748e433e0..11983b078 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,6 +2726,13 @@ electron-better-ipc@^0.5.0: resolved "https://registry.yarnpkg.com/electron-better-ipc/-/electron-better-ipc-0.5.0.tgz#0a97776f1bb4640da46c006ca94de55052a9c4b5" integrity sha512-u67I8YI084macI8iAB64VTDLwkvVDQnZ5ang/GRPBfeqjZvXlsBqrzIJSKzi88ZDfgfSXk9U1YGpW4qPEGXK9Q== +electron-builder-notarize@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/electron-builder-notarize/-/electron-builder-notarize-1.0.1.tgz#bb52538db42bf0f86c7d027117cdfb1d708d16ec" + integrity sha512-3x9DYjPUQU4PYvsxuMOvdOkybmki87cHDVouPR/Rgo+yCqvUnuYPoRtx8kbUh3CpfdGiQ9Km+coHaMs5KQEAjA== + dependencies: + electron-notarize "^0.2.0" + electron-builder@^21.2.0: version "21.2.0" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.2.0.tgz#b68ec4def713fc0b8602654ce842f972432f50c5" From bdbc3a0b98887ea126c14c9e3c2b0dd83928b935 Mon Sep 17 00:00:00 2001 From: George Karagkiaouris Date: Fri, 22 Nov 2019 10:31:02 -0500 Subject: [PATCH 2/4] Update package version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 272cacd43..f5077c517 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "babel-eslint": "^10.0.3", "electron": "6.0.9", "electron-builder": "^21.2.0", - "electron-builder-notarize": "^1.0.1", + "electron-builder-notarize": "^1.0.3", "eslint-config-xo-react": "^0.20.0", "eslint-plugin-react": "^7.14.3", "eslint-plugin-react-hooks": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 11983b078..6c3b5e4be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,10 +2726,10 @@ electron-better-ipc@^0.5.0: resolved "https://registry.yarnpkg.com/electron-better-ipc/-/electron-better-ipc-0.5.0.tgz#0a97776f1bb4640da46c006ca94de55052a9c4b5" integrity sha512-u67I8YI084macI8iAB64VTDLwkvVDQnZ5ang/GRPBfeqjZvXlsBqrzIJSKzi88ZDfgfSXk9U1YGpW4qPEGXK9Q== -electron-builder-notarize@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/electron-builder-notarize/-/electron-builder-notarize-1.0.1.tgz#bb52538db42bf0f86c7d027117cdfb1d708d16ec" - integrity sha512-3x9DYjPUQU4PYvsxuMOvdOkybmki87cHDVouPR/Rgo+yCqvUnuYPoRtx8kbUh3CpfdGiQ9Km+coHaMs5KQEAjA== +electron-builder-notarize@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/electron-builder-notarize/-/electron-builder-notarize-1.0.3.tgz#ba9b4bc26f0bcdeef61be8f8b4c62da0e6d1b6ee" + integrity sha512-KaFf2h3uZoSGoNLzjScm0PN9UKFASAoN697c8yh306C68zczuU8uiIcDEY4JtO4eXZ75cuyxL7cPlGwMzhKaHg== dependencies: electron-notarize "^0.2.0" From bfbdcdf83e81670308a00b17ebbb6375cacc0625 Mon Sep 17 00:00:00 2001 From: George Karagkiaouris Date: Fri, 22 Nov 2019 14:29:20 -0500 Subject: [PATCH 3/4] Bump version again --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f5077c517..18fbd0426 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "babel-eslint": "^10.0.3", "electron": "6.0.9", "electron-builder": "^21.2.0", - "electron-builder-notarize": "^1.0.3", + "electron-builder-notarize": "^1.0.4", "eslint-config-xo-react": "^0.20.0", "eslint-plugin-react": "^7.14.3", "eslint-plugin-react-hooks": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 6c3b5e4be..eb4e37644 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,10 +2726,10 @@ electron-better-ipc@^0.5.0: resolved "https://registry.yarnpkg.com/electron-better-ipc/-/electron-better-ipc-0.5.0.tgz#0a97776f1bb4640da46c006ca94de55052a9c4b5" integrity sha512-u67I8YI084macI8iAB64VTDLwkvVDQnZ5ang/GRPBfeqjZvXlsBqrzIJSKzi88ZDfgfSXk9U1YGpW4qPEGXK9Q== -electron-builder-notarize@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/electron-builder-notarize/-/electron-builder-notarize-1.0.3.tgz#ba9b4bc26f0bcdeef61be8f8b4c62da0e6d1b6ee" - integrity sha512-KaFf2h3uZoSGoNLzjScm0PN9UKFASAoN697c8yh306C68zczuU8uiIcDEY4JtO4eXZ75cuyxL7cPlGwMzhKaHg== +electron-builder-notarize@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/electron-builder-notarize/-/electron-builder-notarize-1.0.4.tgz#5c81029306bcef6f000d6a1f3749d0eaac8be72b" + integrity sha512-DxQ3ntdnpgiKE/Iz3r50++25tuXBHmBq3qSX7uP4i4UA2uk++fgXGxRBC8ZMBNnFtSWvB+19mLa7wTNFkLE9sw== dependencies: electron-notarize "^0.2.0" From b8bb21672295a1065ae0979a1458139f0d16d926 Mon Sep 17 00:00:00 2001 From: George Karagkiaouris Date: Fri, 22 Nov 2019 14:42:26 -0500 Subject: [PATCH 4/4] Remove unecessary files --- build/entitlements.mac.inherit.plist | 12 ----------- notarize.js | 32 ---------------------------- 2 files changed, 44 deletions(-) delete mode 100644 build/entitlements.mac.inherit.plist delete mode 100644 notarize.js diff --git a/build/entitlements.mac.inherit.plist b/build/entitlements.mac.inherit.plist deleted file mode 100644 index 38c887b21..000000000 --- a/build/entitlements.mac.inherit.plist +++ /dev/null @@ -1,12 +0,0 @@ - - - - - com.apple.security.cs.allow-jit - - com.apple.security.cs.allow-unsigned-executable-memory - - com.apple.security.cs.allow-dyld-environment-variables - - - diff --git a/notarize.js b/notarize.js deleted file mode 100644 index 9d951f07b..000000000 --- a/notarize.js +++ /dev/null @@ -1,32 +0,0 @@ -// See: https://medium.com/@TwitterArchiveEraser/notarize-electron-apps-7a5f988406db - -'use strict'; -const path = require('path'); -const electronNotarize = require('electron-notarize'); - -module.exports = async params => { - if (process.platform !== 'darwin') { - return; - } - - // Only notarize the app on the master branch - if (process.env.CIRCLE_BRANCH !== 'master') { - return; - } - - const packageJson = require('./package.json'); - const {appId} = packageJson.build; - - const appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`); - - console.log(`Notarizing ${appId} found at ${appPath}`); - - await electronNotarize.notarize({ - appBundleId: appId, - appPath, - appleId: process.env.APPLE_ID, - appleIdPassword: process.env.APPLE_ID_PASSWORD - }); - - console.log(`Done notarizing ${appId}`); -};