Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@ PODS:
- RNGoogleSignin (10.0.1):
- GoogleSignIn (~> 7.0)
- React-Core
- RNLiveMarkdown (0.1.64):
- RNLiveMarkdown (0.1.69):
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
Expand All @@ -1849,9 +1849,9 @@ PODS:
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNLiveMarkdown/common (= 0.1.64)
- RNLiveMarkdown/common (= 0.1.69)
- Yoga
- RNLiveMarkdown/common (0.1.64):
- RNLiveMarkdown/common (0.1.69):
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
Expand Down Expand Up @@ -2468,14 +2468,14 @@ SPEC CHECKSUMS:
libvmaf: 27f523f1e63c694d14d534cd0fddd2fab0ae8711
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
lottie-ios: 3d98679b41fa6fd6aff2352b3953dbd3df8a397e
lottie-react-native: 80bda323805fa62005afff0583d2927a89108f20
lottie-react-native: d0e530160e1a0116ab567343d843033c496d0d97
MapboxCommon: 20466d839cc43381c44df09d19f7f794b55b9a93
MapboxCoreMaps: c21f433decbb295874f0c2464e492166db813b56
MapboxMaps: c3b36646b9038706bbceb5de203bcdd0f411e9d0
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
Onfido: 342cbecd7a4383e98dfe7f9c35e98aaece599062
onfido-react-native-sdk: 81e930e77236a0fc3da90e6a6eb834734d8ec2f5
onfido-react-native-sdk: 3e3b0dd70afa97410fb318d54c6a415137968ef2
Plaid: 7829e84db6d766a751c91a402702946d2977ddcb
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
Expand All @@ -2500,26 +2500,26 @@ SPEC CHECKSUMS:
React-jsitracing: e8a2dafb9878dbcad02b6b2b88e66267fb427b74
React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
react-native-airship: 6ab7a7974d53f92b0c46548fc198f797fdbf371f
react-native-blob-util: a3ee23cfdde79c769c138d505670055de233b07a
react-native-cameraroll: 95ce0d1a7d2d1fe55bf627ab806b64de6c3e69e9
react-native-airship: 38e2596999242b68c933959d6145512e77937ac0
react-native-blob-util: 1ddace5234c62e3e6e4e154d305ad07ef686599b
react-native-cameraroll: f373bebbe9f6b7c3fd2a6f97c5171cda574cf957
react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
react-native-document-picker: 8532b8af7c2c930f9e202aac484ac785b0f4f809
react-native-geolocation: c1c21a8cda4abae6724a322458f64ac6889b8c2b
react-native-geolocation: f9e92eb774cb30ac1e099f34b3a94f03b4db7eb3
react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440
react-native-key-command: 74d18ad516037536c2f671ef0914bcce7739b2f5
react-native-key-command: 28ccfa09520e7d7e30739480dea4df003493bfe8
react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
react-native-netinfo: 6479e7e2198f936e5abc14a3ec4d469ccbaf81e2
react-native-pager-view: 9ac6bc0fb3fa31c6d403b253ee361e62ff7ccf7f
react-native-pdf: cd256a00b9d65cb1008dcca2792d7bfb8874838d
react-native-performance: 1aa5960d005159f4ab20be15b44714b53b44e075
react-native-plaid-link-sdk: 93870f8cd1de8e0acca5cb5020188bdc94e15db6
react-native-quick-sqlite: f7b9f578b8b3b608dc742240b0103faae5b61f63
react-native-release-profiler: 42fc8e09b4f6f9b7d14cc5a15c72165e871c0918
react-native-netinfo: 02d31de0e08ab043d48f2a1a8baade109d7b6ca5
react-native-pager-view: ccd4bbf9fc7effaf8f91f8dae43389844d9ef9fa
react-native-pdf: 762369633665ec02ac227aefe2f4558b92475c23
react-native-performance: fb21ff0c9bd7a10789c69d948f25b0067d29f7a9
react-native-plaid-link-sdk: 2a91ef7e257ae16d180a1ca14ba3041ae0836fbf
react-native-quick-sqlite: e3ab3e0a29d8c705f47a60aaa6ceaa42eb6a9ec1
react-native-release-profiler: 14ccdc0eeb03bedf625cf68d53d80275a81b19dd
react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
react-native-safe-area-context: e8bdd57d9f8d34cc336f0ee6acb30712a8454446
react-native-safe-area-context: 9d79895b60b8be151fdf6faef9d2d0591eeecc63
react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688
react-native-webview: a5f5f316527235f869992aaaf05050776198806d
react-native-webview: f8ab7a37905b2366a3e849ce5992b9724f6a528d
React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c
React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac
React-perflogger: 8a1e1af5733004bdd91258dcefbde21e0d1faccd
Expand All @@ -2544,35 +2544,35 @@ SPEC CHECKSUMS:
React-utils: 6e5ad394416482ae21831050928ae27348f83487
ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522
RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
RNCClipboard: c73bbc2e9012120161f1012578418827983bfd0c
RNCPicker: c77efa39690952647b83d8085520bf50ebf94ecb
RNDeviceInfo: cbf78fdb515ae73e641ee7c6b474f77a0299e7e6
RNCClipboard: 081418ae3b391b1012c3f41d045e5e39f1beed71
RNCPicker: a37026a67de0cf1a33ffe8722783527e3b18ea9f
RNDeviceInfo: 449272e9faf2afe94a3fe2896d169e92277fffa8
RNDevMenu: 72807568fe4188bd4c40ce32675d82434b43c45d
RNFBAnalytics: f76bfa164ac235b00505deb9fc1776634056898c
RNFBApp: 729c0666395b1953198dc4a1ec6deb8fbe1c302e
RNFBCrashlytics: 2061ca863e8e2fa1aae9b12477d7dfa8e88ca0f9
RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
RNFlashList: 5b0e8311e4cf1ad91e410fd7c8526a89fb5826d1
RNFlashList: 76c2fab003330924ab1a140d13aadf3834dc32e0
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: 1190c218cdaaf029ee1437076a3fbbc3297d89fb
RNGestureHandler: 74b7b3d06d667ba0bbf41da7718f2607ae0dfe8f
RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
RNLiveMarkdown: ddc8b2d827febd397c88137ffc7a6e102d511b8b
RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184
RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
rnmapbox-maps: 3e273e0e867a079ec33df9ee33bb0482434b897d
RNPermissions: 8990fc2c10da3640938e6db1647cb6416095b729
rnmapbox-maps: 51aee278cc2af8af9298f91a2aad7210739785b4
RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216
RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37
RNReanimated: 605409e0d0ced6f2e194ae585fedc2f8a1935bf2
RNScreens: 65a936f4e227b91e4a8e2a7d4c4607355bfefda0
RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738
RNScreens: 9ec969a95987a6caae170ef09313138abf3331e1
RNShare: 2a4cdfc0626ad56b0ef583d424f2038f772afe58
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
RNSVG: db32cfcad0a221fd175e0882eff7bcba7690380a
RNSVG: 18f1381e046be2f1c30b4724db8d0c966238089f
SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
VisionCamera: 8c5c9c50b3d76018782a823cee2f0b8b628c8604
VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70

PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@dotlottie/react-player": "^1.6.3",
"@expensify/react-native-live-markdown": "0.1.64",
"@expensify/react-native-live-markdown": "0.1.69",
"@expo/metro-runtime": "~3.1.1",
"@formatjs/intl-datetimeformat": "^6.10.0",
"@formatjs/intl-listformat": "^7.2.2",
Expand Down
114 changes: 114 additions & 0 deletions patches/@rnmapbox+maps+10.1.11.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,117 @@ index dbd6d0b..1d043f2 100644
val map = mapView.getMapboxMap()

it.setDuration(0)
diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m
index 1808393..ec00542 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>

@interface RCT_EXTERN_MODULE(RNMBXOfflineModule, RCTEventEmitter<RCTBridgeModule>)
diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m
index 550f67b..76da02d 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>

@interface RCT_EXTERN_MODULE(RNMBXOfflineModuleLegacy, RCTEventEmitter<RCTBridgeModule>)
diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m
index a98e102..e43be8f 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>

@interface RCT_EXTERN_MODULE(RNMBXTileStoreModule, NSObject)
diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m
index 62205d5..1db2ac4 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTViewManager.h>
#import <Foundation/Foundation.h>

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m
index e23b10c..6a023fa 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTViewManager.h>
#import <Foundation/Foundation.h>

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m
index 8b89774..9f85c35 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>

@class RNMBXLocation;
diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m
index d7c05de..f680b86 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(RNMBXLogging, NSObject)

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m
index 72f9928..f4f5fe2 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTViewManager.h>
#import <Foundation/Foundation.h>

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m
index c0ab14d..6177811 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTViewManager.h>
#import <Foundation/Foundation.h>

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m
index 3b0af79..e00b508 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(RNMBXModule, NSObject)

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m
index 6fa19e5..54d0ff9 100644
--- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m
+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m
@@ -1,4 +1,4 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
#import <React/RCTViewManager.h>
#import <Foundation/Foundation.h>

diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm
similarity index 100%
rename from node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m
rename to node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm
24 changes: 24 additions & 0 deletions patches/react-native+0.73.4+015+fixIOSWebViewCrash.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/node_modules/react-native/scripts/cocoapods/new_architecture.rb b/node_modules/react-native/scripts/cocoapods/new_architecture.rb
index ba75b019a9b9b2..c9999beb82b7ea 100644
--- a/node_modules/react-native/scripts/cocoapods/new_architecture.rb
+++ b/node_modules/react-native/scripts/cocoapods/new_architecture.rb
@@ -105,6 +105,10 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""
current_cpp_flags = current_config["OTHER_CPLUSPLUSFLAGS"] != nil ? current_config["OTHER_CPLUSPLUSFLAGS"] : ""

+ flags_to_add = new_arch_enabled ?
+ "#{@@folly_compiler_flags} -DRCT_NEW_ARCH_ENABLED=1" :
+ "#{@@folly_compiler_flags}"
+
header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
if ENV['USE_FRAMEWORKS']
header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
@@ -124,7 +128,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
}
end
header_search_paths_string = header_search_paths.join(" ")
- spec.compiler_flags = compiler_flags.empty? ? @@folly_compiler_flags : "#{compiler_flags} #{@@folly_compiler_flags}"
+ spec.compiler_flags = compiler_flags.empty? ? "$(inherited) #{flags_to_add}" : "$(inherited) #{compiler_flags} #{flags_to_add}"
current_config["HEADER_SEARCH_PATHS"] = current_headers.empty? ?
header_search_paths_string :
"#{current_headers} #{header_search_paths_string}"