Skip to content

fix: 'react/utils/FollyConvert.h' file not found #3937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfazekas merged 5 commits into from
Aug 25, 2025
Merged

fix: 'react/utils/FollyConvert.h' file not found #3937

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3da0d5b
Fixing FollyConvert.h import also covering the scenario when using us…
whiteHatCip Aug 24, 2025
91f1c23
updating macos image in ios-actions yml configuration
whiteHatCip Aug 24, 2025
4c372ac
Moving PropertyChanges.swift file to ios/Utils folder
whiteHatCip Aug 25, 2025
3a2db52
Renaming FollyImporter.h filename
whiteHatCip Aug 25, 2025
02d4107
Reverting changes in ios-actions.yml
whiteHatCip Aug 25, 2025
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 .github/workflows/ios-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:
jobs:
build:
name: iOS Example Build ${{ inputs.NEW_ARCH && 'Fabric' || 'Paper' }} ${{ inputs.MAP_IMPL }}
runs-on: macos-13
runs-on: macos-15
timeout-minutes: 55
environment: ${{ inputs.env_name }}

Expand Down
2 changes: 1 addition & 1 deletion ios/RNMBX/RNMBXModelsComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

#import "rnmapbox_maps-Swift.pre.h"

#import "RCTFollyConvert.h"
#import "RNMBXFabricPropConvert.h"
#import "FollyImporter.h"


// TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support
Expand Down
2 changes: 1 addition & 1 deletion ios/RNMBX/RNMBXViewportComponentView.mm
View file
Open in desktop
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 "FollyImporter.h"


// TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support
Expand Down
15 changes: 15 additions & 0 deletions ios/RNMBX/Utils/FollyImporter.h
View file
Open in desktop
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
View file
Open in desktop
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/FollyImporter.h'
if new_arch_enabled
sp.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
install_modules_dependencies(sp)
Expand Down
Loading