Use brackets for module imports (#487)

21 files changed, 47 insertions, 36 deletions

diff --git a/Example/Auth/Sample/ApplicationDelegate.m b/Example/Auth/Sample/ApplicationDelegate.m
index aaa7415..1023a19 100644
--- a/Example/Auth/Sample/ApplicationDelegate.m
+++ b/Example/Auth/Sample/ApplicationDelegate.m
@@ -16,10 +16,11 @@
 
 #import "ApplicationDelegate.h"
 
+#import <FirebaseCore/FIRApp.h>
+#import <FirebaseCore/FIRLogger.h>
+
 #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 42f0a8e..6980ec6 100644
--- a/Example/Auth/Sample/MainViewController.m
+++ b/Example/Auth/Sample/MainViewController.m
@@ -18,12 +18,13 @@
 
 #import <objc/runtime.h>
 
+#import <FirebaseCore/FIRApp.h>
+#import <FirebaseCore/FIRAppInternal.h>
+#import <FirebaseCore/FIRAppAssociationRegistration.h>
+
 #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 6fae24c..fa0a20f 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 <FirebaseCore/FIRAppInternal.h>
 
 /** @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 c0767a8..5aa0c80 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 <FirebaseCore/FIROptionsInternal.h>
 
 @implementation FIRApp (FIRAuthUnitTests)
 
diff --git a/Example/Auth/Tests/FIRAuthTests.m b/Example/Auth/Tests/FIRAuthTests.m
index 770f2c7..00a7c7a 100644
--- a/Example/Auth/Tests/FIRAuthTests.m
+++ b/Example/Auth/Tests/FIRAuthTests.m
@@ -18,10 +18,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FirebaseCore/FIRAppInternal.h"
-#import "FirebaseAuth/FIREmailAuthProvider.h"
-#import "FirebaseAuth/FIRGoogleAuthProvider.h"
-#import "FirebaseAuth/FIRAdditionalUserInfo.h"
+#import <FirebaseCore/FIRAppInternal.h>
+
+#import <FirebaseAuth/FIREmailAuthProvider.h>
+#import <FirebaseAuth/FIRGoogleAuthProvider.h>
+#import <FirebaseAuth/FIRAdditionalUserInfo.h>
+
 #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 f8f975f..c044e83 100644
--- a/Example/Auth/Tests/FIRUserTests.m
+++ b/Example/Auth/Tests/FIRUserTests.m
@@ -18,11 +18,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FirebaseAuth/FIRUser.h"
-#import "FirebaseAuth/FIREmailAuthProvider.h"
-#import "FirebaseAuth/FIRFacebookAuthProvider.h"
-#import "FirebaseAuth/FIRGoogleAuthProvider.h"
-#import "FirebaseAuth/FIRAdditionalUserInfo.h"
+#import <FirebaseAuth/FIRUser.h>
+#import <FirebaseAuth/FIREmailAuthProvider.h>
+#import <FirebaseAuth/FIRFacebookAuthProvider.h>
+#import <FirebaseAuth/FIRGoogleAuthProvider.h>
+#import <FirebaseAuth/FIRAdditionalUserInfo.h>
+
 #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 f037aec..2bc1de7 100644
--- a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
+++ b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
@@ -14,7 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FirebaseCore/FIRAppAssociationRegistration.h"
+#import <FirebaseCore/FIRAppAssociationRegistration.h>
 
 /** @var kKey
     @brief A unique string key.
diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m
index fb77746..9b3554d 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 <FirebaseCore/FIRAppInternal.h>
+#import <FirebaseCore/FIROptionsInternal.h>
 
 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 ed89ae0..1204a89 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 <FirebaseCore/FIRBundleUtil.h>
 
 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 5bf2467..7740527 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 <FirebaseCore/FIRLogger.h>
 
 #import <asl.h>
 
diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m
index e0bd858..d01eec5 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 <FirebaseCore/FIRAppInternal.h>
+#import <FirebaseCore/FIRBundleUtil.h>
+#import <FirebaseCore/FIROptionsInternal.h>
 
 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 bcf6dce..f67502a 100644
--- a/Example/Database/Tests/Helpers/FDevice.m
+++ b/Example/Database/Tests/Helpers/FDevice.m
@@ -17,7 +17,7 @@
 #import <XCTest/XCTest.h>
 #import "FDevice.h"
 
-#import "FirebaseDatabase/FIRDatabaseReference.h"
+#import <FirebaseDatabase/FIRDatabaseReference.h>
 
 #import "FRepoManager.h"
 #import "FIRDatabaseReference_Private.h"
diff --git a/Example/Database/Tests/Helpers/FEventTester.m b/Example/Database/Tests/Helpers/FEventTester.m
index 48b69e4..76ce205 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 <FirebaseDatabase/FIRDatabaseReference.h>
 
 #import "FTupleBoolBlock.h"
 #import "FTupleEventTypeString.h"
diff --git a/Example/Database/Tests/Helpers/FTestBase.m b/Example/Database/Tests/Helpers/FTestBase.m
index 7accfdc..60df365 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 <FirebaseCore/FIRApp.h>
+#import <FirebaseCore/FIROptions.h>
 
 #import "FTestBase.h"
 #import "FTestAuthTokenGenerator.h"
diff --git a/Example/Database/Tests/Integration/FConnectionTest.m b/Example/Database/Tests/Integration/FConnectionTest.m
index 49b262b..5b86c02 100644
--- a/Example/Database/Tests/Integration/FConnectionTest.m
+++ b/Example/Database/Tests/Integration/FConnectionTest.m
@@ -16,8 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseCore/FIRApp.h"
-#import "FirebaseCore/FIROptions.h"
+#import <FirebaseCore/FIRApp.h>
+#import <FirebaseCore/FIROptions.h>
+
 #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 a2b58c1..e520c84 100644
--- a/Example/Database/Tests/Integration/FIRAuthTests.m
+++ b/Example/Database/Tests/Integration/FIRAuthTests.m
@@ -15,7 +15,9 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "FirebaseCore/FIRApp.h"
+
+#import <FirebaseCore/FIRApp.h>
+
 #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 27bf9d4..8dcc773 100644
--- a/Example/Database/Tests/Integration/FIRDatabaseTests.m
+++ b/Example/Database/Tests/Integration/FIRDatabaseTests.m
@@ -15,7 +15,9 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "FirebaseCore/FIRApp.h"
+
+#import <FirebaseCore/FIRApp.h>
+
 #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 04c8ccb..797a5aa 100644
--- a/Example/Database/Tests/Unit/FSyncPointTests.m
+++ b/Example/Database/Tests/Unit/FSyncPointTests.m
@@ -16,7 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseCore/FIRLogger.h"
+#import <FirebaseCore/FIRLogger.h>
+
 #import "FSyncPointTests.h"
 #import "FListenProvider.h"
 #import "FQuerySpec.h"
diff --git a/Example/Messaging/Tests/FIRMessagingClientTest.m b/Example/Messaging/Tests/FIRMessagingClientTest.m
index fcde55e..5505b70 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 <FirebaseCore/FIRReachabilityChecker.h>
 
 static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite";
 
diff --git a/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m b/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m
index 917d9bc..f2be912 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 <FirebaseCommunity/FIRStorageMetadata.h>
+#import <FirebaseStorage/FIRStorageMetadata.h>
 #import <XCTest/XCTest.h>
 #import <math.h>
 
diff --git a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m
index 60b3219..415d257 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 <FirebaseCore/FIRAppInternal.h>
 
 @interface FIRStorageTokenAuthorizerTests : XCTestCase