From c6c69d12adfa4ee7ca34d3b073f71f88fd8d224a Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Thu, 5 Oct 2023 15:18:27 +0200 Subject: [PATCH 01/12] feat: Upgrade VisionCamera to V3 --- ios/Podfile.lock | 72 ++++++++++++------- package.json | 2 +- src/pages/iou/ReceiptSelector/index.native.js | 5 +- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index cb120bca2b88..9f681a70fac4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -233,9 +233,9 @@ PODS: - libwebp/mux (1.2.4): - libwebp/demux - libwebp/webp (1.2.4) - - lottie-ios (4.3.3) - - lottie-react-native (6.3.1): - - lottie-ios (~> 4.3.0) + - lottie-ios (3.4.4) + - lottie-react-native (5.1.6): + - lottie-ios (~> 3.4.0) - React-Core - MapboxCommon (23.6.0) - MapboxCoreMaps (10.14.0): @@ -251,11 +251,19 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - - Onfido (28.3.0) - - onfido-react-native-sdk (8.3.0): - - Onfido (~> 28.3.0) + - Onfido (27.4.0) + - onfido-react-native-sdk (7.4.0): + - Onfido (= 27.4.0) - React - OpenSSL-Universal (1.1.1100) + - Permission-Camera (3.6.1): + - RNPermissions + - Permission-LocationAccuracy (3.6.1): + - RNPermissions + - Permission-LocationAlways (3.6.1): + - RNPermissions + - Permission-LocationWhenInUse (3.6.1): + - RNPermissions - Plaid (4.1.0) - PromisesObjC (2.2.0) - RCT-Folly (2021.07.22.00): @@ -579,7 +587,7 @@ PODS: - React - react-native-image-picker (5.1.0): - React-Core - - react-native-key-command (1.0.6): + - react-native-key-command (1.0.5): - React-Core - react-native-netinfo (9.3.10): - React-Core @@ -722,7 +730,7 @@ PODS: - React-Core - RNCAsyncStorage (1.17.11): - React-Core - - RNCClipboard (1.12.1): + - RNCClipboard (1.5.1): - React-Core - RNCPicker (2.4.4): - React-Core @@ -773,7 +781,7 @@ PODS: - React - React-Core - Turf - - RNPermissions (3.9.3): + - RNPermissions (3.6.1): - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core @@ -809,7 +817,7 @@ PODS: - RNScreens (3.21.0): - React-Core - React-RCTImage - - RNSVG (13.14.0): + - RNSVG (13.13.0): - React-Core - SDWebImage (5.11.1): - SDWebImage/Core (= 5.11.1) @@ -819,7 +827,7 @@ PODS: - SDWebImage/Core (~> 5.10) - SocketRocket (0.6.1) - Turf (2.6.1) - - VisionCamera (2.16.2): + - VisionCamera (3.3.1): - React - React-callinvoker - React-Core @@ -859,6 +867,10 @@ DEPENDENCIES: - lottie-react-native (from `../node_modules/lottie-react-native`) - "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)" - OpenSSL-Universal (= 1.1.1100) + - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera`) + - Permission-LocationAccuracy (from `../node_modules/react-native-permissions/ios/LocationAccuracy`) + - Permission-LocationAlways (from `../node_modules/react-native-permissions/ios/LocationAlways`) + - Permission-LocationWhenInUse (from `../node_modules/react-native-permissions/ios/LocationWhenInUse`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -915,7 +927,7 @@ DEPENDENCIES: - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNAppleAuthentication (from `../node_modules/@invertase/react-native-apple-authentication`)" - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)" + - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) @@ -1006,6 +1018,14 @@ EXTERNAL SOURCES: :path: "../node_modules/lottie-react-native" onfido-react-native-sdk: :path: "../node_modules/@onfido/react-native-sdk" + Permission-Camera: + :path: "../node_modules/react-native-permissions/ios/Camera" + Permission-LocationAccuracy: + :path: "../node_modules/react-native-permissions/ios/LocationAccuracy" + Permission-LocationAlways: + :path: "../node_modules/react-native-permissions/ios/LocationAlways" + Permission-LocationWhenInUse: + :path: "../node_modules/react-native-permissions/ios/LocationWhenInUse" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1115,7 +1135,7 @@ EXTERNAL SOURCES: RNCAsyncStorage: :path: "../node_modules/@react-native-async-storage/async-storage" RNCClipboard: - :path: "../node_modules/@react-native-clipboard/clipboard" + :path: "../node_modules/@react-native-community/clipboard" RNCPicker: :path: "../node_modules/@react-native-picker/picker" RNDateTimePicker: @@ -1197,16 +1217,20 @@ SPEC CHECKSUMS: hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef - lottie-ios: 25e7b2675dad5c3ddad369ac9baab03560c5bfdd - lottie-react-native: c9f1db4f4124dcce9f8159e65d8dc6e8bcb11fb4 + lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8 + lottie-react-native: 8f9d4be452e23f6e5ca0fdc11669dc99ab52be81 MapboxCommon: 4a0251dd470ee37e7fadda8e285c01921a5e1eb0 MapboxCoreMaps: eb07203bbb0b1509395db5ab89cd3ad6c2e3c04c MapboxMaps: af50ec61a7eb3b032c3f7962c6bd671d93d2a209 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - Onfido: c7d010d9793790d44a07799d9be25aa8e3814ee7 - onfido-react-native-sdk: b346a620af5669f9fecb6dc3052314a35a94ad9f + Onfido: e36f284b865adcf99d9c905590a64ac09d4a576b + onfido-react-native-sdk: 4ecde1a97435dcff9f00a878e3f8d1eb14fabbdc OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c + Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6 + Permission-LocationAccuracy: 76df17de5c6b8bc2eee34e61ee92cdd7a864c73d + Permission-LocationAlways: 8d99b025c9f73c696e0cdb367e42525f2e9a26f2 + Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4 Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2 PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 @@ -1233,7 +1257,7 @@ SPEC CHECKSUMS: react-native-geolocation: 0f7fe8a4c2de477e278b0365cce27d089a8c5903 react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56 react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b - react-native-key-command: 5af6ee30ff4932f78da6a2109017549042932aa5 + react-native-key-command: 69bd8d59f2812eb3bd8ae1e23b93d40cd29bcde1 react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2 react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae @@ -1263,7 +1287,7 @@ SPEC CHECKSUMS: ReactCommon: 4b2bdcb50a3543e1c2b2849ad44533686610826d RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6 RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60 - RNCClipboard: d77213bfa269013bf4b857b7a9ca37ee062d8ef1 + RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNCPicker: 0b65be85fe7954fbb2062ef079e3d1cde252d888 RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140 RNDeviceInfo: 4701f0bf2a06b34654745053db0ce4cb0c53ada7 @@ -1278,19 +1302,19 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 - RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa + RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87 RNScreens: d037903436160a4b039d32606668350d2a808806 - RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396 + RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4 - VisionCamera: 95f969b8950b411285579d633a1014782fe0e634 + VisionCamera: ed0b360805f140c0108d9039fd8a58abbde2ff51 Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: ff769666b7221c15936ebc5576a8c8e467dc6879 +PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/package.json b/package.json index 1db859827c41..4c50c89469c8 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^2.16.2", + "react-native-vision-camera": "^3.3.1", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", diff --git a/src/pages/iou/ReceiptSelector/index.native.js b/src/pages/iou/ReceiptSelector/index.native.js index 8bf13422f70c..f16961d359d1 100644 --- a/src/pages/iou/ReceiptSelector/index.native.js +++ b/src/pages/iou/ReceiptSelector/index.native.js @@ -1,6 +1,6 @@ import {ActivityIndicator, Alert, AppState, Text, View} from 'react-native'; import React, {useCallback, useEffect, useRef, useState} from 'react'; -import {useCameraDevices} from 'react-native-vision-camera'; +import {useCameraDevice} from 'react-native-vision-camera'; import lodashGet from 'lodash/get'; import PropTypes from 'prop-types'; import {withOnyx} from 'react-native-onyx'; @@ -63,8 +63,7 @@ const defaultProps = { }; function ReceiptSelector({route, report, iou, transactionID, isInTabNavigator}) { - const devices = useCameraDevices('wide-angle-camera'); - const device = devices.back; + const device = useCameraDevice('back'); const camera = useRef(null); const [flash, setFlash] = useState(false); From 6ed7c8d71ca5167be237781a21f5952303d30e5e Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Thu, 5 Oct 2023 18:41:56 +0200 Subject: [PATCH 02/12] chore: Bump minSdkVersion to 26 Required for VisionCamera, and will cover 94% of all devices worldwide anyways. --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d7e9529ae6dd..979631c9c123 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { buildToolsVersion = "33.0.0" - minSdkVersion = 21 + minSdkVersion = 26 compileSdkVersion = 33 targetSdkVersion = 33 @@ -62,7 +62,7 @@ allprojects { // 'mapbox' is the fixed username for Mapbox's Maven repository. username = 'mapbox' - // The value for password is read from the 'MAPBOX_DOWNLOADS_TOKEN' gradle property. + // The value for password is read from the 'MAPBOX_DOWNLOADS_TOKEN' gradle property. // Run "npm run setup-mapbox-sdk" to set this property in «USER_HOME»/.gradle/gradle.properties // Example gradle.properties entry: From f79dbf53c42213b6e1d2efc25429b0ee99060671 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Mon, 9 Oct 2023 11:02:18 +0200 Subject: [PATCH 03/12] fix: Update kotlinVersion --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 979631c9c123..644c48d75607 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -13,7 +13,7 @@ buildscript { androidXCore = "1.0.2" multiDexEnabled = true googlePlayServicesVersion = "17.0.0" - kotlinVersion = '1.6.20' + kotlinVersion = '1.7.20' // This property configures the type of Mapbox SDK used by the @rnmapbox/maps library. // "mapbox" indicates the usage of the Mapbox SDK. From 55042ddcdbf61b54333c1ff4517b6d14544fcc0d Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Mon, 9 Oct 2023 11:19:42 +0200 Subject: [PATCH 04/12] Update Podfile.lock --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9f681a70fac4..4281b1acae92 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1317,4 +1317,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14 -COCOAPODS: 1.13.0 +COCOAPODS: 1.12.1 From 2e5a680d497de0e75a5addac5fb41a84187ba757 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Mon, 9 Oct 2023 13:41:41 +0200 Subject: [PATCH 05/12] chore: Remove AsyncStorage (it was unused) --- README.md | 4 ++-- __mocks__/@react-native-async-storage/async-storage.js | 1 - ios/Podfile.lock | 10 ++-------- package.json | 1 - tests/README.md | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 __mocks__/@react-native-async-storage/async-storage.js diff --git a/README.md b/README.md index 9aad797ebb51..0f7483f025f2 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ variables referenced here get updated since your local `.env` file is ignored. see [PERFORMANCE.md](contributingGuides/PERFORMANCE.md#performance-metrics-opt-in-on-local-release-builds) for more information - `ONYX_METRICS` (optional) - Set this to `true` to capture even more performance metrics and see them in Flipper see [React-Native-Onyx#benchmarks](https://github.com/Expensify/react-native-onyx#benchmarks) for more information -- `E2E_TESTING` (optional) - This needs to be set to `true` when running the e2e tests for performance regression testing. +- `E2E_TESTING` (optional) - This needs to be set to `true` when running the e2e tests for performance regression testing. This happens usually automatically, read [this](tests/e2e/README.md) for more information ---- @@ -120,7 +120,7 @@ to help run our Unit tests. 2. This will allow you to attach a debugger in your IDE, React Developer Tools, or your browser. 3. For more information on how to attach a debugger, see [React Native Debugging Documentation](https://reactnative.dev/docs/debugging#chrome-developer-tools) -Alternatively, you can also set up debugger using [Flipper](https://fbflipper.com/). After installation, press `⌘D` and select "Open Debugger". This will open Flipper window. To view data stored by Onyx, go to Plugin Manager and install `async-storage` plugin. +Alternatively, you can also set up debugger using [Flipper](https://fbflipper.com/). After installation, press `⌘D` and select "Open Debugger". This will open Flipper window. ## Android Our React Native Android app now uses the `Hermes` JS engine which requires your browser for remote debugging. These instructions are specific to Chrome since that's what the Hermes documentation provided. diff --git a/__mocks__/@react-native-async-storage/async-storage.js b/__mocks__/@react-native-async-storage/async-storage.js deleted file mode 100644 index 1051fa919c94..000000000000 --- a/__mocks__/@react-native-async-storage/async-storage.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from '@react-native-async-storage/async-storage/jest/async-storage-mock'; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4281b1acae92..dee777929f1f 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -728,8 +728,6 @@ PODS: - React-perflogger (= 0.72.4) - RNAppleAuthentication (2.2.2): - React-Core - - RNCAsyncStorage (1.17.11): - - React-Core - RNCClipboard (1.5.1): - React-Core - RNCPicker (2.4.4): @@ -817,7 +815,7 @@ PODS: - RNScreens (3.21.0): - React-Core - React-RCTImage - - RNSVG (13.13.0): + - RNSVG (13.14.0): - React-Core - SDWebImage (5.11.1): - SDWebImage/Core (= 5.11.1) @@ -926,7 +924,6 @@ DEPENDENCIES: - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNAppleAuthentication (from `../node_modules/@invertase/react-native-apple-authentication`)" - - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" @@ -1132,8 +1129,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon" RNAppleAuthentication: :path: "../node_modules/@invertase/react-native-apple-authentication" - RNCAsyncStorage: - :path: "../node_modules/@react-native-async-storage/async-storage" RNCClipboard: :path: "../node_modules/@react-native-community/clipboard" RNCPicker: @@ -1286,7 +1281,6 @@ SPEC CHECKSUMS: React-utils: b79f2411931f9d3ea5781404dcbb2fa8a837e13a ReactCommon: 4b2bdcb50a3543e1c2b2849ad44533686610826d RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6 - RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60 RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNCPicker: 0b65be85fe7954fbb2062ef079e3d1cde252d888 RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140 @@ -1306,7 +1300,7 @@ SPEC CHECKSUMS: RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87 RNScreens: d037903436160a4b039d32606668350d2a808806 - RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82 + RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 diff --git a/package.json b/package.json index 4c50c89469c8..c67f11256462 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "@kie/mock-github": "^1.0.0", "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52", "@onfido/react-native-sdk": "8.3.0", - "@react-native-async-storage/async-storage": "^1.17.10", "@react-native-camera-roll/camera-roll": "5.4.0", "@react-native-clipboard/clipboard": "^1.12.1", "@react-native-community/datetimepicker": "^3.5.2", diff --git a/tests/README.md b/tests/README.md index dd5b5fc1635f..e220a9e1593c 100644 --- a/tests/README.md +++ b/tests/README.md @@ -4,7 +4,7 @@ ## Asynchronous Testing -- Much of the logic in the app is asynchronous in nature. [`react-native-onyx`](https://github.com/expensify/react-native-onyx) relies on [`AsyncStorage`](https://github.com/react-native-async-storage/async-storage) and writes data async before updating subscribers. +- Much of the logic in the app is asynchronous in nature. [`react-native-onyx`](https://github.com/expensify/react-native-onyx) relies on [`Quick-SQLite`](https://github.com/margelo/react-native-quick-sqlite) and writes data async before updating subscribers. - [Actions](https://github.com/Expensify/App#actions) do not typically return a `Promise` and therefore can't always be "awaited" before running an assertion. - To test a result after some asynchronous code has run we can use [`Onyx.connect()`](https://github.com/Expensify/react-native-onyx/blob/2c94a94e51fab20330f7bd5381b72ea6c25553d9/lib/Onyx.js#L217-L231) and the helper method [`waitForBatchedUpdates()`](https://github.com/Expensify/ReactNativeChat/blob/ca2fa88a5789b82463d35eddc3d57f70a7286868/tests/utils/waitForBatchedUpdates.js#L1-L9) which returns a `Promise` and will ensure that all other `Promises` have finished running before resolving. - **Important Note:** When writing any asynchronous Jest test it's very important that your test itself **return a `Promise`**. From 043705b692c42206e3cd70ad591590922ed8a457 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Tue, 17 Oct 2023 14:38:02 +0200 Subject: [PATCH 06/12] Update VisionCamera to 3.4.0 (which includes a fix we need) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c67f11256462..cf3747931dd3 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.3.1", + "react-native-vision-camera": "^3.4.0", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", From 429556d94da55cbf1df7c98ac241f776406c29c0 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Tue, 17 Oct 2023 14:45:38 +0200 Subject: [PATCH 07/12] Update lockfiles --- ios/Podfile.lock | 119 +++++++++++++++++++--------------------------- package-lock.json | 63 +++++++----------------- 2 files changed, 66 insertions(+), 116 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dee777929f1f..5eb402a049da 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -188,7 +188,7 @@ PODS: - GoogleUtilities/Network (~> 7.4) - "GoogleUtilities/NSData+zlib (~> 7.4)" - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.2.3): + - GoogleDataTransport (9.2.5): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) @@ -196,25 +196,25 @@ PODS: - AppAuth (~> 1.5) - GTMAppAuth (< 3.0, >= 1.3) - GTMSessionFetcher/Core (< 4.0, >= 1.1) - - GoogleUtilities/AppDelegateSwizzler (7.11.1): + - GoogleUtilities/AppDelegateSwizzler (7.11.5): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.1): + - GoogleUtilities/Environment (7.11.5): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/ISASwizzler (7.11.1) - - GoogleUtilities/Logger (7.11.1): + - GoogleUtilities/ISASwizzler (7.11.5) + - GoogleUtilities/Logger (7.11.5): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.11.1): + - GoogleUtilities/MethodSwizzler (7.11.5): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.11.1): + - GoogleUtilities/Network (7.11.5): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.1)" - - GoogleUtilities/Reachability (7.11.1): + - "GoogleUtilities/NSData+zlib (7.11.5)" + - GoogleUtilities/Reachability (7.11.5): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.11.1): + - GoogleUtilities/UserDefaults (7.11.5): - GoogleUtilities/Logger - GTMAppAuth (2.0.0): - AppAuth/Core (~> 1.6) @@ -224,18 +224,21 @@ PODS: - hermes-engine/Pre-built (= 0.72.4) - hermes-engine/Pre-built (0.72.4) - libevent (2.1.12) - - libwebp (1.2.4): - - libwebp/demux (= 1.2.4) - - libwebp/mux (= 1.2.4) - - libwebp/webp (= 1.2.4) - - libwebp/demux (1.2.4): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.2.4): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/webp (1.2.4) - - lottie-ios (3.4.4) - - lottie-react-native (5.1.6): - - lottie-ios (~> 3.4.0) + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv + - lottie-ios (4.3.3) + - lottie-react-native (6.3.1): + - lottie-ios (~> 4.3.0) - React-Core - MapboxCommon (23.6.0) - MapboxCoreMaps (10.14.0): @@ -251,21 +254,13 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - - Onfido (27.4.0) - - onfido-react-native-sdk (7.4.0): - - Onfido (= 27.4.0) + - Onfido (28.3.1) + - onfido-react-native-sdk (8.3.0): + - Onfido (~> 28.3.0) - React - OpenSSL-Universal (1.1.1100) - - Permission-Camera (3.6.1): - - RNPermissions - - Permission-LocationAccuracy (3.6.1): - - RNPermissions - - Permission-LocationAlways (3.6.1): - - RNPermissions - - Permission-LocationWhenInUse (3.6.1): - - RNPermissions - Plaid (4.1.0) - - PromisesObjC (2.2.0) + - PromisesObjC (2.3.1) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -587,7 +582,7 @@ PODS: - React - react-native-image-picker (5.1.0): - React-Core - - react-native-key-command (1.0.5): + - react-native-key-command (1.0.6): - React-Core - react-native-netinfo (9.3.10): - React-Core @@ -728,7 +723,7 @@ PODS: - React-perflogger (= 0.72.4) - RNAppleAuthentication (2.2.2): - React-Core - - RNCClipboard (1.5.1): + - RNCClipboard (1.12.1): - React-Core - RNCPicker (2.4.4): - React-Core @@ -779,7 +774,7 @@ PODS: - React - React-Core - Turf - - RNPermissions (3.6.1): + - RNPermissions (3.9.3): - React-Core - RNReactNativeHapticFeedback (1.14.0): - React-Core @@ -824,8 +819,8 @@ PODS: - libwebp (~> 1.0) - SDWebImage/Core (~> 5.10) - SocketRocket (0.6.1) - - Turf (2.6.1) - - VisionCamera (3.3.1): + - Turf (2.7.0) + - VisionCamera (3.4.0): - React - React-callinvoker - React-Core @@ -865,10 +860,6 @@ DEPENDENCIES: - lottie-react-native (from `../node_modules/lottie-react-native`) - "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)" - OpenSSL-Universal (= 1.1.1100) - - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera`) - - Permission-LocationAccuracy (from `../node_modules/react-native-permissions/ios/LocationAccuracy`) - - Permission-LocationAlways (from `../node_modules/react-native-permissions/ios/LocationAlways`) - - Permission-LocationWhenInUse (from `../node_modules/react-native-permissions/ios/LocationWhenInUse`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -924,7 +915,7 @@ DEPENDENCIES: - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNAppleAuthentication (from `../node_modules/@invertase/react-native-apple-authentication`)" - - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" + - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)" - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) @@ -1015,14 +1006,6 @@ EXTERNAL SOURCES: :path: "../node_modules/lottie-react-native" onfido-react-native-sdk: :path: "../node_modules/@onfido/react-native-sdk" - Permission-Camera: - :path: "../node_modules/react-native-permissions/ios/Camera" - Permission-LocationAccuracy: - :path: "../node_modules/react-native-permissions/ios/LocationAccuracy" - Permission-LocationAlways: - :path: "../node_modules/react-native-permissions/ios/LocationAlways" - Permission-LocationWhenInUse: - :path: "../node_modules/react-native-permissions/ios/LocationWhenInUse" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1130,7 +1113,7 @@ EXTERNAL SOURCES: RNAppleAuthentication: :path: "../node_modules/@invertase/react-native-apple-authentication" RNCClipboard: - :path: "../node_modules/@react-native-community/clipboard" + :path: "../node_modules/@react-native-clipboard/clipboard" RNCPicker: :path: "../node_modules/@react-native-picker/picker" RNDateTimePicker: @@ -1204,30 +1187,26 @@ SPEC CHECKSUMS: fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91 - GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd + GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleSignIn: b232380cf495a429b8095d3178a8d5855b42e842 - GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 + GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef - lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8 - lottie-react-native: 8f9d4be452e23f6e5ca0fdc11669dc99ab52be81 + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 + lottie-ios: 25e7b2675dad5c3ddad369ac9baab03560c5bfdd + lottie-react-native: c9f1db4f4124dcce9f8159e65d8dc6e8bcb11fb4 MapboxCommon: 4a0251dd470ee37e7fadda8e285c01921a5e1eb0 MapboxCoreMaps: eb07203bbb0b1509395db5ab89cd3ad6c2e3c04c MapboxMaps: af50ec61a7eb3b032c3f7962c6bd671d93d2a209 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - Onfido: e36f284b865adcf99d9c905590a64ac09d4a576b - onfido-react-native-sdk: 4ecde1a97435dcff9f00a878e3f8d1eb14fabbdc + Onfido: 564f60c39819635ec5b549285a1eec278cc9ba67 + onfido-react-native-sdk: b346a620af5669f9fecb6dc3052314a35a94ad9f OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6 - Permission-LocationAccuracy: 76df17de5c6b8bc2eee34e61ee92cdd7a864c73d - Permission-LocationAlways: 8d99b025c9f73c696e0cdb367e42525f2e9a26f2 - Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4 Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2 - PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: c0569ecc035894e4a68baecb30fe6a7ea6e399f9 RCTTypeSafety: e90354072c21236e0bcf1699011e39acd25fea2f @@ -1252,7 +1231,7 @@ SPEC CHECKSUMS: react-native-geolocation: 0f7fe8a4c2de477e278b0365cce27d089a8c5903 react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56 react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b - react-native-key-command: 69bd8d59f2812eb3bd8ae1e23b93d40cd29bcde1 + react-native-key-command: 5af6ee30ff4932f78da6a2109017549042932aa5 react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2 react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae @@ -1281,7 +1260,7 @@ SPEC CHECKSUMS: React-utils: b79f2411931f9d3ea5781404dcbb2fa8a837e13a ReactCommon: 4b2bdcb50a3543e1c2b2849ad44533686610826d RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6 - RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 + RNCClipboard: d77213bfa269013bf4b857b7a9ca37ee062d8ef1 RNCPicker: 0b65be85fe7954fbb2062ef079e3d1cde252d888 RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140 RNDeviceInfo: 4701f0bf2a06b34654745053db0ce4cb0c53ada7 @@ -1296,7 +1275,7 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64 - RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c + RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87 RNScreens: d037903436160a4b039d32606668350d2a808806 @@ -1304,11 +1283,11 @@ SPEC CHECKSUMS: SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4 - VisionCamera: ed0b360805f140c0108d9039fd8a58abbde2ff51 + Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 + VisionCamera: 45aae910b1fc62ceb92ba4dd278c09c080b04cc6 Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14 +PODFILE CHECKSUM: ff769666b7221c15936ebc5576a8c8e467dc6879 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/package-lock.json b/package-lock.json index 95c25f602e30..ce694fdd2d7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,6 @@ "@kie/mock-github": "^1.0.0", "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52", "@onfido/react-native-sdk": "8.3.0", - "@react-native-async-storage/async-storage": "^1.17.10", "@react-native-camera-roll/camera-roll": "5.4.0", "@react-native-clipboard/clipboard": "^1.12.1", "@react-native-community/datetimepicker": "^3.5.2", @@ -110,7 +109,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^2.16.2", + "react-native-vision-camera": "^3.4.0", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", @@ -6977,16 +6976,6 @@ "@babel/runtime": "^7.13.10" } }, - "node_modules/@react-native-async-storage/async-storage": { - "version": "1.17.11", - "license": "MIT", - "dependencies": { - "merge-options": "^3.0.4" - }, - "peerDependencies": { - "react-native": "^0.0.0-0 || 0.60 - 0.71 || 1000.0.0" - } - }, "node_modules/@react-native-camera-roll/camera-roll": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/@react-native-camera-roll/camera-roll/-/camera-roll-5.4.0.tgz", @@ -34021,6 +34010,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -39074,18 +39064,6 @@ "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", "license": "MIT" }, - "node_modules/merge-options": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", - "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", - "license": "MIT", - "dependencies": { - "is-plain-obj": "^2.1.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/merge-refs": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/merge-refs/-/merge-refs-1.2.1.tgz", @@ -44920,12 +44898,18 @@ } }, "node_modules/react-native-vision-camera": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-2.16.2.tgz", - "integrity": "sha512-QIpG33l3QB0AkTfX/ccRknwNRu1APNUkokVKF1lpRO2+tBnkXnGL0UapgXg5u9KIONZtrpupeDeO+J5B2TeQVw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.4.0.tgz", + "integrity": "sha512-rXUu8ITjE2b0KOziJCesMQZUhUPl6oBq3sEfiKXMVz4O7VhrQ0Yilh/QDgdDO6Jh4R//E4LXnj/XA7r55XsS8Q==", "peerDependencies": { "react": "*", - "react-native": "*" + "react-native": "*", + "react-native-worklets-core": "*" + }, + "peerDependenciesMeta": { + "react-native-worklets-core": { + "optional": true + } } }, "node_modules/react-native-web": { @@ -57851,12 +57835,6 @@ "@babel/runtime": "^7.13.10" } }, - "@react-native-async-storage/async-storage": { - "version": "1.17.11", - "requires": { - "merge-options": "^3.0.4" - } - }, "@react-native-camera-roll/camera-roll": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/@react-native-camera-roll/camera-roll/-/camera-roll-5.4.0.tgz", @@ -77440,7 +77418,8 @@ "is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true }, "is-plain-object": { "version": "5.0.0", @@ -81074,14 +81053,6 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, - "merge-options": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", - "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", - "requires": { - "is-plain-obj": "^2.1.0" - } - }, "merge-refs": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/merge-refs/-/merge-refs-1.2.1.tgz", @@ -85302,9 +85273,9 @@ "requires": {} }, "react-native-vision-camera": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-2.16.2.tgz", - "integrity": "sha512-QIpG33l3QB0AkTfX/ccRknwNRu1APNUkokVKF1lpRO2+tBnkXnGL0UapgXg5u9KIONZtrpupeDeO+J5B2TeQVw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.4.0.tgz", + "integrity": "sha512-rXUu8ITjE2b0KOziJCesMQZUhUPl6oBq3sEfiKXMVz4O7VhrQ0Yilh/QDgdDO6Jh4R//E4LXnj/XA7r55XsS8Q==", "requires": {} }, "react-native-web": { From 9dd1ccfa2672083652ba410dd80c43cce6740a35 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Thu, 19 Oct 2023 17:20:47 +0200 Subject: [PATCH 08/12] chore: Bump VisionCamera to 3.5.0 --- ios/Podfile.lock | 6 +++--- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5eb402a049da..0c7792f4dde3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -820,7 +820,7 @@ PODS: - SDWebImage/Core (~> 5.10) - SocketRocket (0.6.1) - Turf (2.7.0) - - VisionCamera (3.4.0): + - VisionCamera (3.5.0): - React - React-callinvoker - React-Core @@ -1284,10 +1284,10 @@ SPEC CHECKSUMS: SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 - VisionCamera: 45aae910b1fc62ceb92ba4dd278c09c080b04cc6 + VisionCamera: a836ae01463afc7a70759200fe7394f39057cf87 Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: ff769666b7221c15936ebc5576a8c8e467dc6879 -COCOAPODS: 1.13.0 +COCOAPODS: 1.12.1 diff --git a/package-lock.json b/package-lock.json index ce694fdd2d7e..4dbae3423666 100644 --- a/package-lock.json +++ b/package-lock.json @@ -109,7 +109,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.4.0", + "react-native-vision-camera": "^3.5.0", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", @@ -44898,9 +44898,9 @@ } }, "node_modules/react-native-vision-camera": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.4.0.tgz", - "integrity": "sha512-rXUu8ITjE2b0KOziJCesMQZUhUPl6oBq3sEfiKXMVz4O7VhrQ0Yilh/QDgdDO6Jh4R//E4LXnj/XA7r55XsS8Q==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.5.0.tgz", + "integrity": "sha512-xcVtEjvfEqSDZF/0S4Q5tojxNIM8Zpe7Ss+rAzN9p2AXLSi9XwKOKcf7Z/GmBE+ByDoNTmeoCuvQ2zVshb/sew==", "peerDependencies": { "react": "*", "react-native": "*", @@ -85273,9 +85273,9 @@ "requires": {} }, "react-native-vision-camera": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.4.0.tgz", - "integrity": "sha512-rXUu8ITjE2b0KOziJCesMQZUhUPl6oBq3sEfiKXMVz4O7VhrQ0Yilh/QDgdDO6Jh4R//E4LXnj/XA7r55XsS8Q==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.5.0.tgz", + "integrity": "sha512-xcVtEjvfEqSDZF/0S4Q5tojxNIM8Zpe7Ss+rAzN9p2AXLSi9XwKOKcf7Z/GmBE+ByDoNTmeoCuvQ2zVshb/sew==", "requires": {} }, "react-native-web": { diff --git a/package.json b/package.json index cf3747931dd3..63884f1c3b92 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.4.0", + "react-native-vision-camera": "^3.5.0", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", From f30c33f8e05c1700e7bd299630e450b638c202c5 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Thu, 19 Oct 2023 18:22:10 +0200 Subject: [PATCH 09/12] fix: Patch VisionCamera to fix the blackscreen when navigating back I'm working on a real fix in VisionCamera in the meantime :) --- patches/react-native-vision-camera+3.5.0.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 patches/react-native-vision-camera+3.5.0.patch diff --git a/patches/react-native-vision-camera+3.5.0.patch b/patches/react-native-vision-camera+3.5.0.patch new file mode 100644 index 000000000000..defb5cf87e17 --- /dev/null +++ b/patches/react-native-vision-camera+3.5.0.patch @@ -0,0 +1,14 @@ +diff --git a/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt b/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt +index 9a0414f..fc158f2 100644 +--- a/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt ++++ b/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt +@@ -548,8 +548,7 @@ class CameraSession( + mutex.withLock { + val session = captureSession + if (session == null) { +- // Not yet ready. Start session first, then it will update repeating request. +- startRunning() ++ // Not yet ready. + return + } + From 89f220986ac156cd467246b9c757663c022672c1 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Tue, 24 Oct 2023 13:45:25 +0200 Subject: [PATCH 10/12] fix: Upgrade VisionCamera to 3.6.1 (includes Android blackscreen fix) --- ios/Podfile.lock | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0c7792f4dde3..a7c9f6cd5cd3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -820,7 +820,7 @@ PODS: - SDWebImage/Core (~> 5.10) - SocketRocket (0.6.1) - Turf (2.7.0) - - VisionCamera (3.5.0): + - VisionCamera (3.6.1): - React - React-callinvoker - React-Core @@ -1284,7 +1284,7 @@ SPEC CHECKSUMS: SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 - VisionCamera: a836ae01463afc7a70759200fe7394f39057cf87 + VisionCamera: 311b710c3c8eef02e7352a13be6c37f2fdcaf145 Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/package-lock.json b/package-lock.json index 4dbae3423666..b858ec19465e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -109,7 +109,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.5.0", + "react-native-vision-camera": "^3.6.1", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", @@ -44898,9 +44898,9 @@ } }, "node_modules/react-native-vision-camera": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.5.0.tgz", - "integrity": "sha512-xcVtEjvfEqSDZF/0S4Q5tojxNIM8Zpe7Ss+rAzN9p2AXLSi9XwKOKcf7Z/GmBE+ByDoNTmeoCuvQ2zVshb/sew==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.6.1.tgz", + "integrity": "sha512-grgWt4XeOAxcgtz2goZr2uOH/9v3i+yzDSv+5u8g8fNFeIrzzhAIOpUu3j6ShAq+B2d3B5nVKfDsADJrKqQ/Ag==", "peerDependencies": { "react": "*", "react-native": "*", @@ -85273,9 +85273,9 @@ "requires": {} }, "react-native-vision-camera": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.5.0.tgz", - "integrity": "sha512-xcVtEjvfEqSDZF/0S4Q5tojxNIM8Zpe7Ss+rAzN9p2AXLSi9XwKOKcf7Z/GmBE+ByDoNTmeoCuvQ2zVshb/sew==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.6.1.tgz", + "integrity": "sha512-grgWt4XeOAxcgtz2goZr2uOH/9v3i+yzDSv+5u8g8fNFeIrzzhAIOpUu3j6ShAq+B2d3B5nVKfDsADJrKqQ/Ag==", "requires": {} }, "react-native-web": { diff --git a/package.json b/package.json index 63884f1c3b92..c3f07fc7297b 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.5.0", + "react-native-vision-camera": "^3.6.1", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", From 669498c187745be35732e7c3ebb820326905e242 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Tue, 24 Oct 2023 14:30:48 +0200 Subject: [PATCH 11/12] fix: Update to 3.6.2. which includes another fix --- ios/Podfile.lock | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a7c9f6cd5cd3..fce33c35a858 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -820,7 +820,7 @@ PODS: - SDWebImage/Core (~> 5.10) - SocketRocket (0.6.1) - Turf (2.7.0) - - VisionCamera (3.6.1): + - VisionCamera (3.6.2): - React - React-callinvoker - React-Core @@ -1284,7 +1284,7 @@ SPEC CHECKSUMS: SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 - VisionCamera: 311b710c3c8eef02e7352a13be6c37f2fdcaf145 + VisionCamera: 622a92cd7a6e3f0c3738dcfea99d2e986062dc4d Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/package-lock.json b/package-lock.json index b858ec19465e..98efec6de153 100644 --- a/package-lock.json +++ b/package-lock.json @@ -109,7 +109,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.6.1", + "react-native-vision-camera": "^3.6.2", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", @@ -44898,9 +44898,9 @@ } }, "node_modules/react-native-vision-camera": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.6.1.tgz", - "integrity": "sha512-grgWt4XeOAxcgtz2goZr2uOH/9v3i+yzDSv+5u8g8fNFeIrzzhAIOpUu3j6ShAq+B2d3B5nVKfDsADJrKqQ/Ag==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.6.2.tgz", + "integrity": "sha512-bgz1vViozf9HrdGdGQxEwa2jhVtB4OWkKNkw6fHXxqEBODmA9b84WScUQp/NwL+lKxCdAjRKH7tvIdTDyH2+kA==", "peerDependencies": { "react": "*", "react-native": "*", @@ -85273,9 +85273,9 @@ "requires": {} }, "react-native-vision-camera": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.6.1.tgz", - "integrity": "sha512-grgWt4XeOAxcgtz2goZr2uOH/9v3i+yzDSv+5u8g8fNFeIrzzhAIOpUu3j6ShAq+B2d3B5nVKfDsADJrKqQ/Ag==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-3.6.2.tgz", + "integrity": "sha512-bgz1vViozf9HrdGdGQxEwa2jhVtB4OWkKNkw6fHXxqEBODmA9b84WScUQp/NwL+lKxCdAjRKH7tvIdTDyH2+kA==", "requires": {} }, "react-native-web": { diff --git a/package.json b/package.json index c3f07fc7297b..b75f2936adaf 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "react-native-tab-view": "^3.5.2", "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "^3.6.0", - "react-native-vision-camera": "^3.6.1", + "react-native-vision-camera": "^3.6.2", "react-native-web-linear-gradient": "^1.1.2", "react-native-web-lottie": "^1.4.4", "react-native-webview": "^11.17.2", From 06f35e9d2a711956729af0bea83143aeff15fab3 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Tue, 24 Oct 2023 14:37:39 +0200 Subject: [PATCH 12/12] Delete react-native-vision-camera+3.5.0.patch --- patches/react-native-vision-camera+3.5.0.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 patches/react-native-vision-camera+3.5.0.patch diff --git a/patches/react-native-vision-camera+3.5.0.patch b/patches/react-native-vision-camera+3.5.0.patch deleted file mode 100644 index defb5cf87e17..000000000000 --- a/patches/react-native-vision-camera+3.5.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt b/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt -index 9a0414f..fc158f2 100644 ---- a/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt -+++ b/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt -@@ -548,8 +548,7 @@ class CameraSession( - mutex.withLock { - val session = captureSession - if (session == null) { -- // Not yet ready. Start session first, then it will update repeating request. -- startRunning() -+ // Not yet ready. - return - } -