From dbe05c56e50772daed3e4e010d26b495eddf6044 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 3 May 2024 21:33:53 +0000 Subject: [PATCH 1/3] Update version to 1.4.70-2 (cherry picked from commit f7be07ab5a1512676f00e1d3cc1c585fca5e8309) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e3f4e9bb9f0d..7b8271cfcbf2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,8 +98,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001047001 - versionName "1.4.70-1" + versionCode 1001047002 + versionName "1.4.70-2" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index a519e0ebf0dd..647c12d51353 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.70.1 + 1.4.70.2 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index b359e93157c7..c692d84e11a2 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.70.1 + 1.4.70.2 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index ab7622c2820d..8bb62f9d5f56 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.70 CFBundleVersion - 1.4.70.1 + 1.4.70.2 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index d87255cc6c87..d86383cf1192 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.70-1", + "version": "1.4.70-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.70-1", + "version": "1.4.70-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 22c62bf4e7ae..1c093deb50f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.70-1", + "version": "1.4.70-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 d5d83bb99162af00dfa9a399fecdc5b3f886d4b7 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 3 May 2024 15:28:33 -0600 Subject: [PATCH 2/3] Merge pull request #41612 from Expensify/francois-debump-rn-onyx [CP Staging] Roll back `react-native-onyx` to version `2.0.32` (cherry picked from commit 3eba6811bfb3b71c7556f081057de7b1a6847fb2) --- package-lock.json | 10 +++++++--- package.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d86383cf1192..8db45e2d5671 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,11 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", +<<<<<<< HEAD "react-native-onyx": "^2.0.35", +======= + "react-native-onyx": "2.0.32", +>>>>>>> 3eba681 (Merge pull request #41612 from Expensify/francois-debump-rn-onyx) "react-native-pager-view": "6.2.3", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -31430,9 +31434,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.35", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.35.tgz", - "integrity": "sha512-eQwXQoYpv6Wv1sDrR2Otl4mW34U8OZPtlpju3OyGv1KpQSQ+2q8Ivju7AHc3DG+j2QHypUKngQghKdJ9Sm3jBQ==", + "version": "2.0.32", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.32.tgz", + "integrity": "sha512-tB9wqMJGTLOYfrfplRP+9aq5JdD8w/hV/OZsMAVH+ewbE1zLY8OymUsAsIFdF1v+cB8HhehP569JVLZmhm6bsg==", "dependencies": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", diff --git a/package.json b/package.json index 1c093deb50f6..3021f39fe572 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-onyx": "2.0.35", + "react-native-onyx": "2.0.32", "react-native-pager-view": "6.2.3", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From 58584464df4bd3cd6c8e0d2f6cc12fdf5b092630 Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Fri, 3 May 2024 14:36:23 -0700 Subject: [PATCH 3/3] Update package-lock.json Fix conflict --- package-lock.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8db45e2d5671..c7f1dc3ed5be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,11 +100,7 @@ "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", -<<<<<<< HEAD - "react-native-onyx": "^2.0.35", -======= "react-native-onyx": "2.0.32", ->>>>>>> 3eba681 (Merge pull request #41612 from Expensify/francois-debump-rn-onyx) "react-native-pager-view": "6.2.3", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0",