Skip to content

Commit 9e8bd6e

Browse files
committed
implementing the content of PR
rnmapbox#3937 In order to be able to run the example app that uses react-native 0.81.0
1 parent 57a69c9 commit 9e8bd6e

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

ios/RNMBX/RNMBXModelsComponentView.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#import "rnmapbox_maps-Swift.pre.h"
1414

15-
#import "RCTFollyConvert.h"
1615
#import "RNMBXFabricPropConvert.h"
16+
#import "FollyImporter.h"
1717

1818

1919
// TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support

ios/RNMBX/RNMBXViewportComponentView.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#import "rnmapbox_maps-Swift.pre.h"
1414

15-
#import "RCTFollyConvert.h"
15+
#import "FollyImporter.h"
1616

1717

1818
// TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support

ios/RNMBX/Utils/FollyImporter.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#ifdef RCT_NEW_ARCH_ENABLED
2+
3+
#if __has_include(<react/utils/FollyConvert.h>)
4+
// static libs / header maps (no use_frameworks!)
5+
#import <react/utils/FollyConvert.h>
6+
#elif __has_include("FollyConvert.h")
7+
/// `use_frameworks! :linkage => :static` users will need to import FollyConvert this way
8+
#import "FollyConvert.h"
9+
#elif __has_include("RCTFollyConvert.h")
10+
#import "RCTFollyConvert.h"
11+
#else
12+
#error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed."
13+
#endif
14+
15+
#endif
File renamed without changes.

0 commit comments

Comments
 (0)