Skip to content

Commit 6f5f72c

Browse files
fix: 'react/utils/FollyConvert.h' file not found (#3937)
* Fixing FollyConvert.h import also covering the scenario when using use_frameworks is used in library user's Podfile * updating macos image in ios-actions yml configuration * Moving PropertyChanges.swift file to ios/Utils folder * Renaming FollyImporter.h filename The new filename will be RNMBXFollyConvert.h Co-Authored-By: Miklós Fazekas <mfazekas@szemafor.com> * Reverting changes in ios-actions.yml --------- Co-authored-by: Miklós Fazekas <mfazekas@szemafor.com>
1 parent c0301f3 commit 6f5f72c

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

ios/RNMBX/RNMBXModelsComponentView.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 "RNMBXFollyConvert.h"
1616
#import "RNMBXFabricPropConvert.h"
1717

1818

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 "RNMBXFollyConvert.h"
1616

1717

1818
// TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support
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

rnmapbox-maps.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Pod::Spec.new do |s|
253253
case $RNMapboxMapsImpl
254254
when 'mapbox'
255255
sp.source_files = "ios/RNMBX/**/*.{h,m,mm,swift}"
256-
sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h'
256+
sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h', 'ios/RNMBX/Utils/RNMBXFollyConvert.h'
257257
if new_arch_enabled
258258
sp.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
259259
install_modules_dependencies(sp)

0 commit comments

Comments
 (0)