From 5375c76bfd7a00985d2d37e62558e00590075122 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 22 Jun 2021 14:01:33 -0700 Subject: [PATCH 1/2] Merge pull request #3725 from Expensify/version-BUILD-2c831b06e70b19a932165921416741d8b5561d56 (cherry picked from commit 59c130d6de0c2ad3fca6240af66c9c46913bf6e2) --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 858d9976148b..7b7ccd84e745 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001007301 - versionName "1.0.73-1" + versionCode 1001007302 + versionName "1.0.73-2" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index ff317bba22ae..31493baf5a57 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.73.1 + 1.0.73.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index c35f3be5b15d..c867fb76eee9 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.73.1 + 1.0.73.2 diff --git a/package-lock.json b/package-lock.json index 915609709b57..a4aa235392e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.73-1", + "version": "1.0.73-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ae03afeeb9e0..42ca0339f87c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.73-1", + "version": "1.0.73-2", "author": "Expensify, Inc.", "homepage": "https://expensify.cash", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From d9413ff442b3906d05020c8d91c785be78a2bb63 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 21 Jun 2021 16:59:27 -0600 Subject: [PATCH 2/2] Merge pull request #3713 from Expensify/cmartins-android-add-venmo-support Add Venmo to intent filter list in AndroidManifest.xml (cherry picked from commit 4de0c4490ac03cb78ba1d1a45a3a7a7883e7cf8f) --- android/app/src/main/AndroidManifest.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e4799c6dac97..95162a30af5a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,6 +7,15 @@ + + + + + + + +