From 0a6f658484257c1ad092b23d14ca713c53c0a079 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 10 Feb 2022 14:23:04 -0800 Subject: [PATCH 1/2] Merge pull request #7689 from Expensify/version-BUILD-9be837fed5c57383c78977938f3ac5a738b561ce (cherry picked from commit 403fc28984e9d96f3127257a3dc3ac6e66a75cd6) --- 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 e92dbfb43ed..7a4f3101c0b 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 1001013802 - versionName "1.1.38-2" + versionCode 1001013803 + versionName "1.1.38-3" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 670e2460056..8912f6cecde 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.38.2 + 1.1.38.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 5d41a3ba8c7..d4d030ed5ed 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.38.2 + 1.1.38.3 diff --git a/package-lock.json b/package-lock.json index c97c6cf25f7..713cd80a22e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.38-2", + "version": "1.1.38-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2d7cb535562..af2ff72d806 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.38-2", + "version": "1.1.38-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 939483a53db2842b8171c1862acf1ec9a9ee7e7f Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Thu, 10 Feb 2022 14:20:37 -0800 Subject: [PATCH 2/2] Merge pull request #7685 from Expensify/Rory-FixDesktopBuild (cherry picked from commit 9be837fed5c57383c78977938f3ac5a738b561ce) --- config/electron.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/electron.config.js b/config/electron.config.js index fa127435d09..14079e6e9a3 100644 --- a/config/electron.config.js +++ b/config/electron.config.js @@ -29,5 +29,6 @@ module.exports = { './dist/**/*', './desktop/*.js', './src/libs/checkForUpdates.js', + './src/CONST/ENVIRONMENT.js', ], };