From 2469e6bb1080e030defa447d193fbe8f1855d88f Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 3 Mar 2022 16:02:41 -0800 Subject: [PATCH 1/2] Merge pull request #7993 from Expensify/version-BUILD-563d85c3cb009243a77217fe2f24ed02796e6f6f (cherry picked from commit c429fe29bfac74033fcde8a1ca8e98f76edb7dbf) --- 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 d66d0d1a2200..f1b928585255 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 1001014101 - versionName "1.1.41-1" + versionCode 1001014102 + versionName "1.1.41-2" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 263b03a83f49..2fd8d2b19e5e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.41.1 + 1.1.41.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index dbd94bd1683c..0a8bee827e67 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.41.1 + 1.1.41.2 diff --git a/package-lock.json b/package-lock.json index 93a79885260c..29130cff3ea3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.41-1", + "version": "1.1.41-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8fb5fab6f9f7..73e1ce9ddbed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.41-1", + "version": "1.1.41-2", "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 e07dee4de6b915dbc22fc36cd435c178953181ae Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Thu, 3 Mar 2022 15:50:50 -0800 Subject: [PATCH 2/2] Merge pull request #7989 from kidroca/kidroca/fix/desktop-updates (cherry picked from commit 563d85c3cb009243a77217fe2f24ed02796e6f6f) --- config/electronBuilder/electronBuilder.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/electronBuilder/electronBuilder.config.js b/config/electronBuilder/electronBuilder.config.js index f2455ad0428d..b36695a85ace 100644 --- a/config/electronBuilder/electronBuilder.config.js +++ b/config/electronBuilder/electronBuilder.config.js @@ -17,6 +17,7 @@ module.exports = { category: 'public.app-category.finance', target: [ {target: 'dmg', arch: ['x64', 'arm64', 'universal']}, + {target: 'zip', arch: ['x64', 'arm64', 'universal']}, ], icon: isStaging ? './desktop/icon-stg.png' : './desktop/icon.png', hardenedRuntime: true,