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
2 changes: 1 addition & 1 deletion ios/RNMBX/RNMBXModelsComponentView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#import "rnmapbox_maps-Swift.pre.h"

#import "RCTFollyConvert.h"
#import "RNMBXFollyConvert.h"
#import "RNMBXFabricPropConvert.h"


Expand Down
2 changes: 1 addition & 1 deletion ios/RNMBX/RNMBXViewportComponentView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#import "rnmapbox_maps-Swift.pre.h"

#import "RCTFollyConvert.h"
#import "RNMBXFollyConvert.h"


// TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support
Expand Down
15 changes: 15 additions & 0 deletions ios/RNMBX/Utils/RNMBXFollyConvert.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#ifdef RCT_NEW_ARCH_ENABLED

#if __has_include(<react/utils/FollyConvert.h>)
// static libs / header maps (no use_frameworks!)
#import <react/utils/FollyConvert.h>
#elif __has_include("FollyConvert.h")
/// `use_frameworks! :linkage => :static` users will need to import FollyConvert this way
#import "FollyConvert.h"
#elif __has_include("RCTFollyConvert.h")
#import "RCTFollyConvert.h"
#else
#error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed."
#endif

#endif
2 changes: 1 addition & 1 deletion rnmapbox-maps.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ Pod::Spec.new do |s|
case $RNMapboxMapsImpl
when 'mapbox'
sp.source_files = "ios/RNMBX/**/*.{h,m,mm,swift}"
sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h'
sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h', 'ios/RNMBX/Utils/RNMBXFollyConvert.h'
if new_arch_enabled
sp.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
install_modules_dependencies(sp)
Expand Down
Loading