From db74e686e51b727ea89d3b2e021e9634826b5e17 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 16 Aug 2021 07:29:10 -1000 Subject: [PATCH 1/3] update withOnyx to fix prop dependent key updates --- .../expensify/chat/generated/BasePackageList.java | 13 ------------- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java diff --git a/android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java b/android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java deleted file mode 100644 index 77ee44f9be7a..000000000000 --- a/android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.expensify.chat.generated; - -import java.util.Arrays; -import java.util.List; -import org.unimodules.core.interfaces.Package; - -public class BasePackageList { - public List getPackageList() { - return Arrays.asList( - new expo.modules.haptics.HapticsPackage() - ); - } -} diff --git a/package-lock.json b/package-lock.json index 4a73d8a34015..016ac467353a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36092,8 +36092,8 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#2908a47dee13d99ce756bebb75740ed2f27c2d2e", - "from": "git+https://github.com/Expensify/react-native-onyx.git#2908a47dee13d99ce756bebb75740ed2f27c2d2e", + "version": "git+https://github.com/Expensify/react-native-onyx.git#131ef8d87ade63721263e0b0f8b17410a8cda312", + "from": "git+https://github.com/Expensify/react-native-onyx.git#131ef8d87ade63721263e0b0f8b17410a8cda312", "requires": { "ascii-table": "0.0.9", "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c", diff --git a/package.json b/package.json index 0f47a20d7e18..49b3a8506886 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "react-native-image-picker": "^4.0.3", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^11.10.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#2908a47dee13d99ce756bebb75740ed2f27c2d2e", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#131ef8d87ade63721263e0b0f8b17410a8cda312", "react-native-pdf": "^6.2.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1", From 866c23f13f5d2a2a00cac0395b682eafa9f9413a Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 16 Aug 2021 07:32:26 -1000 Subject: [PATCH 2/3] accidental file deletion --- .../expensify/chat/generated/BasePackageList.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java diff --git a/android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java b/android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java new file mode 100644 index 000000000000..77ee44f9be7a --- /dev/null +++ b/android/app/src/main/java/com/expensify/chat/generated/BasePackageList.java @@ -0,0 +1,13 @@ +package com.expensify.chat.generated; + +import java.util.Arrays; +import java.util.List; +import org.unimodules.core.interfaces.Package; + +public class BasePackageList { + public List getPackageList() { + return Arrays.asList( + new expo.modules.haptics.HapticsPackage() + ); + } +} From ca786d1a7e2d9893b46ad208461edbd3679e7a9b Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 17 Aug 2021 13:24:46 -1000 Subject: [PATCH 3/3] bump version --- 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 016ac467353a..e0afa2be99aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36092,8 +36092,8 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#131ef8d87ade63721263e0b0f8b17410a8cda312", - "from": "git+https://github.com/Expensify/react-native-onyx.git#131ef8d87ade63721263e0b0f8b17410a8cda312", + "version": "git+https://github.com/Expensify/react-native-onyx.git#57ca276b3b83f38bc8825f98f7e68287a1e2af41", + "from": "git+https://github.com/Expensify/react-native-onyx.git#57ca276b3b83f38bc8825f98f7e68287a1e2af41", "requires": { "ascii-table": "0.0.9", "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c", diff --git a/package.json b/package.json index 49b3a8506886..ec81840a90f7 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "react-native-image-picker": "^4.0.3", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^11.10.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#131ef8d87ade63721263e0b0f8b17410a8cda312", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#57ca276b3b83f38bc8825f98f7e68287a1e2af41", "react-native-pdf": "^6.2.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1",