From 58c7c5b5ef15fa0ca2bb2d48d70fb4636deabbc0 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 6 Mar 2024 01:16:45 +0000 Subject: [PATCH 1/3] Update version to 1.4.47-7 (cherry picked from commit 91c2b492740f04a4167157f1fc3712bef39b15ec) --- 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 03a67c1ec830..aedb0b9fbc13 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 1001044706 - versionName "1.4.47-6" + versionCode 1001044707 + versionName "1.4.47-7" } flavorDimensions "default" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8846c759b134..5d93786a5ad6 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.47.6 + 1.4.47.7 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 4c1719b6cd2e..fad0a170d4ab 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.47.6 + 1.4.47.7 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index cbb99141a205..220fdd322c6e 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.47 CFBundleVersion - 1.4.47.6 + 1.4.47.7 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index f33ce53da4ca..fefe4e113159 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.47-6", + "version": "1.4.47-7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.47-6", + "version": "1.4.47-7", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 167e2e89d1af..3d222944af1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.47-6", + "version": "1.4.47-7", "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 34ff6aaf35363454e23f80f607dd811a39819c17 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:05:26 -0800 Subject: [PATCH 2/3] Merge pull request #37804 from Expensify/tgolen-hotfix-onyx-2.0.10 [CP Staging] Point to the onyx hotfix branch (cherry picked from commit fca7cd1211c573078d54c0f07f382037ecc36112) --- package-lock.json | 11 ++++++++--- package.json | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fefe4e113159..1890fe85bb6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,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.10", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx#cd778b55e419bf09ecf377b1e3ac013b7758434d", "react-native-pager-view": "6.2.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -203,7 +203,11 @@ "diff-so-fancy": "^1.3.0", "dotenv": "^16.0.3", "electron": "^29.0.0", +<<<<<<< HEAD "electron-builder": "24.6.4", +======= + "electron-builder": "24.13.2", +>>>>>>> fca7cd1 (Merge pull request #37804 from Expensify/tgolen-hotfix-onyx-2.0.10) "eslint": "^7.6.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-config-expensify": "^2.0.44", @@ -44484,8 +44488,9 @@ }, "node_modules/react-native-onyx": { "version": "2.0.10", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.10.tgz", - "integrity": "sha512-XHJdKBZnUyoRKrBgZlv/p6ehuFvqXqwqQlapmVwwIU40KQQes58gPy+8HnRndT3CdAeElVWZnw/BUMtiD/F3Xw==", + "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#cd778b55e419bf09ecf377b1e3ac013b7758434d", + "integrity": "sha512-0ky9ISCNhuch0onIkeu/XFhVHoLp7gFwg6Q5TZYt1Wfmu/48Z9fjJxKxw5PRLfNBtwDQZQWKYFAf/CIoBxnmZw==", + "license": "MIT", "dependencies": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", diff --git a/package.json b/package.json index 3d222944af1e..0fb3df17269b 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,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.10", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx#cd778b55e419bf09ecf377b1e3ac013b7758434d", "react-native-pager-view": "6.2.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From d2b12f4456e3974cc6fa9f4ef3ff6d27aeef0150 Mon Sep 17 00:00:00 2001 From: rory Date: Tue, 5 Mar 2024 17:22:22 -0800 Subject: [PATCH 3/3] resolve conflicts and keep the staging version of electron-builder --- package-lock.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1890fe85bb6a..c968fd853286 100644 --- a/package-lock.json +++ b/package-lock.json @@ -203,11 +203,7 @@ "diff-so-fancy": "^1.3.0", "dotenv": "^16.0.3", "electron": "^29.0.0", -<<<<<<< HEAD "electron-builder": "24.6.4", -======= - "electron-builder": "24.13.2", ->>>>>>> fca7cd1 (Merge pull request #37804 from Expensify/tgolen-hotfix-onyx-2.0.10) "eslint": "^7.6.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-config-expensify": "^2.0.44",