Skip to content

fix(ios): wire add_rncore_dependency + allow non-modular includes for RN 0.84+ prebuilt RNCore (#8883) #9024

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

Draft
wneel wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix(ios): wire add_rncore_dependency + allow non-modular includes for RN 0.84+ prebuilt RNCore (#8883) #9024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d548392
fix(ios): wire add_rncore_dependency in podspecs for RN 0.84+ prebuil…
wneel May 15, 2026
742e4d8
fix(ios): allow non-modular includes in podspecs for use_frameworks! …
wneel May 15, 2026
62d28a9
fix(ios): import RCTBridgeModule.h directly in .m files using RCT_EXP…
wneel May 16, 2026
5dc5fc6
fix(ios): use idiomatic defined? check for add_rncore_dependency (rev…
wneel May 16, 2026
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
12 changes: 12 additions & 0 deletions packages/analytics/RNFBAnalytics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
12 changes: 12 additions & 0 deletions packages/app-check/RNFBAppCheck.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <FirebaseAppCheck/FIRAppCheck.h>

Expand Down
12 changes: 12 additions & 0 deletions packages/app-distribution/RNFBAppDistribution.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/app-distribution/ios/RNFBAppDistribution/RNFBAppDistributionModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
12 changes: 11 additions & 1 deletion packages/app/RNFBApp.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,13 @@ Pod::Spec.new do |s|
Pod::UI.puts '[react-native-firebase] '.yellow + "Suppress this with environment variable RNFB_SUPPRESS_NEW_ARCHITECTURE_WARNING=1"
end

# App must define modules for static framework integration of other packages to work
# App must define modules for static framework integration of other packages to work.
# CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES is required so RNFB's umbrella,
# which re-exports <React/...> imports, validates when consumers build with use_frameworks!
# (the default on Expo, and required for the firebase-ios-sdk).
s.pod_target_xcconfig = {
"DEFINES_MODULE" => "YES",
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}
Comment on lines 45 to 48
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

low

This configuration (adding add_rncore_dependency and setting CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES) is duplicated across 17 podspecs. While podspecs are often independent, centralizing this logic in a shared helper (e.g., in firebase_json.rb or a new shared file) would improve maintainability and reduce future duplication.


# React Native dependencies
Expand All @@ -50,6 +54,12 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

if (ENV.include?('FIREBASE_SDK_VERSION'))
Pod::UI.puts "#{s.name}: Found Firebase SDK version in environment '#{ENV['FIREBASE_SDK_VERSION']}'"
$FirebaseSDKVersion = ENV['FIREBASE_SDK_VERSION']
Expand Down
1 change: 1 addition & 0 deletions packages/app/ios/RNFBApp/RNFBAppModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
1 change: 1 addition & 0 deletions packages/app/ios/RNFBApp/RNFBUtilsModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <React/RCTUtils.h>

#import "RNFBApp/RNFBSharedUtils.h"
Expand Down
12 changes: 12 additions & 0 deletions packages/auth/RNFBAuth.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/auth/ios/RNFBAuth/RNFBAuthModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
12 changes: 12 additions & 0 deletions packages/crashlytics/RNFBCrashlytics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/crashlytics/ios/RNFBCrashlytics/RNFBCrashlyticsModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <Foundation/Foundation.h>
#include <sys/sysctl.h>

#import <React/RCTBridgeModule.h>
#import <React/RCTConvert.h>
#import <React/RCTLog.h>
#import <React/RCTUtils.h>
Expand Down
12 changes: 12 additions & 0 deletions packages/database/RNFBDatabase.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/database/ios/RNFBDatabase/RNFBDatabaseModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
1 change: 1 addition & 0 deletions packages/database/ios/RNFBDatabase/RNFBDatabaseOnDisconnectModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
1 change: 1 addition & 0 deletions packages/database/ios/RNFBDatabase/RNFBDatabaseQueryModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <React/RCTUtils.h>

#import "RNFBDatabaseCommon.h"
Expand Down
1 change: 1 addition & 0 deletions packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
1 change: 1 addition & 0 deletions packages/database/ios/RNFBDatabase/RNFBDatabaseTransactionModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
12 changes: 12 additions & 0 deletions packages/firestore/RNFBFirestore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/firestore/ios/RNFBFirestore/RNFBFirestoreCollectionModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <RNFBApp/RNFBRCTEventEmitter.h>
#if __has_include(<RNFBFirestore/RNFBFirestore-Swift.h>)
// This import will work in situations where `use_frameworks!` is in use
Expand Down
1 change: 1 addition & 0 deletions packages/firestore/ios/RNFBFirestore/RNFBFirestoreDocumentModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <RNFBApp/RNFBRCTEventEmitter.h>
#import <React/RCTUtils.h>

Expand Down
1 change: 1 addition & 0 deletions packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import "RNFBFirestoreModule.h"
#import <RNFBApp/RNFBRCTEventEmitter.h>
#import <React/RCTUtils.h>
Expand Down
1 change: 1 addition & 0 deletions packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <RNFBApp/RNFBRCTEventEmitter.h>
#import <React/RCTUtils.h>

Expand Down
12 changes: 12 additions & 0 deletions packages/functions/RNFBFunctions.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

# Fail fast for old architecture users, but safely in case the variable goes away
# completely in future react-native versions
if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
Expand Down
12 changes: 12 additions & 0 deletions packages/in-app-messaging/RNFBInAppMessaging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/in-app-messaging/ios/RNFBFiam/RNFBFiamModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTConvert.h>
#import <React/RCTUtils.h>
Expand Down
12 changes: 12 additions & 0 deletions packages/installations/RNFBInstallations.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/installations/ios/RNFBInstallations/RNFBInstallationsModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <React/RCTUtils.h>

Expand Down
12 changes: 12 additions & 0 deletions packages/messaging/RNFBMessaging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy
# <React/...> header imports resolve when RCT_USE_PREBUILT_RNCORE=1.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB public headers re-export non-modular <React/...> imports. Required so
# the framework module validates when consumers build with use_frameworks!.
s.pod_target_xcconfig = {
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
}

if defined?($FirebaseSDKVersion)
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
firebase_sdk_version = $FirebaseSDKVersion
Expand Down
1 change: 1 addition & 0 deletions packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
*/

#import <React/RCTBridgeModule.h>
#import <Firebase/Firebase.h>
#import <RNFBApp/RNFBSharedUtils.h>
#import <React/RCTConvert.h>
Expand Down
Loading
Loading