From 1c1584321448154c8c44e3cda930b451c6a23715 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 2 Jun 2022 14:32:54 -0700 Subject: [PATCH 1/2] Merge pull request #9296 from Expensify/version-BUILD-9c2ab347644ebcd9f6dd19db42e5c2b811149085 Update version to 1.1.70-4 on main (cherry picked from commit e53300a766c59cc2c659fa39d3c0802805a6dd79) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d6d3e5dc1514..8658f2e60b5e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -152,8 +152,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001017003 - versionName "1.1.70-3" + versionCode 1001017004 + versionName "1.1.70-4" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index e753f996c652..aad0c5941c84 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.70.3 + 1.1.70.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index a0f1f6647e12..d7d0e10fcdbc 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.70.3 + 1.1.70.4 diff --git a/package-lock.json b/package-lock.json index 02e142e47bfe..ec6596b9fb7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.70-3", + "version": "1.1.70-4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 794312e38aae..7557eaad1c55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.70-3", + "version": "1.1.70-4", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 30ee7450bb12604e68d03770eba4996587f0c6c9 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Thu, 2 Jun 2022 14:20:15 -0700 Subject: [PATCH 2/2] Merge pull request #9295 from Expensify/andrew-notarize-update (cherry picked from commit 9c2ab347644ebcd9f6dd19db42e5c2b811149085) --- desktop/notarize.js | 2 ++ package-lock.json | 10 +++++----- package.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/desktop/notarize.js b/desktop/notarize.js index d5188541af25..5927fe8e6664 100644 --- a/desktop/notarize.js +++ b/desktop/notarize.js @@ -10,9 +10,11 @@ exports.default = function notarizing(context) { const appName = context.packager.appInfo.productFilename; return notarize({ + tool: 'notarytool', appBundleId: electron.appId, appPath: `${appOutDir}/${appName}.app`, appleId: process.env.APPLE_ID, appleIdPassword: process.env.APPLE_ID_PASSWORD, + teamId: '152696', }); }; diff --git a/package-lock.json b/package-lock.json index ec6596b9fb7b..b349e0af8b95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16868,7 +16868,7 @@ "ascii-table": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/ascii-table/-/ascii-table-0.0.9.tgz", - "integrity": "sha1-BqZgTWpV1L9BqaR9mHLXp42jHnM=" + "integrity": "sha512-xpkr6sCDIYTPqzvjG8M3ncw1YOTaloWZOyrUmicoEifBEKzQzt+ooUpRpQ/AbOoJfO/p2ZKiyp79qHThzJDulQ==" }, "asn1": { "version": "0.2.4", @@ -21651,9 +21651,9 @@ "dev": true }, "electron-notarize": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.0.tgz", - "integrity": "sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.1.tgz", + "integrity": "sha512-u/ECWhIrhkSQpZM4cJzVZ5TsmkaqrRo5LDC/KMbGF0sPkm53Ng59+M0zp8QVaql0obfJy9vlVT+4iOkAi2UDlA==", "dev": true, "requires": { "debug": "^4.1.1", @@ -25192,7 +25192,7 @@ "good-listener": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", "requires": { "delegate": "^3.1.2" } diff --git a/package.json b/package.json index 7557eaad1c55..e89c6a4e28c3 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "diff-so-fancy": "^1.3.0", "electron": "^17.0.0", "electron-builder": "^22.13.1", - "electron-notarize": "^1.0.0", + "electron-notarize": "^1.2.1", "electron-reloader": "^1.2.1", "eslint": "^7.6.0", "eslint-config-expensify": "2.0.24",