Stop using CocoaPods private headers

FirebaseABTesting.podspec

@@ -34,8 +34,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
    'FirebaseCore/Sources/Private/*.h',
   ]
   s.requires_arc = base_dir + '*.m'
-  s.public_header_files = base_dir + 'Public/FirebaseABTesting/*.h', base_dir + 'Private/*.h'
-  s.private_header_files = base_dir + 'Private/*.h'
+  s.public_header_files = base_dir + 'Public/FirebaseABTesting/*.h'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>

FirebaseCore/CHANGELOG.md

@@ -5,6 +5,8 @@
 - [changed] The pods developed in this repo are no longer hard coded to be built as static
   frameworks. Instead, their linkage will be controlled by the Podfile. Use the Podfile
   option `use_frameworks! :linkage => :static` to get the Firebase 6.x linkage behavior. (#2022)
+- [changed] Firebase no longer uses the CocoaPods `private_headers` feature to expose internal
+  APIs. (#6572)
 - [removed] Removed broken `FirebaseOptions()` initializer. Use `init(contentsOfFile:)` or
   `init(googleAppID:gcmSenderID:)` instead. (#6633)
 

FirebaseInAppMessaging.podspec

@@ -31,7 +31,6 @@ See more product details at https://firebase.google.com/products/in-app-messagin
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
   s.public_header_files = base_dir + 'Sources/Public/FirebaseInAppMessaging/*.h'
-  s.private_header_files = base_dir + 'Sources/Private/**/*.h'
 
   s.resource_bundles = {
     'InAppMessagingDisplayResources' => [

FirebaseInstallations.podspec

@@ -31,9 +31,7 @@ Pod::Spec.new do |s|
   ]
   s.public_header_files = [
     base_dir + 'Library/Public/FirebaseInstallations/*.h',
-    base_dir + 'Library/Private/*.h',
   ]
-  s.private_header_files = base_dir + 'Library/Private/*.h'
 
   s.framework = 'Security'
   s.dependency 'FirebaseCore', '~> 6.10'

FirebaseInstanceID.podspec

@@ -33,8 +33,7 @@ services.
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
   s.requires_arc = base_dir + '*.m'
-  s.public_header_files = base_dir + 'Public/*.h', base_dir + 'Private/*.h'
-  s.private_header_files = base_dir + 'Private/*.h'
+  s.public_header_files = base_dir + 'Public/*.h'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRInstanceID_LIB_VERSION=' + String(s.version),

FirebaseRemoteConfig.podspec

@@ -34,7 +34,6 @@ app update.
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
   s.public_header_files = base_dir + 'Public/FirebaseRemoteConfig/*.h'
-  s.private_header_files = base_dir + 'Private/*.h'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>

FirebaseRemoteConfig/Tests/Sample/RemoteConfigSampleApp/ViewController.m

@@ -18,15 +18,19 @@
 #import <FirebaseCore/FIROptions.h>
 #import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseInstallations/FirebaseInstallations.h>
-#import <FirebaseRemoteConfig/FIRRemoteConfig_Private.h>
 #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
-#import <FirebaseRemoteConfig/RCNConfigSettings.h>
+#import "../../../Sources/Private/FIRRemoteConfig_Private.h"
 #import "FRCLog.h"
 
 static NSString *const FIRPerfNamespace = @"fireperf";
 static NSString *const FIRDefaultFIRAppName = @"__FIRAPP_DEFAULT";
 static NSString *const FIRSecondFIRAppName = @"secondFIRApp";
 
+@interface FIRRemoteConfig (Sample)
++ (FIRRemoteConfig *)remoteConfigWithFIRNamespace:(NSString *)remoteConfigNamespace
+                                              app:(FIRApp *)app;
+@end
+
 @interface ViewController ()
 @property(nonatomic, strong) IBOutlet UIButton *fetchButton;
 @property(nonatomic, strong) IBOutlet UIButton *applyButton;

HeadersImports.md

@@ -19,9 +19,9 @@ In Swift Package Manager, it's a library target.
 
 * *Private Headers* - Headers that are available to other libraries in the repo, but are not part
   of the public API. These should be located in `FirebaseFoo/Sources/Private`.
-  [Xcode](https://stackoverflow.com/a/8016333) and CocoaPods refer to these as "Private Headers".
-  Note that the usage CocoaPods `private_headers` is deprecated and should instead
-  the `source_files` attribute should be used for access them with a repo-relative import.
+  [Xcode](https://stackoverflow.com/a/8016333). They should be accessed with a repo-relative
+  import. For CocoaPods, do not use the `private_headers` attribute. Instead include them in both
+  the provider and client's `source_files` attribute.
 
 * *Interop Headers* - A special kind of private header that defines an interface to another library.
   Details in [Firebase Component System docs](Interop/FirebaseComponentSystem.md).