diff --git a/ReactNativeNavigation.podspec b/ReactNativeNavigation.podspec index 1644db509a..0078d265c4 100644 --- a/ReactNativeNavigation.podspec +++ b/ReactNativeNavigation.podspec @@ -30,9 +30,39 @@ Pod::Spec.new do |s| folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1' + header_search_paths = [ + '"$(PODS_ROOT)/boost"', + '"$(PODS_ROOT)/boost-for-react-native"', + '"$(PODS_ROOT)/RCT-Folly"', + '"$(PODS_ROOT)/Headers/Private/React-Core"', + '"$(PODS_ROOT)/Headers/Private/Yoga"', + ] + + if fabric_enabled && ENV['USE_FRAMEWORKS'] + header_search_paths.concat([ + '"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/textlayoutmanager/platform/ios"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-nativeconfig/React_nativeconfig.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-RuntimeApple/React_RuntimeApple.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-RuntimeCore/React_RuntimeCore.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-performancetimeline/React_performancetimeline.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimescheduler/React_runtimescheduler.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers"', + '"$(PODS_ROOT)/Headers/Public/ReactCommon"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-jserrorhandler/React_jserrorhandler.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/folly.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/fmt/fmt.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-jsinspector/jsinspector_modern.framework/Headers"', + '"${PODS_CONFIGURATION_BUILD_DIR}/React-jsinspectortracing/jsinspector_moderntracing.framework/Headers"', + ]) + end + # Base xcconfig settings xcconfig_settings = { - 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"', + 'HEADER_SEARCH_PATHS' => header_search_paths.join(' '), "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", } diff --git a/ios/RNNEventEmitter.mm b/ios/RNNEventEmitter.mm index fe03a354ed..5338e73488 100644 --- a/ios/RNNEventEmitter.mm +++ b/ios/RNNEventEmitter.mm @@ -1,7 +1,7 @@ #import "RNNEventEmitter.h" #import "RNNUtils.h" #import "RNNTurboEventEmitter.h" -#import +#import @implementation RNNEventEmitter { } diff --git a/ios/RNNReactButtonView.h b/ios/RNNReactButtonView.h index 6dd7d74f5c..298a1deabd 100644 --- a/ios/RNNReactButtonView.h +++ b/ios/RNNReactButtonView.h @@ -1,5 +1,5 @@ #import "RNNComponentView.h" -#import +#import #import #import #import diff --git a/ios/RNNReactView.mm b/ios/RNNReactView.mm index 099cb72338..7fe4e1460a 100644 --- a/ios/RNNReactView.mm +++ b/ios/RNNReactView.mm @@ -3,7 +3,7 @@ #import #ifdef RCT_NEW_ARCH_ENABLED -#import +#import #import #import diff --git a/ios/ReactNativeNavigation.h b/ios/ReactNativeNavigation.h index 0c8f231486..21ec6b1faa 100644 --- a/ios/ReactNativeNavigation.h +++ b/ios/ReactNativeNavigation.h @@ -4,7 +4,7 @@ #import #ifdef RCT_NEW_ARCH_ENABLED -#import +#import #import "RNNTurboManager.h" #endif diff --git a/ios/ScreenAnimationController.h b/ios/ScreenAnimationController.h index 4d3c7f9671..46c6f3ff86 100644 --- a/ios/ScreenAnimationController.h +++ b/ios/ScreenAnimationController.h @@ -5,7 +5,7 @@ #import #ifdef RCT_NEW_ARCH_ENABLED -#import +#import #import #endif diff --git a/ios/TurboModules/RNNTurboManager.mm b/ios/TurboModules/RNNTurboManager.mm index 1d74ac0a09..c144f7dc7e 100644 --- a/ios/TurboModules/RNNTurboManager.mm +++ b/ios/TurboModules/RNNTurboManager.mm @@ -9,7 +9,7 @@ #import "RNNReactComponentRegistry.h" #import "RNNReactRootViewCreator.h" #import "RNNTurboCommandsHandler.h" -#import +#import #import "RNNSplashScreenViewController.h" @interface RNNTurboManager ()