From b8d74003e7d9f390ab1d25b45095d424b2854e77 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 3 Mar 2022 19:36:15 -0800 Subject: [PATCH 1/2] Merge pull request #8002 from Expensify/version-BUILD-39989808f7a07b57031b7d9ba9b25c256e14c80c (cherry picked from commit 0e3bbe77a3ed497b49ffb3ee32d952e480bda448) --- 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 e8126f8e84de..ceffb22d925b 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 1001014103 - versionName "1.1.41-3" + versionCode 1001014104 + versionName "1.1.41-4" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c1fe56286057..3dd3332841bd 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.41.3 + 1.1.41.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 5874248ca316..bc426ca6ccec 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.41.3 + 1.1.41.4 diff --git a/package-lock.json b/package-lock.json index 675b259afc3b..8041f01b545f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.41-3", + "version": "1.1.41-4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8eb0c6031b5f..41cdf2530ea8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.41-3", + "version": "1.1.41-4", "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 a3274a687a9790f54e049dc4acb18e2c49480825 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Thu, 3 Mar 2022 19:24:10 -0800 Subject: [PATCH 2/2] Merge pull request #8000 from Expensify/Rory-DesktopDeployEnv (cherry picked from commit 39989808f7a07b57031b7d9ba9b25c256e14c80c) --- scripts/build-desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh index 6cc2619c8b9b..6b65e6e9be35 100755 --- a/scripts/build-desktop.sh +++ b/scripts/build-desktop.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -ELECTRON_ENV=${1:-development} +export ELECTRON_ENV=${1:-development} if [[ "$ELECTRON_ENV" == "staging" ]]; then ENV_FILE=".env.staging"