From 16cfa966649a301267f02a5aa7919bcb043adbf3 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 1 Nov 2021 20:45:39 -0700
Subject: [PATCH 1/2] Merge pull request #6170 from
Expensify/version-BUILD-e04b94f3f648e5139a3da2860fcd9bddcb84f511
(cherry picked from commit 910348ae8d633a29a6ee83268f6096c0b4039f79)
---
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 df04a71380ab..e88851c39a61 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001011202
- versionName "1.1.12-2"
+ versionCode 1001011203
+ versionName "1.1.12-3"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 83cbb72bd988..32d59aa638e9 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.12.2
+ 1.1.12.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index e2bd0bd07b47..eb07c1253c86 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.12.2
+ 1.1.12.3
diff --git a/package-lock.json b/package-lock.json
index 6d56ff34e9fa..61b34f8e6d20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.12-2",
+ "version": "1.1.12-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 0f76ed116b17..d0a08e4c4620 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.12-2",
+ "version": "1.1.12-3",
"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 efd1bb9194d5e86b909e07bfddbc3da0b2849d60 Mon Sep 17 00:00:00 2001
From: Yuwen Memon
Date: Mon, 1 Nov 2021 20:43:24 -0700
Subject: [PATCH 2/2] Merge pull request #6168 from Expensify/yuwen-https
Use git+https when loading expensify-common
(cherry picked from commit e04b94f3f648e5139a3da2860fcd9bddcb84f511)
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 61b34f8e6d20..27e2d54f5667 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23318,8 +23318,8 @@
}
},
"expensify-common": {
- "version": "git://github.com/Expensify/expensify-common.git#b5d9167a26cfd40beebdfb79958b3bbed1af7b64",
- "from": "git://github.com/Expensify/expensify-common.git#b5d9167a26cfd40beebdfb79958b3bbed1af7b64",
+ "version": "git+https://github.com/Expensify/expensify-common.git#b5d9167a26cfd40beebdfb79958b3bbed1af7b64",
+ "from": "git+https://github.com/Expensify/expensify-common.git#b5d9167a26cfd40beebdfb79958b3bbed1af7b64",
"requires": {
"classnames": "2.3.1",
"clipboard": "2.0.4",
diff --git a/package.json b/package.json
index d0a08e4c4620..8d86e2e0ed00 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"electron-log": "^4.3.5",
"electron-serve": "^1.0.0",
"electron-updater": "^4.3.4",
- "expensify-common": "git://github.com/Expensify/expensify-common.git#b5d9167a26cfd40beebdfb79958b3bbed1af7b64",
+ "expensify-common": "git+https://github.com/Expensify/expensify-common.git#b5d9167a26cfd40beebdfb79958b3bbed1af7b64",
"file-loader": "^6.0.0",
"html-entities": "^1.3.1",
"lodash": "4.17.21",