Skip to content

Commit

Permalink
Merge 2b3630c into a51b4d0
Browse files Browse the repository at this point in the history
  • Loading branch information
ncooke3 authored Nov 7, 2023
2 parents a51b4d0 + 2b3630c commit 6930ece
Show file tree
Hide file tree
Showing 56 changed files with 175 additions and 174 deletions.
2 changes: 1 addition & 1 deletion Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h
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
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
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
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
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
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
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"
#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRStackFrame.h"

#import "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
Expand Down
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>
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>
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
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
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
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
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
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
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>
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 6930ece

Please sign in to comment.