From 1f04f7aede56e8b3909f3739a8c39767ba9b0206 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 19 Nov 2021 11:24:31 -0800
Subject: [PATCH 1/2] Merge pull request #6369 from
Expensify/version-BUILD-f9b0e1a71e43891ad89093a2a5b319f3fd0071e5
(cherry picked from commit 173789718d25736d57f2675312f2d42cf2628ded)
---
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 9b984c05489b..c24296da3cfd 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 1001011508
- versionName "1.1.15-8"
+ versionCode 1001011509
+ versionName "1.1.15-9"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c7aa5a7efbeb..65f69ba23557 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.15.8
+ 1.1.15.9
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 53252740561e..85147b079782 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.15.8
+ 1.1.15.9
diff --git a/package-lock.json b/package-lock.json
index 7def22b02aa9..eded459fa450 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.15-8",
+ "version": "1.1.15-9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 210a95f17dc3..15217d5dbc5d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.15-8",
+ "version": "1.1.15-9",
"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 b61dba0853598ee15e9851a12fc971aa3ff5597b Mon Sep 17 00:00:00 2001
From: Joe Gambino
Date: Fri, 19 Nov 2021 11:11:42 -0800
Subject: [PATCH 2/2] Merge pull request #6366 from Expensify/alberto-linkIos
Add /partners/plaid/oauth_ios to apple-app-site-association
(cherry picked from commit f9b0e1a71e43891ad89093a2a5b319f3fd0071e5)
---
apple-app-site-association | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apple-app-site-association b/apple-app-site-association
index e1acf50b5011..7e2c0dd744ba 100644
--- a/apple-app-site-association
+++ b/apple-app-site-association
@@ -12,7 +12,8 @@
"/v/*",
"/bank-account/*",
"/iou/*",
- "/enable-payments/*"
+ "/enable-payments/*",
+ "/partners/plaid/oauth_ios"
]
}
]