From 35dbfa7ca1fff74330e2bc6cfc4020f27c8e9c4f Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 18 May 2021 09:24:28 -1000 Subject: [PATCH 1/3] bump Onyx version --- package-lock.json | 13 ++++++++++--- package.json | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b86767314d5..471d00758dee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32739,14 +32739,21 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#586c76e7b90dbbde051d7ec7adbc4d53b2d51cd1", - "from": "git+https://github.com/Expensify/react-native-onyx.git#586c76e7b90dbbde051d7ec7adbc4d53b2d51cd1", + "version": "git+https://github.com/Expensify/react-native-onyx.git#22bf685ed8e28db06e06cfc52578ebbec3445e73", + "from": "git+https://github.com/Expensify/react-native-onyx.git#22bf685ed8e28db06e06cfc52578ebbec3445e73", "requires": { "@react-native-community/async-storage": "^1.12.1", "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c", "lodash": "4.17.21", "react": "^16.13.1", - "underscore": "^1.11.0" + "underscore": "^1.13.1" + }, + "dependencies": { + "underscore": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", + "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" + } } }, "react-native-pdf": { diff --git a/package.json b/package.json index 21f59ed1a003..045f41e6f8e9 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "react-native-image-picker": "^2.3.3", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^11.5.6", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#586c76e7b90dbbde051d7ec7adbc4d53b2d51cd1", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#22bf685ed8e28db06e06cfc52578ebbec3445e73", "react-native-pdf": "^6.2.2", "react-native-picker-select": "8.0.4", "react-native-plaid-link-sdk": "^7.0.5", From 423faee6860c0aeb5d6efbfbe492d0883e16defc Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Thu, 20 May 2021 08:14:52 -1000 Subject: [PATCH 2/3] use merge commit --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fcdb5f9cc573..343c544eaed9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32744,8 +32744,8 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#22bf685ed8e28db06e06cfc52578ebbec3445e73", - "from": "git+https://github.com/Expensify/react-native-onyx.git#22bf685ed8e28db06e06cfc52578ebbec3445e73", + "version": "git+https://github.com/Expensify/react-native-onyx.git#d0a5d12c08f2f029e3038fb3516a93a9403e9746", + "from": "git+https://github.com/Expensify/react-native-onyx.git#d0a5d12c08f2f029e3038fb3516a93a9403e9746", "requires": { "@react-native-community/async-storage": "^1.12.1", "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c", diff --git a/package.json b/package.json index e2c8c538dc04..29cd385b1d58 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "react-native-image-picker": "^2.3.3", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^11.5.6", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#22bf685ed8e28db06e06cfc52578ebbec3445e73", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#d0a5d12c08f2f029e3038fb3516a93a9403e9746", "react-native-pdf": "^6.2.2", "react-native-permissions": "^3.0.1", "react-native-picker-select": "8.0.4", From 4cdffca4dc28760319edd0e13fab96a39afb9103 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 21 May 2021 17:18:20 +0000 Subject: [PATCH 3/3] Update version to 1.0.50-4 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 8f918d3333d0..4cdc7042d2db 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001005003 - versionName "1.0.50-3" + versionCode 1001005004 + versionName "1.0.50-4" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 0062801f2bcc..11394cb42244 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.50.3 + 1.0.50.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index b25d00f96847..44fbfcb9ac0a 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.50.3 + 1.0.50.4 diff --git a/package-lock.json b/package-lock.json index 06936d9ed78a..8556942422b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.50-3", + "version": "1.0.50-4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2bdf13f11f71..777c91913714 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.50-3", + "version": "1.0.50-4", "author": "Expensify, Inc.", "homepage": "https://expensify.cash", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",