diff options
author | Paul Beusterien <paulbeusterien@google.com> | 2017-12-04 08:52:11 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-04 08:52:11 -0800 |
commit | ed3e4982f9f0194851509603e5e649e5152ba897 (patch) | |
tree | 54ebe2c13463ed0c45d3fc55f654ee6c41cf8589 /Firebase | |
parent | 9c08142051f522c6214337470b870919c30a6192 (diff) |
Standardize cross module imports with angle bracket syntax (#526)
Qualify all cross-pod imports of FirebaseCore headers
Diffstat (limited to 'Firebase')
27 files changed, 37 insertions, 35 deletions
diff --git a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m b/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m index 2c917fe..4a0120b 100644 --- a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m +++ b/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m @@ -18,9 +18,9 @@ #import <GoogleToolboxForMac/GTMNSDictionary+URLArguments.h> -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FIRPhoneAuthCredential_Internal.h" -#import "FIRApp.h" +#import <FirebaseCore/FIRApp.h> #import "FIRAuthAPNSToken.h" #import "FIRAuthAPNSTokenManager.h" #import "FIRAuthAppCredential.h" @@ -32,7 +32,7 @@ #import "FIRAuthErrorUtils.h" #import "FIRAuthBackend.h" #import "FirebaseAuthVersion.h" -#import "FIROptions.h" +#import <FirebaseCore/FIROptions.h> #import "FIRGetProjectConfigRequest.h" #import "FIRGetProjectConfigResponse.h" #import "FIRSendVerificationCodeRequest.h" diff --git a/Firebase/Auth/Source/FIRAuth.m b/Firebase/Auth/Source/FIRAuth.m index 7300fdd..ad363e0 100644 --- a/Firebase/Auth/Source/FIRAuth.m +++ b/Firebase/Auth/Source/FIRAuth.m @@ -18,10 +18,11 @@ #import "FIRAuth_Internal.h" -#import "FIRAppAssociationRegistration.h" +#import <FirebaseCore/FIRAppAssociationRegistration.h> #import <FirebaseCore/FIRAppInternal.h> -#import "FIROptions.h" -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> +#import <FirebaseCore/FIROptions.h> + #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h" #import "FIRAdditionalUserInfo_Internal.h" #import "FIRAuthCredential_Internal.h" diff --git a/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m index a4e4389..7775305 100644 --- a/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m +++ b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m @@ -16,7 +16,7 @@ #import "FIRAuthAPNSTokenManager.h" -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FIRAuthAPNSToken.h" #import "FIRAuthGlobalWorkQueue.h" diff --git a/Firebase/Auth/Source/FIRAuthNotificationManager.m b/Firebase/Auth/Source/FIRAuthNotificationManager.m index 4536b5e..b1dd34c 100644 --- a/Firebase/Auth/Source/FIRAuthNotificationManager.m +++ b/Firebase/Auth/Source/FIRAuthNotificationManager.m @@ -16,7 +16,7 @@ #import "FIRAuthNotificationManager.h" -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FIRAuthAppCredential.h" #import "FIRAuthAppCredentialManager.h" #import "FIRAuthGlobalWorkQueue.h" diff --git a/Firebase/Auth/Source/FIRUser.m b/Firebase/Auth/Source/FIRUser.m index d0e7e36..7f2316b 100644 --- a/Firebase/Auth/Source/FIRUser.m +++ b/Firebase/Auth/Source/FIRUser.m @@ -37,7 +37,7 @@ #import "FIRGetAccountInfoResponse.h" #import "FIRGetOOBConfirmationCodeRequest.h" #import "FIRGetOOBConfirmationCodeResponse.h" -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FIRSecureTokenService.h" #import "FIRSetAccountInfoRequest.h" #import "FIRSetAccountInfoResponse.h" diff --git a/Firebase/Database/Api/FIRDatabase.m b/Firebase/Database/Api/FIRDatabase.m index 80190f7..b01d669 100644 --- a/Firebase/Database/Api/FIRDatabase.m +++ b/Firebase/Database/Api/FIRDatabase.m @@ -28,7 +28,7 @@ #import "FRepoInfo.h" #import "FIRDatabaseConfig.h" #import "FIRDatabaseReference_Private.h" -#import "FIROptions.h" +#import <FirebaseCore/FIROptions.h> @interface FIRDatabase () @property (nonatomic, strong) FRepoInfo *repoInfo; diff --git a/Firebase/Database/Api/FIRDatabaseConfig.m b/Firebase/Database/Api/FIRDatabaseConfig.m index f4639f9..3341c7e 100644 --- a/Firebase/Database/Api/FIRDatabaseConfig.m +++ b/Firebase/Database/Api/FIRDatabaseConfig.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRApp.h" +#import <FirebaseCore/FIRApp.h> #import "FIRDatabaseConfig.h" #import "FIRDatabaseConfig_Private.h" #import "FIRNoopAuthTokenProvider.h" diff --git a/Firebase/Database/Core/FPersistentConnection.m b/Firebase/Database/Core/FPersistentConnection.m index 643f9b4..6f71d8b 100644 --- a/Firebase/Database/Core/FPersistentConnection.m +++ b/Firebase/Database/Core/FPersistentConnection.m @@ -15,7 +15,7 @@ */ #import <Foundation/Foundation.h> -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import <SystemConfiguration/SystemConfiguration.h> #import <netinet/in.h> #import <dlfcn.h> diff --git a/Firebase/Database/Core/FRepo.m b/Firebase/Database/Core/FRepo.m index 8062933..0935b44 100644 --- a/Firebase/Database/Core/FRepo.m +++ b/Firebase/Database/Core/FRepo.m @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import <dlfcn.h> #import "FRepo.h" #import "FSnapshotUtilities.h" diff --git a/Firebase/Database/Core/FRepoManager.m b/Firebase/Database/Core/FRepoManager.m index c5194d5..31c3efc 100644 --- a/Firebase/Database/Core/FRepoManager.m +++ b/Firebase/Database/Core/FRepoManager.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FRepoManager.h" #import "FRepo.h" #import "FIRDatabaseQuery_Private.h" diff --git a/Firebase/Database/Core/FSyncTree.m b/Firebase/Database/Core/FSyncTree.m index 1bbc606..688a43b 100644 --- a/Firebase/Database/Core/FSyncTree.m +++ b/Firebase/Database/Core/FSyncTree.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FSyncTree.h" #import "FListenProvider.h" #import "FWriteTree.h" diff --git a/Firebase/Database/Core/Utilities/FIRRetryHelper.m b/Firebase/Database/Core/Utilities/FIRRetryHelper.m index bcd9060..fca02f5 100644 --- a/Firebase/Database/Core/Utilities/FIRRetryHelper.m +++ b/Firebase/Database/Core/Utilities/FIRRetryHelper.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FIRRetryHelper.h" #import "FUtilities.h" diff --git a/Firebase/Database/Core/View/FChildEventRegistration.m b/Firebase/Database/Core/View/FChildEventRegistration.m index 9d44ef5..a98ea47 100644 --- a/Firebase/Database/Core/View/FChildEventRegistration.m +++ b/Firebase/Database/Core/View/FChildEventRegistration.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FChildEventRegistration.h" #import "FIRDatabaseQuery_Private.h" #import "FQueryParams.h" diff --git a/Firebase/Database/Core/View/FValueEventRegistration.m b/Firebase/Database/Core/View/FValueEventRegistration.m index f6baa52..6a98629 100644 --- a/Firebase/Database/Core/View/FValueEventRegistration.m +++ b/Firebase/Database/Core/View/FValueEventRegistration.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FValueEventRegistration.h" #import "FIRDatabaseQuery_Private.h" #import "FQueryParams.h" diff --git a/Firebase/Database/FIRDatabaseReference.m b/Firebase/Database/FIRDatabaseReference.m index 4f27493..e99b6d9 100644 --- a/Firebase/Database/FIRDatabaseReference.m +++ b/Firebase/Database/FIRDatabaseReference.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FIRApp.h" +#import <FirebaseCore/FIRApp.h> #import "FIRDatabaseReference.h" -#import "FIROptions.h" +#import <FirebaseCore/FIROptions.h> #import "FUtilities.h" #import "FNextPushId.h" #import "FIRDatabaseQuery_Private.h" diff --git a/Firebase/Database/Persistence/FLevelDBStorageEngine.m b/Firebase/Database/Persistence/FLevelDBStorageEngine.m index 3a63319..490fb6c 100644 --- a/Firebase/Database/Persistence/FLevelDBStorageEngine.m +++ b/Firebase/Database/Persistence/FLevelDBStorageEngine.m @@ -18,7 +18,7 @@ #import "FLevelDBStorageEngine.h" -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "APLevelDB.h" #import "FSnapshotUtilities.h" #import "FWriteRecord.h" diff --git a/Firebase/Database/Persistence/FPersistenceManager.m b/Firebase/Database/Persistence/FPersistenceManager.m index 0ae75b3..b488f3e 100644 --- a/Firebase/Database/Persistence/FPersistenceManager.m +++ b/Firebase/Database/Persistence/FPersistenceManager.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FPersistenceManager.h" #import "FLevelDBStorageEngine.h" #import "FCacheNode.h" diff --git a/Firebase/Database/Persistence/FTrackedQueryManager.m b/Firebase/Database/Persistence/FTrackedQueryManager.m index 9673fb7..9176f25 100644 --- a/Firebase/Database/Persistence/FTrackedQueryManager.m +++ b/Firebase/Database/Persistence/FTrackedQueryManager.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FTrackedQueryManager.h" #import "FImmutableTree.h" #import "FLevelDBStorageEngine.h" diff --git a/Firebase/Database/Realtime/FConnection.m b/Firebase/Database/Realtime/FConnection.m index 50756e6..08014f6 100644 --- a/Firebase/Database/Realtime/FConnection.m +++ b/Firebase/Database/Realtime/FConnection.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FConnection.h" #import "FConstants.h" diff --git a/Firebase/Database/Realtime/FWebSocketConnection.m b/Firebase/Database/Realtime/FWebSocketConnection.m index fe90344..0fd07e5 100644 --- a/Firebase/Database/Realtime/FWebSocketConnection.m +++ b/Firebase/Database/Realtime/FWebSocketConnection.m @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FWebSocketConnection.h" #import "FConstants.h" #import "FIRDatabaseReference.h" diff --git a/Firebase/Database/Utilities/FUtilities.m b/Firebase/Database/Utilities/FUtilities.m index befe874..d0a9a43 100644 --- a/Firebase/Database/Utilities/FUtilities.m +++ b/Firebase/Database/Utilities/FUtilities.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> #import "FUtilities.h" #import "FStringUtilities.h" #import "FConstants.h" diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 64b1ef8..782b779 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -37,7 +37,7 @@ #import "FIRMessagingUtilities.h" #import "FIRMessagingVersionUtilities.h" -#import "FIRReachabilityChecker.h" +#import <FirebaseCore/FIRReachabilityChecker.h> #import "NSError+FIRMessaging.h" diff --git a/Firebase/Messaging/FIRMessagingClient.m b/Firebase/Messaging/FIRMessagingClient.m index 13e1775..51a62b7 100644 --- a/Firebase/Messaging/FIRMessagingClient.m +++ b/Firebase/Messaging/FIRMessagingClient.m @@ -16,6 +16,8 @@ #import "FIRMessagingClient.h" +#import <FirebaseCore/FIRReachabilityChecker.h> + #import "FIRMessagingConnection.h" #import "FIRMessagingConstants.h" #import "FIRMessagingDataMessageManager.h" @@ -25,7 +27,6 @@ #import "FIRMessagingRmqManager.h" #import "FIRMessagingTopicsCommon.h" #import "FIRMessagingUtilities.h" -#import "FIRReachabilityChecker.h" #import "NSError+FIRMessaging.h" static const NSTimeInterval kConnectTimeoutInterval = 40.0; diff --git a/Firebase/Messaging/FIRMessagingLogger.m b/Firebase/Messaging/FIRMessagingLogger.m index ee4e771..62eb8da 100644 --- a/Firebase/Messaging/FIRMessagingLogger.m +++ b/Firebase/Messaging/FIRMessagingLogger.m @@ -16,7 +16,7 @@ #import "FIRMessagingLogger.h" -#import "FIRLogger.h" +#import <FirebaseCore/FIRLogger.h> @implementation FIRMessagingLogger diff --git a/Firebase/Storage/FIRStorage.m b/Firebase/Storage/FIRStorage.m index 21657bc..c09a1df 100644 --- a/Firebase/Storage/FIRStorage.m +++ b/Firebase/Storage/FIRStorage.m @@ -22,8 +22,8 @@ #import "FIRStorageUtils.h" #import "FIRStorage_Private.h" -#import "FIRApp.h" -#import "FIROptions.h" +#import <FirebaseCore/FIRApp.h> +#import <FirebaseCore/FIROptions.h> #import <GTMSessionFetcher/GTMSessionFetcher.h> #import <GTMSessionFetcher/GTMSessionFetcherLogging.h> diff --git a/Firebase/Storage/FIRStorageReference.m b/Firebase/Storage/FIRStorageReference.m index 2a4e0c2..7bc1934 100644 --- a/Firebase/Storage/FIRStorageReference.m +++ b/Firebase/Storage/FIRStorageReference.m @@ -28,8 +28,8 @@ #import "FIRStorageUtils.h" #import "FIRStorage_Private.h" -#import "FIRApp.h" -#import "FIROptions.h" +#import <FirebaseCore/FIRApp.h> +#import <FirebaseCore/FIROptions.h> #import <GTMSessionFetcher/GTMSessionFetcher.h> #import "GTMSessionFetcherService.h" diff --git a/Firebase/Storage/FIRStorageTokenAuthorizer.m b/Firebase/Storage/FIRStorageTokenAuthorizer.m index 8ac53f0..14400af 100644 --- a/Firebase/Storage/FIRStorageTokenAuthorizer.m +++ b/Firebase/Storage/FIRStorageTokenAuthorizer.m @@ -22,8 +22,8 @@ #import "FirebaseStorage.h" -#import "FIRApp.h" -#import "FIROptions.h" +#import <FirebaseCore/FIRApp.h> +#import <FirebaseCore/FIROptions.h> @implementation FIRStorageTokenAuthorizer { @private |