From 8f814191e944a638ce347a3e70c8388d581511c4 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 22 Nov 2021 14:10:31 -0800
Subject: [PATCH 1/2] Merge pull request #6409 from
Expensify/version-BUILD-6b34f868627c8c1e0ecf33494dc9adc7000b2998
(cherry picked from commit c95c2ddbafc5c7e9904ca943cff783d913d53556)
---
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 aa659e6ff75..73b81bbb3bb 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 1001011600
- versionName "1.1.16-0"
+ versionCode 1001011601
+ versionName "1.1.16-1"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2975c122df8..adca41518da 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.16.0
+ 1.1.16.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b73ae39390c..1626048c66b 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.16.0
+ 1.1.16.1
diff --git a/package-lock.json b/package-lock.json
index c0cda1ac32e..1242191cade 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.16-0",
+ "version": "1.1.16-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 69d813cbfae..c7284a3ff62 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.16-0",
+ "version": "1.1.16-1",
"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 43fa78bd844e3ece7b924e2068cf2d5d0a57a997 Mon Sep 17 00:00:00 2001
From: Joe Gambino
Date: Mon, 22 Nov 2021 14:08:08 -0800
Subject: [PATCH 2/2] Merge pull request #6408 from
Expensify/joe-update-webpack
[No QA] Update webpack path for apple app association
(cherry picked from commit 6b34f868627c8c1e0ecf33494dc9adc7000b2998)
---
config/webpack/webpack.common.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
index 997498cc921..3ab94fe2ccf 100644
--- a/config/webpack/webpack.common.js
+++ b/config/webpack/webpack.common.js
@@ -51,7 +51,7 @@ const webpackConfig = {
{from: 'assets/css', to: 'css'},
{from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
{from: 'assets/images/shadow.png', to: 'images/shadow.png'},
- {from: 'apple-app-site-association'},
+ {from: '.well-known/apple-app-site-association'},
// These files are copied over as per instructions here
// https://github.com/wojtekmaj/react-pdf#copying-cmaps