Separate Core private versus internal headers (#5759)

paulb777 · web-flow · commit 851b0390f673 · 2020-06-08T09:18:31.000-07:00
diff --git a/Example/Shared/FIRComponentTestUtilities.h b/Example/Shared/FIRComponentTestUtilities.h
@@ -18,7 +18,7 @@
 
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainerInternal.h>
+#import <FirebaseCore/FIRComponentContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Tests/Sample/Sample/MainViewController.m b/FirebaseAuth/Tests/Sample/Sample/MainViewController.m
@@ -16,9 +16,6 @@
 
 #import <objc/runtime.h>
 
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIRAppInternal.h>
-
 #import "AppManager.h"
 #import "AuthCredentials.h"
 #import "FacebookAuthProvider.h"
diff --git a/FirebaseCore/Sources/FIRAnalyticsConfiguration.h b/FirebaseCore/Sources/FIRAnalyticsConfiguration.h
diff --git a/FirebaseCore/Sources/FIRAnalyticsConfiguration.m b/FirebaseCore/Sources/FIRAnalyticsConfiguration.m
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseCore/Sources/Private/FIRAnalyticsConfiguration.h"
+#import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-implementations"
diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m
@@ -24,12 +24,12 @@
 
 #import <FirebaseCore/FIRApp.h>
 
+#import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
 #import "FirebaseCore/Sources/FIRBundleUtil.h"
+#import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
+#import "FirebaseCore/Sources/FIRConfigurationInternal.h"
 #import "FirebaseCore/Sources/FIRVersion.h"
-#import "FirebaseCore/Sources/Private/FIRAnalyticsConfiguration.h"
 #import "FirebaseCore/Sources/Private/FIRAppInternal.h"
-#import "FirebaseCore/Sources/Private/FIRComponentContainerInternal.h"
-#import "FirebaseCore/Sources/Private/FIRConfigurationInternal.h"
 #import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h"
 #import "FirebaseCore/Sources/Private/FIRLibrary.h"
 #import "FirebaseCore/Sources/Private/FIRLogger.h"
diff --git a/FirebaseCore/Sources/FIRAppAssociationRegistration.h b/FirebaseCore/Sources/FIRAppAssociationRegistration.h
diff --git a/FirebaseCore/Sources/FIRAppAssociationRegistration.m b/FirebaseCore/Sources/FIRAppAssociationRegistration.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseCore/Sources/Private/FIRAppAssociationRegistration.h"
+#import "FirebaseCore/Sources/FIRAppAssociationRegistration.h"
 
 #import <objc/runtime.h>
 
diff --git a/FirebaseCore/Sources/FIRComponentContainerInternal.h b/FirebaseCore/Sources/FIRComponentContainerInternal.h
diff --git a/FirebaseCore/Sources/FIRComponentType.m b/FirebaseCore/Sources/FIRComponentType.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseCore/Sources/Private/FIRComponentType.h"
 
-#import "FirebaseCore/Sources/Private/FIRComponentContainerInternal.h"
+#import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
 
 @implementation FIRComponentType
 
diff --git a/FirebaseCore/Sources/FIRConfiguration.m b/FirebaseCore/Sources/FIRConfiguration.m
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseCore/Sources/Private/FIRConfigurationInternal.h"
+#import "FirebaseCore/Sources/FIRConfigurationInternal.h"
 
-#import "FirebaseCore/Sources/Private/FIRAnalyticsConfiguration.h"
+#import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
 
 extern void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel);
 
diff --git a/FirebaseCore/Sources/FIRConfigurationInternal.h b/FirebaseCore/Sources/FIRConfigurationInternal.h
diff --git a/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m b/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m
@@ -20,8 +20,8 @@
 
 #import <FirebaseCore/FIROptions.h>
 
+#import "FirebaseCore/Sources/FIRDiagnosticsData.h"
 #import "FirebaseCore/Sources/Private/FIRAppInternal.h"
-#import "FirebaseCore/Sources/Private/FIRDiagnosticsData.h"
 #import "FirebaseCore/Sources/Private/FIROptionsInternal.h"
 
 // Define the interop class symbol declared as an extern in FIRCoreDiagnosticsInterop.
diff --git a/FirebaseCore/Sources/FIRDiagnosticsData.h b/FirebaseCore/Sources/FIRDiagnosticsData.h
diff --git a/FirebaseCore/Sources/FIRDiagnosticsData.m b/FirebaseCore/Sources/FIRDiagnosticsData.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseCore/Sources/Private/FIRDiagnosticsData.h"
+#import "FirebaseCore/Sources/FIRDiagnosticsData.h"
 
 #import <FirebaseCore/FIRApp.h>
 
diff --git a/FirebaseCore/Tests/Unit/FIRAnalyticsConfigurationTest.m b/FirebaseCore/Tests/Unit/FIRAnalyticsConfigurationTest.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
-#import <FirebaseCore/FIRAnalyticsConfiguration.h>
+#import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
 
 @interface FIRAnalyticsConfigurationTest : FIRTestCase
 /// An observer for NSNotificationCenter.
diff --git a/FirebaseCore/Tests/Unit/FIRAppAssociationRegistrationUnitTests.m b/FirebaseCore/Tests/Unit/FIRAppAssociationRegistrationUnitTests.m
@@ -14,7 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIRAppAssociationRegistration.h>
+#import "FirebaseCore/Sources/FIRAppAssociationRegistration.h"
 
 /** @var kKey
     @brief A unique string key.
diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m
@@ -15,10 +15,10 @@
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 
-#import <FirebaseCore/FIRAnalyticsConfiguration.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRCoreDiagnosticsConnector.h>
-#import <FirebaseCore/FIROptionsInternal.h>
+#import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
+#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h"
+#import "FirebaseCore/Sources/Private/FIROptionsInternal.h"
 
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 
diff --git a/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m b/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m
@@ -14,10 +14,10 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainerInternal.h>
 #import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
+#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Sources/Private/FIRComponent.h"
 
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 
diff --git a/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m b/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m
@@ -14,8 +14,8 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
-#import <FirebaseCore/FIRComponentContainerInternal.h>
-#import <FirebaseCore/FIRComponentType.h>
+#import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
+#import "FirebaseCore/Sources/Private/FIRComponentType.h"
 
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 
diff --git a/FirebaseCore/Tests/Unit/FIRConfigurationTest.m b/FirebaseCore/Tests/Unit/FIRConfigurationTest.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <FirebaseCore/FIRConfigurationInternal.h>
+#import "FirebaseCore/Sources/FIRConfigurationInternal.h"
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
diff --git a/FirebaseCore/Tests/Unit/FIRDiagnosticsDataTest.m b/FirebaseCore/Tests/Unit/FIRDiagnosticsDataTest.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIRDiagnosticsData.h>
+#import "FirebaseCore/Sources/FIRDiagnosticsData.h"
 
 @interface FIRDiagnosticsDataTest : XCTestCase
 
diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <FirebaseCore/FIRHeartbeatInfo.h>
 #import <GoogleUtilities/GULHeartbeatDateStorage.h>
 #import <XCTest/XCTest.h>
+#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h"
 
 @interface FIRHeartbeatInfoTest : XCTestCase
 
diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m
@@ -19,8 +19,8 @@
 
 // TODO - FIRLoggerTest should be split into a separate FIRLoggerTest and GULLoggerTest.
 // No test should include both includes.
-#import <FirebaseCore/FIRLogger.h>
 #import <GoogleUtilities/GULLogger.h>
+#import "FirebaseCore/Sources/Private/FIRLogger.h"
 
 #import <asl.h>
 
diff --git a/FirebaseCore/Tests/Unit/FIROptionsTest.m b/FirebaseCore/Tests/Unit/FIROptionsTest.m
@@ -14,10 +14,10 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIROptionsInternal.h>
 #import "FirebaseCore/Sources/FIRBundleUtil.h"
 #import "FirebaseCore/Sources/FIRVersion.h"
+#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Sources/Private/FIROptionsInternal.h"
 
 extern NSString *const kFIRIsMeasurementEnabled;
 extern NSString *const kFIRIsAnalyticsCollectionEnabled;
diff --git a/FirebaseCore/Tests/Unit/FIRTestComponents.h b/FirebaseCore/Tests/Unit/FIRTestComponents.h
@@ -14,9 +14,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRLibrary.h>
+#import "FirebaseCore/Sources/Private/FIRComponent.h"
+#import "FirebaseCore/Sources/Private/FIRComponentContainer.h"
+#import "FirebaseCore/Sources/Private/FIRLibrary.h"
 
 @protocol FIRComponentRegistrant;
 
diff --git a/FirebaseCore/Tests/Unit/FIRTestComponents.m b/FirebaseCore/Tests/Unit/FIRTestComponents.m
@@ -14,9 +14,9 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRDependency.h>
+#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Sources/Private/FIRComponent.h"
+#import "FirebaseCore/Sources/Private/FIRDependency.h"
 
 #pragma mark - Standard Component
 
diff --git a/FirebaseCore/Tests/Unit/Swift/FirebaseCore-unit-Bridging-Header.h b/FirebaseCore/Tests/Unit/Swift/FirebaseCore-unit-Bridging-Header.h
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import "ExceptionCatcher.h"
+#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.h"
diff --git a/FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.m b/FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "ExceptionCatcher.h"
+#import "FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.h"
 #import "FirebaseCore/Sources/Private/FIRErrorCode.h"
 
 @implementation ExceptionCatcher
