Skip to content

Simplify FirebaseCore imports #6664

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 3 commits into from
Oct 5, 2020
Merged

Simplify FirebaseCore imports #6664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc327cb
Simplify FirebaseCore imports
paulb777 Oct 5, 2020
bdf3e4f
fix
paulb777 Oct 5, 2020
21723b6
Restore Gemfile after successful test run
paulb777 Oct 5, 2020
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
2 changes: 1 addition & 1 deletion FirebaseCore/Sources/FIRComponentContainerInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
#import <Foundation/Foundation.h>

#import "FirebaseCore/Sources/Private/FIRComponent.h"
#import "FirebaseCore/Sources/Private/FIRComponentContainer.h"
#import "FirebaseCore/Sources/Private/FIRLibrary.h"

@class FIRApp;

Expand Down
9 changes: 0 additions & 9 deletions FirebaseCore/Sources/Private/FIRComponentContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@
*/
#import <Foundation/Foundation.h>

// The has_include is a workaround so the old IID needed for the FIS tests can find the headers.
#if __has_include("FirebaseCore/Sources/Private/FIRComponentType.h")
#import "FirebaseCore/Sources/Private/FIRComponentType.h"
#import "FirebaseCore/Sources/Private/FIRLibrary.h"
#else
#import <FirebaseCore/FIRComponentType.h>
#import <FirebaseCore/FIRLibrary.h>
#endif

NS_ASSUME_NONNULL_BEGIN

/// A type-safe macro to retrieve a component from a container. This should be used to retrieve
Expand Down
8 changes: 1 addition & 7 deletions FirebaseCore/Sources/Private/FIRLibrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,8 @@

#import <Foundation/Foundation.h>

// The has_include is a workaround so the old IID needed for the FIS tests can find the headers.
#if __has_include("FirebaseCore/Sources/Private/FIRComponent.h")
#import "FirebaseCore/Sources/Private/FIRComponent.h"
#else
#import <FirebaseCore/FIRComponent.h>
#endif

@class FIRApp;
@class FIRComponent;

NS_ASSUME_NONNULL_BEGIN

Expand Down
1 change: 1 addition & 0 deletions FirebaseCore/Sources/Private/FirebaseCoreInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
#import "FirebaseCore/Sources/Private/FIRComponent.h"
#import "FirebaseCore/Sources/Private/FIRComponentContainer.h"
#import "FirebaseCore/Sources/Private/FIRComponentType.h"
#import "FirebaseCore/Sources/Private/FIRDependency.h"
#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h"
#import "FirebaseCore/Sources/Private/FIRLibrary.h"
Expand Down
1 change: 1 addition & 0 deletions FirebaseCore/Tests/Unit/FIRAppTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#import <GoogleUtilities/GULAppEnvironmentUtil.h>
#import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
#import "FirebaseCore/Sources/Private/FIRComponentType.h"
#import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h"
#import "FirebaseCore/Sources/Private/FIROptionsInternal.h"
#import "SharedTestUtilities/FIROptionsMock.h"
Expand Down
1 change: 1 addition & 0 deletions FirebaseCore/Tests/Unit/FIRComponentContainerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#import "FirebaseCore/Tests/Unit/FIRTestCase.h"

#import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
#import "FirebaseCore/Sources/Private/FIRComponentType.h"
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
#import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
#import "SharedTestUtilities/FIROptionsMock.h"
Expand Down
1 change: 1 addition & 0 deletions FirebaseCore/Tests/Unit/FIRTestComponents.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#import "FirebaseCore/Tests/Unit/FIRTestComponents.h"

#import "FirebaseCore/Sources/Private/FIRComponentType.h"
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"

#pragma mark - Standard Component
Expand Down