Fix Firestore, and format files

Author: a-maurice

auth/src/ios/auth_ios.mm

@@ -17,8 +17,9 @@
 #import <UIKit/UIKit.h>
 
 #import "FIRAuthErrors.h"
-#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIROptions.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
+// This needs to be after the FIRAuthInterop import
 #import "FirebaseAuth-Swift.h"
 
 #include "app/src/app_ios.h"

auth/src/ios/common_ios.h

@@ -21,8 +21,9 @@
 #import <UIKit/UIKit.h>
 
 #import "FIRAuth.h"
-#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIRUser.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
+// This needs to be after the FIRAuthInterop import
 #import "FirebaseAuth-Swift.h"
 
 #include "app/src/log.h"

auth/src/ios/credential_ios.mm

@@ -21,13 +21,14 @@
 #import <GameKit/GameKit.h>
 #import <UIKit/UIKit.h>
 
-#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIREmailAuthProvider.h"
 #import "FIRFacebookAuthProvider.h"
 #import "FIRFederatedAuthProvider.h"
 #import "FIRGameCenterAuthProvider.h"
 #import "FIRGitHubAuthProvider.h"
 #import "FIRGoogleAuthProvider.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
+// This needs to be after the FIRAuthInterop import
 #import "FirebaseAuth-Swift.h"
 
 #if FIREBASE_PLATFORM_IOS

firestore/src/main/create_app_check_credentials_provider_ios.mm

@@ -17,7 +17,7 @@
 #include "firestore/src/main/create_credentials_provider.h"
 
 #import "FIRAppInternal.h"
-#import "FIRAuthInterop.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIRComponent.h"
 #import "FIRComponentContainer.h"
 #import "FIRComponentType.h"

firestore/src/main/create_credentials_provider_ios.mm

@@ -19,7 +19,7 @@
 #include <memory>
 
 #import "FIRAppInternal.h"
-#import "FIRAuthInterop.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIRComponent.h"
 #import "FIRComponentContainer.h"
 #import "FIRComponentType.h"