From 7234cb7aa069e2ea053ca8e4d7b2d2dc32d05926 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 14 Jun 2023 20:31:07 -0400 Subject: [PATCH 1/3] Merge pull request #20788 from Expensify/version-BUILD-C779BAE0-2CD3-40A8-8DCB-C8F744CA9F80 Update version to 1.3.28-2 on main (cherry picked from commit 23ca9a7907738e0bd0e0ad53957946097b090b94) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a1293318f437..1630538e4b8e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001032801 - versionName "1.3.28-1" + versionCode 1001032802 + versionName "1.3.28-2" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 7d6a513fe6b2..f3a960f1a98c 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.28.1 + 1.3.28.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index cf678d5e8c27..a2b4783ca4dd 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.28.1 + 1.3.28.2 diff --git a/package-lock.json b/package-lock.json index ddf02da1424a..7d460c18d812 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.28-1", + "version": "1.3.28-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.28-1", + "version": "1.3.28-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 4eefb3ad1f70..a7b899d37204 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.28-1", + "version": "1.3.28-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 10ef5c991a90b35b12e06a40127adfd548366642 Mon Sep 17 00:00:00 2001 From: Scott Deeter Date: Wed, 14 Jun 2023 14:46:57 -0700 Subject: [PATCH 2/3] Merge pull request #20784 from Expensify/Rory-RevertPodsCache [No QA] Revert pod cache (cherry picked from commit 4343d287ce1fff5bd1c4112c379fe645ba8650fc) --- android/app/build.gradle | 5 +++++ ios/NewExpensify/Info.plist | 4 ++++ ios/NewExpensifyTests/Info.plist | 4 ++++ package-lock.json | 8 ++++++++ package.json | 4 ++++ 5 files changed, 25 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1630538e4b8e..e1609a714b4a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,13 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled +<<<<<<< HEAD versionCode 1001032802 versionName "1.3.28-2" +======= + versionCode 1001032801 + versionName "1.3.28-1" +>>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index f3a960f1a98c..f90881b9fc29 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,11 @@ CFBundleVersion +<<<<<<< HEAD 1.3.28.2 +======= + 1.3.28.1 +>>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index a2b4783ca4dd..4e9f1421c1b7 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,10 @@ CFBundleSignature ???? CFBundleVersion +<<<<<<< HEAD 1.3.28.2 +======= + 1.3.28.1 +>>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) diff --git a/package-lock.json b/package-lock.json index 7d460c18d812..e5c64e774a73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,20 @@ { "name": "new.expensify", +<<<<<<< HEAD "version": "1.3.28-2", +======= + "version": "1.3.28-1", +>>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", +<<<<<<< HEAD "version": "1.3.28-2", +======= + "version": "1.3.28-1", +>>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index a7b899d37204..c8af46a65425 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "new.expensify", +<<<<<<< HEAD "version": "1.3.28-2", +======= + "version": "1.3.28-1", +>>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) "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 59d9682d5049c4fa06747d358b9a08d88fde6c64 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 14 Jun 2023 18:38:03 -0600 Subject: [PATCH 3/3] Fix merge conflicts --- android/app/build.gradle | 5 ----- ios/NewExpensify/Info.plist | 4 ---- ios/NewExpensifyTests/Info.plist | 4 ---- package-lock.json | 8 -------- package.json | 4 ---- 5 files changed, 25 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e1609a714b4a..1630538e4b8e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,13 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled -<<<<<<< HEAD versionCode 1001032802 versionName "1.3.28-2" -======= - versionCode 1001032801 - versionName "1.3.28-1" ->>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index f90881b9fc29..f3a960f1a98c 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,11 +32,7 @@ CFBundleVersion -<<<<<<< HEAD 1.3.28.2 -======= - 1.3.28.1 ->>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 4e9f1421c1b7..a2b4783ca4dd 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,10 +19,6 @@ CFBundleSignature ???? CFBundleVersion -<<<<<<< HEAD 1.3.28.2 -======= - 1.3.28.1 ->>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) diff --git a/package-lock.json b/package-lock.json index e5c64e774a73..7d460c18d812 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,12 @@ { "name": "new.expensify", -<<<<<<< HEAD "version": "1.3.28-2", -======= - "version": "1.3.28-1", ->>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", -<<<<<<< HEAD "version": "1.3.28-2", -======= - "version": "1.3.28-1", ->>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c8af46a65425..a7b899d37204 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,6 @@ { "name": "new.expensify", -<<<<<<< HEAD "version": "1.3.28-2", -======= - "version": "1.3.28-1", ->>>>>>> 4343d287ce (Merge pull request #20784 from Expensify/Rory-RevertPodsCache) "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.",