From 7a2416550ccaf44a0c7d4b1700651a626d957b2f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 2 Jun 2022 15:07:46 -0700
Subject: [PATCH 1/2] Merge pull request #9301 from
Expensify/version-BUILD-8efaafa38fec600ba13939c23f7c83ad2da569b1
Update version to 1.1.70-5 on main
(cherry picked from commit 6b24678b2420651d0b22745c4a2f4777033ff183)
---
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 8658f2e60b5e..24b3f6a8a9cb 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 1001017004
- versionName "1.1.70-4"
+ versionCode 1001017005
+ versionName "1.1.70-5"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index aad0c5941c84..9c094e2df20c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.70.4
+ 1.1.70.5
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index d7d0e10fcdbc..221687d2086e 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.70.4
+ 1.1.70.5
diff --git a/package-lock.json b/package-lock.json
index b349e0af8b95..83bbed1790c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.70-4",
+ "version": "1.1.70-5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index e89c6a4e28c3..4cc1c1168515 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.70-4",
+ "version": "1.1.70-5",
"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 4989bec49cde9a76b50cb4fde1147cec0edaffe6 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:56:12 -0700
Subject: [PATCH 2/2] Merge pull request #9299 from Expensify/andrew-team-id
(cherry picked from commit 8efaafa38fec600ba13939c23f7c83ad2da569b1)
---
desktop/notarize.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/desktop/notarize.js b/desktop/notarize.js
index 5927fe8e6664..e22e9b8d3120 100644
--- a/desktop/notarize.js
+++ b/desktop/notarize.js
@@ -15,6 +15,6 @@ exports.default = function notarizing(context) {
appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASSWORD,
- teamId: '152696',
+ teamId: '368M544MTT',
});
};