diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m index 0db878977dd..7c1b4f5cbe7 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m @@ -16,7 +16,7 @@ #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" -@import FirebaseAppCheckInterop; +#import #if __has_include() #import diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m index 9b1ee703bbd..b6c2c768649 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import #import "FirebaseAppCheck/Sources/Core/FIRAppCheck+Internal.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h b/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h index 061516e2be4..37b57b2adef 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h index 9cdc31344da..4005ee35b57 100644 --- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h +++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import @class FIRApp; @class FIRAppCheckToken; diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m index 2f43cb6f07c..6cb3f4accc9 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m @@ -18,7 +18,7 @@ #import -@import FirebaseAppCheckInterop; +#import #import "FirebaseAppCheck/Sources/Core/TokenRefresh/FIRAppCheckTokenRefresher.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m index 163a1222616..8ad5428d5c8 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m @@ -20,7 +20,7 @@ #import "FBLPromise+Testing.h" -@import FirebaseAppCheckInterop; +#import #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckErrors.h" diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index 0ae106c17d9..03c56b780de 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth.m +++ b/FirebaseAuth/Sources/Auth/FIRAuth.m @@ -22,7 +22,7 @@ #import #endif -@import FirebaseAppCheckInterop; +#import #import #import diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m index f82a7f6a3be..9cc364d33c0 100644 --- a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m +++ b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m @@ -16,7 +16,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h" -@import FirebaseAppCheckInterop; +#import #include #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFacebookAuthProvider.h" diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m index ce4c44ab8c3..d1faf91ffa8 100644 --- a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m +++ b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION) -@import FirebaseAppCheckInterop; +#import #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h" diff --git a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m index 82d0eca8fe9..ccf2c990f38 100644 --- a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m +++ b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m @@ -23,7 +23,7 @@ #import #endif -@import FirebaseAppCheckInterop; +#import #import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h" diff --git a/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h b/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h index 4783baf5f2f..3a5e4b84275 100644 --- a/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h +++ b/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import #import "FirebaseAuth/Sources/Backend/FIRAuthRPCRequest.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h" diff --git a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h index d31c82d5f73..317c6ba4216 100644 --- a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h +++ b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h @@ -15,7 +15,7 @@ */ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m index a1602d240c3..8633000475f 100644 --- a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m +++ b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m @@ -17,7 +17,7 @@ #import -@import FirebaseAppCheckInterop; +#import #pragma mark - FIRFakeAppCheckResult diff --git a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m index 4ea5a9249c4..6a65b8e91f3 100644 --- a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m +++ b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m @@ -23,7 +23,7 @@ #import "FirebaseAuth/Interop/FIRAuthInterop.h" #import "FirebaseCore/Extension/FirebaseCoreInternal.h" -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m b/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m index 09977746f4d..358a26d1e70 100644 --- a/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m +++ b/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m @@ -23,7 +23,7 @@ #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Utilities/FUtilities.h" -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h b/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h index a2e0437e1f2..100d9305818 100644 --- a/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h +++ b/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h b/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h index eed4169dac9..0fa4ea4c578 100644 --- a/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h +++ b/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN