Skip to content
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

[NFC] Use angle-bracketed includes in public headers #12057

Closed
wants to merge 3 commits into from
Closed

[NFC] Use angle-bracketed includes in public headers #12057

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
a491976
[NFC] Use angle-bracketed includes in public headers
ncooke3 Nov 6, 2023
f688974
Address Firestore issues
ncooke3 Nov 6, 2023
2b3630c
Fix Crashlytics headers
ncooke3 Nov 7, 2023
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 Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#import <Foundation/Foundation.h>

#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h"
#import <FirebaseCrashlytics/FIRCrashlytics.h>

#import "Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h"

Expand Down
2 changes: 1 addition & 1 deletion Crashlytics/Crashlytics/FIRExceptionModel.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 "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
#import <FirebaseCrashlytics/FIRExceptionModel.h>

@interface FIRExceptionModel ()

Expand Down
2 changes: 1 addition & 1 deletion Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#import <Foundation/Foundation.h>

#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
#import <FirebaseCrashlytics/FIRExceptionModel.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 2 additions & 2 deletions Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#import <Foundation/Foundation.h>

#import "FIRCrashlyticsReport.h"
#import "FIRExceptionModel.h"
#import <FirebaseCrashlytics/FIRCrashlyticsReport.h>
#import <FirebaseCrashlytics/FIRExceptionModel.h>

#if __has_include(<Crashlytics/Crashlytics.h>)
#warning "FirebaseCrashlytics and Crashlytics are not compatible \
Expand Down
2 changes: 1 addition & 1 deletion Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#import <Foundation/Foundation.h>

#import "FIRStackFrame.h"
#import <FirebaseCrashlytics/FIRStackFrame.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
8 changes: 4 additions & 4 deletions Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FirebaseCrashlytics.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 "FIRCrashlytics.h"
#import "FIRCrashlyticsReport.h"
#import "FIRExceptionModel.h"
#import "FIRStackFrame.h"
#import <FirebaseCrashlytics/FIRCrashlytics.h>
#import <FirebaseCrashlytics/FIRCrashlyticsReport.h>
#import <FirebaseCrashlytics/FIRExceptionModel.h>
#import <FirebaseCrashlytics/FIRStackFrame.h>
3 changes: 2 additions & 1 deletion Crashlytics/UnitTests/FIRRecordExceptionModelTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

#import <XCTest/XCTest.h>

#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
#import <FirebaseCrashlytics/FIRExceptionModel.h>
//#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
Comment on lines +17 to +18
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When changing the imports from "..." → <...> in the public headers, this surfaced an issue when building the target's test specs (causing most/all of the pod-lib-lint failures on CI).

I also had to change imports of the public headers to the bracket notation to avoid the redefinition errors:
Screenshot 2023-11-07 at 9 23 37 AM

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the issue has to do with the public headers not forward declaring public types where they could be. It would be a breaking change to change that right now though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paulb777, I'm not too sure about this. Do you see anything troubling about changing all non-public imports of public headers from "..." → <...>?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure. And leaning towards punting since it's a large change on code freeze day.

#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRStackFrame.h"

#import "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
Expand Down
4 changes: 2 additions & 2 deletions FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import "FIRExperimentController.h"
#import "FIRLifecycleEvents.h"
#import <FirebaseABTesting/FIRExperimentController.h>
#import <FirebaseABTesting/FIRLifecycleEvents.h>
6 changes: 3 additions & 3 deletions FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
* limitations under the License.
*/

#import "FIRAppCheckInterop.h"
#import "FIRAppCheckProtocol.h"
#import "FIRAppCheckTokenResultInterop.h"
#import <FirebaseAppCheckInterop/FIRAppCheckInterop.h>
#import <FirebaseAppCheckInterop/FIRAppCheckProtocol.h>
#import <FirebaseAppCheckInterop/FIRAppCheckTokenResultInterop.h>
4 changes: 2 additions & 2 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppAttestProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckProvider.h"
#import <FirebaseAppCheck/FIRAppCheckProvider.h>

#import "FIRAppCheckAvailability.h"
#import <FirebaseAppCheck/FIRAppCheckAvailability.h>

@class FIRApp;

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckProvider.h"
#import <FirebaseAppCheck/FIRAppCheckProvider.h>

@class FIRApp;
@protocol FIRAppCheckDebugProviderAPIServiceProtocol;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckProviderFactory.h"
#import <FirebaseAppCheck/FIRAppCheckProviderFactory.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProviderFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckProvider.h"
#import <FirebaseAppCheck/FIRAppCheckProvider.h>

@class FIRApp;

Expand Down
4 changes: 2 additions & 2 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckAvailability.h"
#import "FIRAppCheckProvider.h"
#import <FirebaseAppCheck/FIRAppCheckAvailability.h>
#import <FirebaseAppCheck/FIRAppCheckProvider.h>

@class FIRApp;
@protocol FIRDeviceCheckAPIServiceProtocol;
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckAvailability.h"
#import "FIRAppCheckProviderFactory.h"
#import <FirebaseAppCheck/FIRAppCheckAvailability.h>
#import <FirebaseAppCheck/FIRAppCheckProviderFactory.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
20 changes: 10 additions & 10 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FirebaseAppCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
* limitations under the License.
*/

#import "FIRAppCheck.h"
#import "FIRAppCheckErrors.h"
#import "FIRAppCheckProvider.h"
#import "FIRAppCheckProviderFactory.h"
#import "FIRAppCheckToken.h"
#import <FirebaseAppCheck/FIRAppCheck.h>
#import <FirebaseAppCheck/FIRAppCheckErrors.h>
#import <FirebaseAppCheck/FIRAppCheckProvider.h>
#import <FirebaseAppCheck/FIRAppCheckProviderFactory.h>
#import <FirebaseAppCheck/FIRAppCheckToken.h>

// Debug provider
#import "FIRAppCheckDebugProvider.h"
#import "FIRAppCheckDebugProviderFactory.h"
#import <FirebaseAppCheck/FIRAppCheckDebugProvider.h>
#import <FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h>

// DeviceCheck provider
#import "FIRDeviceCheckProvider.h"
#import "FIRDeviceCheckProviderFactory.h"
#import <FirebaseAppCheck/FIRDeviceCheckProvider.h>
#import <FirebaseAppCheck/FIRDeviceCheckProviderFactory.h>

// App Attest provider.
#import "FIRAppAttestProvider.h"
#import <FirebaseAppCheck/FIRAppAttestProvider.h>
4 changes: 2 additions & 2 deletions FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FirebaseAppDistribution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import "FIRAppDistribution.h"
#import "FIRAppDistributionRelease.h"
#import <FirebaseAppDistribution/FIRAppDistribution.h>
#import <FirebaseAppDistribution/FIRAppDistributionRelease.h>
4 changes: 2 additions & 2 deletions FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#import <AvailabilityMacros.h>
#import <Foundation/Foundation.h>

#import "FIRAuthAPNSTokenType.h"
#import "FIRAuthErrors.h"
#import <FirebaseAuth/FIRAuthAPNSTokenType.h>
#import <FirebaseAuth/FIRAuthErrors.h>

@class FIRActionCodeSettings;
@class FIRApp;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRAuthUIDelegate.h"
#import <FirebaseAuth/FIRAuthUIDelegate.h>

@class FIRAuthCredential;

Expand Down
8 changes: 4 additions & 4 deletions FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#import <Foundation/Foundation.h>

#import "FIRAuth.h"
#import "FIRMultiFactorAssertion.h"
#import "FIRMultiFactorInfo.h"
#import "FIRMultiFactorSession.h"
#import <FirebaseAuth/FIRAuth.h>
#import <FirebaseAuth/FIRMultiFactorAssertion.h>
#import <FirebaseAuth/FIRMultiFactorInfo.h>
#import <FirebaseAuth/FIRMultiFactorSession.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.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 "FIRMultiFactor.h"
#import <FirebaseAuth/FIRMultiFactor.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRAuthCredential.h"
#import <FirebaseAuth/FIRAuthCredential.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRFederatedAuthProvider.h"
#import <FirebaseAuth/FIRFederatedAuthProvider.h>

@class FIRAuth;
@class FIROAuthCredential;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthCredential.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRAuthCredential.h"
#import <FirebaseAuth/FIRAuthCredential.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorAssertion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRMultiFactorAssertion.h"
#import <FirebaseAuth/FIRMultiFactorAssertion.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 2 additions & 2 deletions FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#import <Foundation/Foundation.h>

#import "FIRPhoneAuthCredential.h"
#import "FIRPhoneMultiFactorAssertion.h"
#import <FirebaseAuth/FIRPhoneAuthCredential.h>
#import <FirebaseAuth/FIRPhoneMultiFactorAssertion.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRMultiFactorInfo.h"
#import <FirebaseAuth/FIRMultiFactorInfo.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorAssertion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRMultiFactorAssertion.h"
#import <FirebaseAuth/FIRMultiFactorAssertion.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
6 changes: 3 additions & 3 deletions FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

#import <FirebaseAuth/FIRMultiFactorSession.h>
#import <FirebaseAuth/FIRTOTPMultiFactorAssertion.h>
#import <FirebaseAuth/FIRTOTPSecret.h>
#import <Foundation/Foundation.h>
#import "FIRMultiFactorSession.h"
#import "FIRTOTPMultiFactorAssertion.h"
#import "FIRTOTPSecret.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPSecret.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FIRMultiFactorInfo.h"
#import <FirebaseAuth/FIRMultiFactorInfo.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
8 changes: 4 additions & 4 deletions FirebaseAuth/Sources/Public/FirebaseAuth/FIRUser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#import <Foundation/Foundation.h>

#import "FIRAuth.h"
#import "FIRAuthDataResult.h"
#import "FIRMultiFactor.h"
#import "FIRUserInfo.h"
#import <FirebaseAuth/FIRAuth.h>
#import <FirebaseAuth/FIRAuthDataResult.h>
#import <FirebaseAuth/FIRMultiFactor.h>
#import <FirebaseAuth/FIRUserInfo.h>

@class FIRAuthTokenResult;
@class FIRPhoneAuthCredential;
Expand Down
Loading
Loading