Skip to content

Commit 709a459

Browse files
fortmarekfacebook-github-bot
authored andcommitted
Fix using Swift in a native module with Fabric enabled (#33743)
Summary: Using Fabric with a Swift native module is currently broken. There are currently two issues. If you try to integrate a native module with Swift code, you will get the following error when running `pod install` with Fabric enabled: ``` [!] The following Swift pods cannot yet be integrated as static libraries: The Swift pod `MyNativeView` depends upon `React-RCTFabric`, `React-Codegen`, `RCTTypeSafety`, and `ReactCommon`, which do not define modules. To opt into those targets generating module maps (which is necessary to import them from Swift when building as static libraries), you may set `use_modular_headers!` globally in your Podfile, or specify `:modular_headers => true` for particular dependencies. ``` To resolve this, I have applied the suggestion from the error (set `:modular_headers => true` for the appropriate modules inside `react_native_pods.rb`. Afterwards, `pod install` succeeds but I still got `Redefinition of module 'React'` during the build due to the conflict inside the generated modulesmaps `React-Core.modulemap` and `React-RCTFabric.modulemap`. This makes sense since `React-RCTFabric.podspec` has `s.header_dir = "React"` (see [here](https://github.com/facebook/react-native/blob/main/React/React-RCTFabric.podspec#L37)) and the module inherits that. However, we can explicitly specify `module_name` for the podspec which is what I have done. I have named the module `Fabric`, let me know if you think there's a better name. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [iOS] [Fixed] - Fix using Swift in a native module with Fabric enabled Pull Request resolved: #33743 Test Plan: 1. Clone [this](https://github.com/fortmarek/react-native) repo 2. From `main`, apply changes from [this](fortmarek@26958fc) commit (adding Swift file to the `MyNativeView` native module in the RN tester app) 3. Try to run `USE_FABRIC=1 RCT_NEW_ARCH_ENABLED=1 USE_CODEGEN_DISCOVERY=1 USE_HERMES=0 bundle exec pod install` inside the `packages/rn-tester` 4. Observe errors 5. Apply [the commit](9772c62) from this PR 6. Both pod install and the subsequent build should succeed. I can also make changes to the current `MyNativeView` module to include Swift as well if it's something that the React Native Core team would be interested in - in case you want the Swift native modules to be always buildable on `main` Reviewed By: dmitryrykun Differential Revision: D36097852 Pulled By: cipolleschi fbshipit-source-id: 2faebcffd1115339f89a406e265a6a040218dc9c
1 parent 5de0f14 commit 709a459

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

React/React-RCTFabric.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Pod::Spec.new do |s|
3535
"**/android/*",
3636
s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
3737
s.header_dir = "React"
38+
s.module_name = "RCTFabric"
3839
s.framework = "JavaScriptCore"
3940
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" }
4041
s.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",

scripts/react_native_pods.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def use_react_native! (options={})
4444
pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
4545
pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec"
4646
pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
47-
pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety"
47+
pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety", :modular_headers => true
4848
pod 'React', :path => "#{prefix}/"
4949
pod 'React-Core', :path => "#{prefix}/"
5050
pod 'React-CoreModules', :path => "#{prefix}/React/CoreModules"
@@ -72,13 +72,13 @@ def use_react_native! (options={})
7272
pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
7373
pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
7474
pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
75-
pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon"
75+
pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true
7676
pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
7777

7878
pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
7979
pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
8080
pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
81-
pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
81+
pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
8282

8383
if ENV['USE_CODEGEN_DISCOVERY'] == '1'
8484
app_path = options[:app_path]
@@ -96,15 +96,15 @@ def use_react_native! (options={})
9696
generate_react_codegen_podspec!(react_codegen_spec)
9797
end
9898

99-
pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR
99+
pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
100100

101101
if fabric_enabled
102102
checkAndGenerateEmptyThirdPartyProvider!(prefix)
103103
pod 'React-Fabric', :path => "#{prefix}/ReactCommon"
104104
pod 'React-rncore', :path => "#{prefix}/ReactCommon"
105105
pod 'React-graphics', :path => "#{prefix}/ReactCommon/react/renderer/graphics"
106106
pod 'React-jsi/Fabric', :path => "#{prefix}/ReactCommon/jsi"
107-
pod 'React-RCTFabric', :path => "#{prefix}/React"
107+
pod 'React-RCTFabric', :path => "#{prefix}/React", :modular_headers => true
108108
pod 'RCT-Folly/Fabric', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
109109
end
110110

0 commit comments

Comments
 (0)