From 88437843fd3df9b321b20fc1f71af9201d030a3a Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 24 Oct 2022 17:48:18 -0400 Subject: [PATCH 1/2] Merge pull request #12100 from Expensify/version-BUILD-33B6342C-972F-4A78-8586-43ABF8B75755 Update version to 1.2.18-10 on main (cherry picked from commit 9104f270cff69e5c29db9439120533a27003b464) --- 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 72d2c6a9dac3..bdd224097acd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001021809 - versionName "1.2.18-9" + versionCode 1001021810 + versionName "1.2.18-10" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 64f0b1196ccb..fdc7c332361e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.18.9 + 1.2.18.10 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 3a1ba18ec4f3..5dec275959bb 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.18.9 + 1.2.18.10 diff --git a/package-lock.json b/package-lock.json index 976253b7efd1..b35d2ea04a16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.18-9", + "version": "1.2.18-10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.18-9", + "version": "1.2.18-10", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c7c88a19d1df..328553358e30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.18-9", + "version": "1.2.18-10", "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 18a82ce2eacf9e2b0ae0781e77470433eddd738f Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 24 Oct 2022 15:42:01 -0600 Subject: [PATCH 2/2] Merge pull request #12099 from Expensify/chirag-onyx-package-revert Onyx package revert (cherry picked from commit 57c4b595ddd5692bd8d26c961907bfe3d403a796) --- package-lock.json | 26 +++++++------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index b35d2ea04a16..ed28611b8f46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "react-native-image-picker": "^4.8.5", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972", "react-native-modal": "^13.0.0", - "react-native-onyx": "1.0.24", + "react-native-onyx": "1.0.17", "react-native-pdf": "^6.6.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1", @@ -24269,11 +24269,6 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, - "node_modules/fast-equals": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz", - "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==" - }, "node_modules/fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -35655,12 +35650,11 @@ } }, "node_modules/react-native-onyx": { - "version": "1.0.24", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.24.tgz", - "integrity": "sha512-53URFiTpH0w0d4Qy4bTW1Wsse7dbmpyo5vRx48iQ3Wn+ZmZbDnwCeCS+aP1+8qJiQPuyDvz9tByKoI6UfkH3rA==", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.17.tgz", + "integrity": "sha512-ls2GjURfpBcGnIkwVrg2uuLnTBwd0vrEiUvbMo+GF3k81GAp2flCkVTM7ciAbo155Izk50dm0uXHYq1PIjwTxw==", "dependencies": { "ascii-table": "0.0.9", - "fast-equals": "^4.0.3", "lodash": "^4.17.21", "underscore": "^1.13.1" }, @@ -61596,11 +61590,6 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, - "fast-equals": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz", - "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==" - }, "fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -70409,12 +70398,11 @@ } }, "react-native-onyx": { - "version": "1.0.24", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.24.tgz", - "integrity": "sha512-53URFiTpH0w0d4Qy4bTW1Wsse7dbmpyo5vRx48iQ3Wn+ZmZbDnwCeCS+aP1+8qJiQPuyDvz9tByKoI6UfkH3rA==", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.17.tgz", + "integrity": "sha512-ls2GjURfpBcGnIkwVrg2uuLnTBwd0vrEiUvbMo+GF3k81GAp2flCkVTM7ciAbo155Izk50dm0uXHYq1PIjwTxw==", "requires": { "ascii-table": "0.0.9", - "fast-equals": "^4.0.3", "lodash": "^4.17.21", "underscore": "^1.13.1" } diff --git a/package.json b/package.json index 328553358e30..a7adfe4d2cef 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "react-native-image-picker": "^4.8.5", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972", "react-native-modal": "^13.0.0", - "react-native-onyx": "1.0.24", + "react-native-onyx": "1.0.17", "react-native-pdf": "^6.6.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1",