Skip to content

Use brackets for module imports #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 22, 2017
Merged

Use brackets for module imports #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3326daa
Use brackets for FirebaseCore module imports
paulb777 Nov 22, 2017
7f949fd
header groups
paulb777 Nov 22, 2017
201230e
database and auth module references
paulb777 Nov 22, 2017
b9895c1
Fix storage integration test build
paulb777 Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Example/Auth/Sample/ApplicationDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 4 additions & 3 deletions Example/Auth/Sample/MainViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FirebaseCore/FIRAppInternal.h"
#import <FirebaseCore/FIRAppInternal.h>

/** @category FIRApp (FIRAuthUnitTests)
@brief Tests for @c FIRAuth.
Expand Down
2 changes: 1 addition & 1 deletion Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import "FIRApp+FIRAuthUnitTests.h"

#import "FirebaseCore/FIROptionsInternal.h"
#import <FirebaseCore/FIROptionsInternal.h>

@implementation FIRApp (FIRAuthUnitTests)

Expand Down
10 changes: 6 additions & 4 deletions Example/Auth/Tests/FIRAuthTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 6 additions & 5 deletions Example/Auth/Tests/FIRUserTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRAppAssociationRegistration.h"
#import <FirebaseCore/FIRAppAssociationRegistration.h>

/** @var kKey
@brief A unique string key.
Expand Down
4 changes: 2 additions & 2 deletions Example/Core/Tests/FIRAppTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion Example/Core/Tests/FIRBundleUtilTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion Example/Core/Tests/FIRLoggerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#import "FIRTestCase.h"

#import "FirebaseCore/FIRLogger.h"
#import <FirebaseCore/FIRLogger.h>

#import <asl.h>

Expand Down
6 changes: 3 additions & 3 deletions Example/Core/Tests/FIROptionsTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Example/Database/Tests/Helpers/FDevice.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Example/Database/Tests/Helpers/FEventTester.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import "FEventTester.h"

#import "FirebaseDatabase/FIRDatabaseReference.h"
#import <FirebaseDatabase/FIRDatabaseReference.h>

#import "FTupleBoolBlock.h"
#import "FTupleEventTypeString.h"
Expand Down
4 changes: 2 additions & 2 deletions Example/Database/Tests/Helpers/FTestBase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions Example/Database/Tests/Integration/FConnectionTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion Example/Database/Tests/Integration/FIRAuthTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion Example/Database/Tests/Integration/FIRDatabaseTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion Example/Database/Tests/Unit/FSyncPointTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Example/Messaging/Tests/FIRMessagingClientTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#import "FIRMessagingUtilities.h"
#import "NSError+FIRMessaging.h"

#import "FirebaseCore/FIRReachabilityChecker.h"
#import <FirebaseCore/FIRReachabilityChecker.h>

static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite";

Expand Down
2 changes: 1 addition & 1 deletion Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#import "FIRStorageTestHelpers.h"

#import "FirebaseCore/FIRAppInternal.h"
#import <FirebaseCore/FIRAppInternal.h>

@interface FIRStorageTokenAuthorizerTests : XCTestCase

Expand Down