Skip to content

fix(ios): wire prebuilt React-Core and allow non-modular React imports for use_frameworks! (RN 0.84+) #9129

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

Open
aravi365 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ios): wire prebuilt React-Core and allow non-modular React imports for use_frameworks! (RN 0.84+) #9129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 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,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 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 @@ -34,6 +34,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 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 @@ -33,6 +33,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/app/RNFBApp.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,22 @@ Pod::Spec.new do |s|
s.dependency "React-Core"
end

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

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
16 changes: 16 additions & 0 deletions packages/auth/RNFBAuth.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 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,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/database/RNFBDatabase.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/firestore/RNFBFirestore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"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
16 changes: 16 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,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"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
16 changes: 16 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 @@ -36,6 +36,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/installations/RNFBInstallations.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/messaging/RNFBMessaging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/ml/RNFBML.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/perf/RNFBPerf.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/remote-config/RNFBRemoteConfig.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down
16 changes: 16 additions & 0 deletions packages/storage/RNFBStorage.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@ Pod::Spec.new do |s|

install_modules_dependencies(s);

# RN 0.83+ (default on 0.84+) ships a prebuilt React-Core (RCT_USE_PREBUILT_RNCORE=1).
# Wire it up so the legacy <React/...> header imports resolve against the prebuilt
# framework. Guarded for older react-native versions where the helper is absent.
if defined?(add_rncore_dependency)
add_rncore_dependency(s)
end

# RNFB's Objective-C sources import <React/...> headers non-modularly. When a consumer
# builds with use_frameworks! (Expo's default, and required by the firebase-ios-sdk),
# RNFB is compiled as a framework module and Clang rejects those imports with
# -Wnon-modular-include-in-framework-module ("must be imported from module 'React'").
# Allow them so the framework module validates. Merge so any existing config is kept.
s.pod_target_xcconfig = (s.to_hash["pod_target_xcconfig"] || {}).merge({
"CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES" => "YES",
})

if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
end
Expand Down