diff --git a/Example/Auth/Sample/ApplicationDelegate.m b/Example/Auth/Sample/ApplicationDelegate.m index aaa7415ebf7..1023a19bfd0 100644 --- a/Example/Auth/Sample/ApplicationDelegate.m +++ b/Example/Auth/Sample/ApplicationDelegate.m @@ -16,10 +16,11 @@ #import "ApplicationDelegate.h" +#import +#import + #import "AuthProviders.h" -#import "FirebaseCore/FIRApp.h" #import "FirebaseAuth.h" -#import "FirebaseCore/FIRLogger.h" #import "GTMSessionFetcherLogging.h" #import "MainViewController.h" diff --git a/Example/Auth/Sample/MainViewController.m b/Example/Auth/Sample/MainViewController.m index 5831d34a1ed..5d7c0687f58 100644 --- a/Example/Auth/Sample/MainViewController.m +++ b/Example/Auth/Sample/MainViewController.m @@ -18,12 +18,13 @@ #import +#import +#import +#import + #import "AppManager.h" #import "AuthCredentials.h" #import "FIRAdditionalUserInfo.h" -#import "FirebaseCore/FIRApp.h" -#import "FirebaseCore/FIRAppInternal.h" -#import "FirebaseCore/FIRAppAssociationRegistration.h" #import "FIROAuthProvider.h" #import "FIRPhoneAuthCredential.h" #import "FIRPhoneAuthProvider.h" diff --git a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h index 6fae24c093d..fa0a20fee39 100644 --- a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h +++ b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/FIRAppInternal.h" +#import /** @category FIRApp (FIRAuthUnitTests) @brief Tests for @c FIRAuth. diff --git a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m index c0767a8e221..5aa0c8012c9 100644 --- a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m +++ b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m @@ -16,7 +16,7 @@ #import "FIRApp+FIRAuthUnitTests.h" -#import "FirebaseCore/FIROptionsInternal.h" +#import @implementation FIRApp (FIRAuthUnitTests) diff --git a/Example/Auth/Tests/FIRAuthTests.m b/Example/Auth/Tests/FIRAuthTests.m index 35c83624b28..8d44d72b7af 100644 --- a/Example/Auth/Tests/FIRAuthTests.m +++ b/Example/Auth/Tests/FIRAuthTests.m @@ -18,10 +18,12 @@ #import -#import "FirebaseCore/FIRAppInternal.h" -#import "FirebaseAuth/FIREmailAuthProvider.h" -#import "FirebaseAuth/FIRGoogleAuthProvider.h" -#import "FirebaseAuth/FIRAdditionalUserInfo.h" +#import + +#import +#import +#import + #import "FIRAuth_Internal.h" #import "FIRAuthOperationType.h" #import "FIRAuthErrorUtils.h" diff --git a/Example/Auth/Tests/FIRUserTests.m b/Example/Auth/Tests/FIRUserTests.m index f8f975fdd48..c044e83fefc 100644 --- a/Example/Auth/Tests/FIRUserTests.m +++ b/Example/Auth/Tests/FIRUserTests.m @@ -18,11 +18,12 @@ #import -#import "FirebaseAuth/FIRUser.h" -#import "FirebaseAuth/FIREmailAuthProvider.h" -#import "FirebaseAuth/FIRFacebookAuthProvider.h" -#import "FirebaseAuth/FIRGoogleAuthProvider.h" -#import "FirebaseAuth/FIRAdditionalUserInfo.h" +#import +#import +#import +#import +#import + #import "FIRAuth_Internal.h" #import "FIRAuthErrorUtils.h" #import "FIRAuthBackend.h" diff --git a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m index f037aec42b3..2bc1de7f3c4 100644 --- a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m +++ b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/FIRAppAssociationRegistration.h" +#import /** @var kKey @brief A unique string key. diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m index fb777465c56..9b3554dbe2b 100644 --- a/Example/Core/Tests/FIRAppTest.m +++ b/Example/Core/Tests/FIRAppTest.m @@ -14,8 +14,8 @@ #import "FIRTestCase.h" -#import "FirebaseCore/FIRAppInternal.h" -#import "FirebaseCore/FIROptionsInternal.h" +#import +#import NSString *const kFIRTestAppName1 = @"test_app_name_1"; NSString *const kFIRTestAppName2 = @"test-app-name-2"; diff --git a/Example/Core/Tests/FIRBundleUtilTest.m b/Example/Core/Tests/FIRBundleUtilTest.m index ed89ae0ecbd..1204a8945fc 100644 --- a/Example/Core/Tests/FIRBundleUtilTest.m +++ b/Example/Core/Tests/FIRBundleUtilTest.m @@ -14,7 +14,7 @@ #import "FIRTestCase.h" -#import "FirebaseCore/FIRBundleUtil.h" +#import static NSString *const kResultPath = @"resultPath"; static NSString *const kResourceName = @"resourceName"; diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m index 5bf2467e873..77405272569 100644 --- a/Example/Core/Tests/FIRLoggerTest.m +++ b/Example/Core/Tests/FIRLoggerTest.m @@ -14,7 +14,7 @@ #import "FIRTestCase.h" -#import "FirebaseCore/FIRLogger.h" +#import #import diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m index e0bd8580cb4..d01eec52cb0 100644 --- a/Example/Core/Tests/FIROptionsTest.m +++ b/Example/Core/Tests/FIROptionsTest.m @@ -14,9 +14,9 @@ #import "FIRTestCase.h" -#import "FirebaseCore/FIRAppInternal.h" -#import "FirebaseCore/FIRBundleUtil.h" -#import "FirebaseCore/FIROptionsInternal.h" +#import +#import +#import extern NSString *const kFIRIsMeasurementEnabled; extern NSString *const kFIRIsAnalyticsCollectionEnabled; diff --git a/Example/Database/Tests/Helpers/FDevice.m b/Example/Database/Tests/Helpers/FDevice.m index bcf6dce2b72..f67502a5fde 100644 --- a/Example/Database/Tests/Helpers/FDevice.m +++ b/Example/Database/Tests/Helpers/FDevice.m @@ -17,7 +17,7 @@ #import #import "FDevice.h" -#import "FirebaseDatabase/FIRDatabaseReference.h" +#import #import "FRepoManager.h" #import "FIRDatabaseReference_Private.h" diff --git a/Example/Database/Tests/Helpers/FEventTester.m b/Example/Database/Tests/Helpers/FEventTester.m index 48b69e4d677..76ce205782a 100644 --- a/Example/Database/Tests/Helpers/FEventTester.m +++ b/Example/Database/Tests/Helpers/FEventTester.m @@ -16,7 +16,7 @@ #import "FEventTester.h" -#import "FirebaseDatabase/FIRDatabaseReference.h" +#import #import "FTupleBoolBlock.h" #import "FTupleEventTypeString.h" diff --git a/Example/Database/Tests/Helpers/FTestBase.m b/Example/Database/Tests/Helpers/FTestBase.m index 7accfdc9ff3..60df365b49b 100644 --- a/Example/Database/Tests/Helpers/FTestBase.m +++ b/Example/Database/Tests/Helpers/FTestBase.m @@ -14,8 +14,8 @@ * limitations under the License. */ -#import "FirebaseCore/FIRApp.h" -#import "FirebaseCore/FIROptions.h" +#import +#import #import "FTestBase.h" #import "FTestAuthTokenGenerator.h" diff --git a/Example/Database/Tests/Integration/FConnectionTest.m b/Example/Database/Tests/Integration/FConnectionTest.m index 49b262b8ab2..5b86c020ee8 100644 --- a/Example/Database/Tests/Integration/FConnectionTest.m +++ b/Example/Database/Tests/Integration/FConnectionTest.m @@ -16,8 +16,9 @@ #import -#import "FirebaseCore/FIRApp.h" -#import "FirebaseCore/FIROptions.h" +#import +#import + #import "FTestHelpers.h" #import "FConnection.h" #import "FTestBase.h" diff --git a/Example/Database/Tests/Integration/FIRAuthTests.m b/Example/Database/Tests/Integration/FIRAuthTests.m index a2b58c1d429..e520c84a20d 100644 --- a/Example/Database/Tests/Integration/FIRAuthTests.m +++ b/Example/Database/Tests/Integration/FIRAuthTests.m @@ -15,7 +15,9 @@ */ #import -#import "FirebaseCore/FIRApp.h" + +#import + #import "FTestHelpers.h" #import "FTestAuthTokenGenerator.h" #import "FIRTestAuthTokenProvider.h" diff --git a/Example/Database/Tests/Integration/FIRDatabaseTests.m b/Example/Database/Tests/Integration/FIRDatabaseTests.m index 27bf9d470a8..8dcc773b6a0 100644 --- a/Example/Database/Tests/Integration/FIRDatabaseTests.m +++ b/Example/Database/Tests/Integration/FIRDatabaseTests.m @@ -15,7 +15,9 @@ */ #import -#import "FirebaseCore/FIRApp.h" + +#import + #import "FIRDatabaseReference.h" #import "FIRDatabaseReference_Private.h" #import "FIRDatabase.h" diff --git a/Example/Database/Tests/Unit/FSyncPointTests.m b/Example/Database/Tests/Unit/FSyncPointTests.m index 04c8ccb5f31..797a5aa5494 100644 --- a/Example/Database/Tests/Unit/FSyncPointTests.m +++ b/Example/Database/Tests/Unit/FSyncPointTests.m @@ -16,7 +16,8 @@ #import -#import "FirebaseCore/FIRLogger.h" +#import + #import "FSyncPointTests.h" #import "FListenProvider.h" #import "FQuerySpec.h" diff --git a/Example/Messaging/Tests/FIRMessagingClientTest.m b/Example/Messaging/Tests/FIRMessagingClientTest.m index fcde55e0860..5505b70ee40 100644 --- a/Example/Messaging/Tests/FIRMessagingClientTest.m +++ b/Example/Messaging/Tests/FIRMessagingClientTest.m @@ -31,7 +31,7 @@ #import "FIRMessagingUtilities.h" #import "NSError+FIRMessaging.h" -#import "FirebaseCore/FIRReachabilityChecker.h" +#import static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite"; diff --git a/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m b/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m index 917d9bcb752..f2be912c639 100644 --- a/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m +++ b/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import +#import #import #import diff --git a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m index 60b32190886..415d25747d7 100644 --- a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m +++ b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m @@ -14,7 +14,7 @@ #import "FIRStorageTestHelpers.h" -#import "FirebaseCore/FIRAppInternal.h" +#import @interface FIRStorageTokenAuthorizerTests : XCTestCase