diff --git a/packages/analytics/RNFBAnalytics.podspec b/packages/analytics/RNFBAnalytics.podspec index 9a03bd0a3f..ad24d11ebb 100644 --- a/packages/analytics/RNFBAnalytics.podspec +++ b/packages/analytics/RNFBAnalytics.podspec @@ -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 + # 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 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 diff --git a/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m b/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m index f42e489bf8..941bb8da75 100644 --- a/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m +++ b/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/app-check/RNFBAppCheck.podspec b/packages/app-check/RNFBAppCheck.podspec index d1d65d0636..fb148121cc 100644 --- a/packages/app-check/RNFBAppCheck.podspec +++ b/packages/app-check/RNFBAppCheck.podspec @@ -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 + # 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 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 diff --git a/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m b/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m index f1121678a0..569de4c8c2 100644 --- a/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m +++ b/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/app-distribution/RNFBAppDistribution.podspec b/packages/app-distribution/RNFBAppDistribution.podspec index f3e0b6e240..437c2eb5ed 100644 --- a/packages/app-distribution/RNFBAppDistribution.podspec +++ b/packages/app-distribution/RNFBAppDistribution.podspec @@ -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 + # 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 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 diff --git a/packages/app-distribution/ios/RNFBAppDistribution/RNFBAppDistributionModule.m b/packages/app-distribution/ios/RNFBAppDistribution/RNFBAppDistributionModule.m index a13b881f2b..af735d226e 100644 --- a/packages/app-distribution/ios/RNFBAppDistribution/RNFBAppDistributionModule.m +++ b/packages/app-distribution/ios/RNFBAppDistribution/RNFBAppDistributionModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/app/RNFBApp.podspec b/packages/app/RNFBApp.podspec index 0f8ca1d42c..b93c145964 100644 --- a/packages/app/RNFBApp.podspec +++ b/packages/app/RNFBApp.podspec @@ -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 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", } # React Native dependencies @@ -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 + # 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'] diff --git a/packages/app/ios/RNFBApp/RNFBAppModule.m b/packages/app/ios/RNFBApp/RNFBAppModule.m index f679daad1b..200ff91a53 100644 --- a/packages/app/ios/RNFBApp/RNFBAppModule.m +++ b/packages/app/ios/RNFBApp/RNFBAppModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/app/ios/RNFBApp/RNFBUtilsModule.m b/packages/app/ios/RNFBApp/RNFBUtilsModule.m index 7d28331109..dfb35e4270 100644 --- a/packages/app/ios/RNFBApp/RNFBUtilsModule.m +++ b/packages/app/ios/RNFBApp/RNFBUtilsModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import "RNFBApp/RNFBSharedUtils.h" diff --git a/packages/auth/RNFBAuth.podspec b/packages/auth/RNFBAuth.podspec index 8e9b9d5065..cd21c599d5 100644 --- a/packages/auth/RNFBAuth.podspec +++ b/packages/auth/RNFBAuth.podspec @@ -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 + # 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 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 diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index 40ee9aa2e4..f274aa5bd5 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/crashlytics/RNFBCrashlytics.podspec b/packages/crashlytics/RNFBCrashlytics.podspec index d33b3f729f..e93209f86e 100644 --- a/packages/crashlytics/RNFBCrashlytics.podspec +++ b/packages/crashlytics/RNFBCrashlytics.podspec @@ -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 + # 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 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 diff --git a/packages/crashlytics/ios/RNFBCrashlytics/RNFBCrashlyticsModule.m b/packages/crashlytics/ios/RNFBCrashlytics/RNFBCrashlyticsModule.m index ada982b7a1..d8fe1ebd4c 100644 --- a/packages/crashlytics/ios/RNFBCrashlytics/RNFBCrashlyticsModule.m +++ b/packages/crashlytics/ios/RNFBCrashlytics/RNFBCrashlyticsModule.m @@ -18,6 +18,7 @@ #include #include +#import #import #import #import diff --git a/packages/database/RNFBDatabase.podspec b/packages/database/RNFBDatabase.podspec index cc37ff2a6b..bf79e4c2db 100644 --- a/packages/database/RNFBDatabase.podspec +++ b/packages/database/RNFBDatabase.podspec @@ -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 + # 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 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 diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseModule.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseModule.m index b4789169e6..f743a967c5 100644 --- a/packages/database/ios/RNFBDatabase/RNFBDatabaseModule.m +++ b/packages/database/ios/RNFBDatabase/RNFBDatabaseModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseOnDisconnectModule.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseOnDisconnectModule.m index c1454dded9..8af6366670 100644 --- a/packages/database/ios/RNFBDatabase/RNFBDatabaseOnDisconnectModule.m +++ b/packages/database/ios/RNFBDatabase/RNFBDatabaseOnDisconnectModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseQueryModule.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseQueryModule.m index fbbfff24b8..f4a36f769e 100644 --- a/packages/database/ios/RNFBDatabase/RNFBDatabaseQueryModule.m +++ b/packages/database/ios/RNFBDatabase/RNFBDatabaseQueryModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import "RNFBDatabaseCommon.h" diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m index 0c7350f88a..ab10f51d07 100644 --- a/packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m +++ b/packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseTransactionModule.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseTransactionModule.m index bd2f1ea614..34c0ac9cb7 100644 --- a/packages/database/ios/RNFBDatabase/RNFBDatabaseTransactionModule.m +++ b/packages/database/ios/RNFBDatabase/RNFBDatabaseTransactionModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/firestore/RNFBFirestore.podspec b/packages/firestore/RNFBFirestore.podspec index a153aa395d..23e34ec0c1 100644 --- a/packages/firestore/RNFBFirestore.podspec +++ b/packages/firestore/RNFBFirestore.podspec @@ -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 + # 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 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 diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreCollectionModule.m b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreCollectionModule.m index dd21cf1896..48d291572a 100644 --- a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreCollectionModule.m +++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreCollectionModule.m @@ -15,6 +15,7 @@ * */ +#import #import #if __has_include() // This import will work in situations where `use_frameworks!` is in use diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreDocumentModule.m b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreDocumentModule.m index 6e51e42d12..9dda76dcd1 100644 --- a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreDocumentModule.m +++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreDocumentModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m index 5b9c7a63c8..282840f74a 100644 --- a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m +++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m @@ -15,6 +15,7 @@ * */ +#import #import "RNFBFirestoreModule.h" #import #import diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.m b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.m index bf3dad6dda..4f4f69d84d 100644 --- a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.m +++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/functions/RNFBFunctions.podspec b/packages/functions/RNFBFunctions.podspec index fe0174fadc..dd4cc9c910 100644 --- a/packages/functions/RNFBFunctions.podspec +++ b/packages/functions/RNFBFunctions.podspec @@ -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 + # 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 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') diff --git a/packages/in-app-messaging/RNFBInAppMessaging.podspec b/packages/in-app-messaging/RNFBInAppMessaging.podspec index aa72f52e42..e274dea997 100644 --- a/packages/in-app-messaging/RNFBInAppMessaging.podspec +++ b/packages/in-app-messaging/RNFBInAppMessaging.podspec @@ -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 + # 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 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 diff --git a/packages/in-app-messaging/ios/RNFBFiam/RNFBFiamModule.m b/packages/in-app-messaging/ios/RNFBFiam/RNFBFiamModule.m index 2b860c389e..958540d22b 100644 --- a/packages/in-app-messaging/ios/RNFBFiam/RNFBFiamModule.m +++ b/packages/in-app-messaging/ios/RNFBFiam/RNFBFiamModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import #import diff --git a/packages/installations/RNFBInstallations.podspec b/packages/installations/RNFBInstallations.podspec index c4f480878e..08ebae73f3 100644 --- a/packages/installations/RNFBInstallations.podspec +++ b/packages/installations/RNFBInstallations.podspec @@ -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 + # 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 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 diff --git a/packages/installations/ios/RNFBInstallations/RNFBInstallationsModule.m b/packages/installations/ios/RNFBInstallations/RNFBInstallationsModule.m index 7b07b36a0b..7288a2b1d5 100644 --- a/packages/installations/ios/RNFBInstallations/RNFBInstallationsModule.m +++ b/packages/installations/ios/RNFBInstallations/RNFBInstallationsModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/messaging/RNFBMessaging.podspec b/packages/messaging/RNFBMessaging.podspec index db9ae77d22..c5132c8b7f 100644 --- a/packages/messaging/RNFBMessaging.podspec +++ b/packages/messaging/RNFBMessaging.podspec @@ -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 + # 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 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 diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m b/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m index 657ac96b30..aa0ef8cc4e 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import #import diff --git a/packages/ml/RNFBML.podspec b/packages/ml/RNFBML.podspec index 4ab7f0a7df..1be9362034 100644 --- a/packages/ml/RNFBML.podspec +++ b/packages/ml/RNFBML.podspec @@ -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 + # 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 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 diff --git a/packages/perf/RNFBPerf.podspec b/packages/perf/RNFBPerf.podspec index 8456941ddb..e98a7ea086 100644 --- a/packages/perf/RNFBPerf.podspec +++ b/packages/perf/RNFBPerf.podspec @@ -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 + # 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 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 diff --git a/packages/perf/ios/RNFBPerf/RNFBPerfModule.m b/packages/perf/ios/RNFBPerf/RNFBPerfModule.m index 96570231a3..a5f2c19b0d 100644 --- a/packages/perf/ios/RNFBPerf/RNFBPerfModule.m +++ b/packages/perf/ios/RNFBPerf/RNFBPerfModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/packages/remote-config/RNFBRemoteConfig.podspec b/packages/remote-config/RNFBRemoteConfig.podspec index 68661bf39c..5c7eaa9f06 100644 --- a/packages/remote-config/RNFBRemoteConfig.podspec +++ b/packages/remote-config/RNFBRemoteConfig.podspec @@ -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 + # 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 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 diff --git a/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m b/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m index a383eb8a1c..f86faa6712 100644 --- a/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m +++ b/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import #import diff --git a/packages/storage/RNFBStorage.podspec b/packages/storage/RNFBStorage.podspec index 01d5952835..929984a3b2 100644 --- a/packages/storage/RNFBStorage.podspec +++ b/packages/storage/RNFBStorage.podspec @@ -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 + # 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 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 diff --git a/packages/storage/ios/RNFBStorage/RNFBStorageModule.m b/packages/storage/ios/RNFBStorage/RNFBStorageModule.m index a3695b6ecf..6bbe4813f9 100644 --- a/packages/storage/ios/RNFBStorage/RNFBStorageModule.m +++ b/packages/storage/ios/RNFBStorage/RNFBStorageModule.m @@ -15,6 +15,7 @@ * */ +#import #import #import diff --git a/scripts/_TEMPLATE_/RNFB_Template_.podspec b/scripts/_TEMPLATE_/RNFB_Template_.podspec index 2e7929e902..cb55d24d20 100644 --- a/scripts/_TEMPLATE_/RNFB_Template_.podspec +++ b/scripts/_TEMPLATE_/RNFB_Template_.podspec @@ -28,6 +28,18 @@ Pod::Spec.new do |s| s.dependency 'React-Core' s.dependency 'RNFBApp' + # Wire up prebuilt React-Core (RN 0.83+, default on 0.84+) so the legacy + # 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 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