Updated to SwiftFormat 0.52.10 (#12125)

Author: paulb777

ClientApp/Shared-iOS11+/swift-import-test.swift

@@ -49,8 +49,8 @@ import FirebaseInstallations
 import FirebaseMessaging
 import FirebaseMLModelDownloader
 #if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS)
-  import FirebasePerformance
   import FirebaseInAppMessaging
+  import FirebasePerformance
 #endif
 import FirebaseRemoteConfig
 import FirebaseRemoteConfigSwift

CoreOnly/Tests/FirebasePodTest/FirebasePodTest/AppDelegate.swift

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import Firebase
 // Verify that the following Firebase Swift APIs can be found.
 import FirebaseAnalyticsSwift
 import FirebaseFirestoreSwift
 import FirebaseInAppMessagingSwift
+import UIKit
 
 class CoreExists: FirebaseApp {}
 class AnalyticsExists: Analytics {}

Example/CombineSample/CombineSample/App/CombineSampleApp.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import Firebase
+import SwiftUI
 
 @main
 struct CombineSampleApp: App {

Example/CombineSample/CombineSample/ViewModels/Authentication/AnonymousSignInViewModel.swift

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
+import Combine
 import Firebase
 import FirebaseAuthCombineSwift
 import FirebaseFirestoreCombineSwift
 import FirebaseFunctionsCombineSwift
 import FirebaseStorageCombineSwift
-import Combine
+import Foundation
 
 class AnonymousSignInViewModel: UserInfoViewModel {
   private var cancellables = Set<AnyCancellable>()

Example/CombineSample/CombineSample/ViewModels/Authentication/UserInfoViewModel.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Combine
 import Firebase
 import FirebaseAuth
 import FirebaseAuthCombineSwift
-import Combine
 
 class UserInfoViewModel: ObservableObject {
   @Published var user: User?

Example/CombineSample/CombineSample/Views/Authentication/AnonymousSignInView.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
+import Combine
 import Firebase
 import FirebaseAuthCombineSwift
-import Combine
+import SwiftUI
 
 struct AnonymousSignInView: View {
   @StateObject var viewModel = AnonymousSignInViewModel()

Example/FirestoreSample/FirestoreSample/App/FirestoreSampleApp.swift

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
+import FirebaseAuth
 import FirebaseCore
 import FirebaseFirestore
-import FirebaseAuth
+import SwiftUI
 
 class AppDelegate: NSObject, UIApplicationDelegate {
   func application(_ application: UIApplication,

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsAnimationView.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import FirebaseFirestore
 import FirebaseFirestoreSwift
+import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {
   @DocumentID var id: String?

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsMappingErrorView.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import FirebaseFirestoreSwift
+import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {
   @DocumentID var id: String?

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsMappingErrorView2.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import FirebaseFirestoreSwift
+import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {
   @DocumentID var id: String?

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsNoAnimationsView.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import FirebaseFirestore
 import FirebaseFirestoreSwift
+import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {
   @DocumentID var id: String?

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsView.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import FirebaseFirestore
 import FirebaseFirestoreSwift
+import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {
   @DocumentID var id: String?

Example/tvOSSample/tvOSSample/AppDelegate.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseCore
+import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

Example/tvOSSample/tvOSSample/AuthLoginViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 class AuthLoginViewController: UIViewController {
   override func viewDidLoad() {

Example/tvOSSample/tvOSSample/AuthViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 class AuthViewController: UIViewController {
   // MARK: - User Interface

Example/tvOSSample/tvOSSample/DatabaseViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseDatabase
+import UIKit
 
 /// A class to demonstrate the Firebase Realtime Database API. This will show a number read
 /// from the Database and increase or decrease it based on the buttons pressed.

Example/tvOSSample/tvOSSample/EmailLoginViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseAuth
+import UIKit
 
 protocol EmailLoginDelegate {
   func emailLogin(_ controller: EmailLoginViewController, signedInAs user: User)

Example/tvOSSample/tvOSSample/StorageViewController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import FirebaseStorage
+import UIKit
 
 class StorageViewController: UIViewController {
   /// An enum describing the different states of the view controller.

Example/watchOSSample/SampleWatchAppWatchKitExtension/InterfaceController.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import SwiftUI
 import FirebaseStorage
+import SwiftUI
 
 class InterfaceController: WKInterfaceController {
   @IBOutlet var imageView: WKInterfaceImage!

Example/watchOSSample/SampleWatchAppWatchKitExtension/NotificationController.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import WatchKit
 import Foundation
 import UserNotifications
+import WatchKit
 
 class NotificationController: WKUserNotificationInterfaceController {
   override init() {

Example/watchOSSample/ServiceExtension/NotificationService.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UserNotifications
 import FirebaseMessaging
+import UserNotifications
 
 class NotificationService: UNNotificationServiceExtension {
   var contentHandler: ((UNNotificationContent) -> Void)?

FirebaseABTesting/Tests/Integration/ABTQA/AppDelegate.swift

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import UIKit
 import Firebase
+import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

FirebaseABTesting/Tests/Integration/ABTQA/ViewController.swift

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import UIKit
 import FirebaseAnalytics
 import FirebaseRemoteConfig
+import UIKit
 
 class ViewController: UIViewController {
   @IBAction func fireAnalyticsEventButtonTapped(_ sender: Any) {

FirebaseAnalytics/Analytics+SwiftUI.swift

@@ -19,7 +19,7 @@
   /// Custom view modifier to allow for easily logging screen view events.
   @available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, *)
   @available(watchOS, unavailable)
-  internal struct LoggedAnalyticsModifier: ViewModifier {
+  struct LoggedAnalyticsModifier: ViewModifier {
     /// The name of the view to log in the `AnalyticsParameterScreenName` parameter.
     let screenName: String
 

FirebaseAnalyticsSwift/Tests/SwiftUnit/AnalyticsAPITests.swift

@@ -20,9 +20,9 @@ import Foundation
 import StoreKit
 import SwiftUI
 
+import FirebaseAnalytics
 import FirebaseAnalyticsSwift
 import SwiftUI
-import FirebaseAnalytics
 
 final class AnalyticsAPITests {
   func usage() {

FirebaseAppCheck/Apps/AppCheckCustomProvideApp/AppCheckCustomProvideApp/AppDelegate.swift

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import UIKit
-import FirebaseCore
 import FirebaseAppCheck
+import FirebaseCore
+import UIKit
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {

FirebaseAppCheck/Apps/AppCheckCustomProvideApp/AppCheckCustomProvideApp/MyAppCheckProvider.swift

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import Foundation
-import FirebaseCore
 import FirebaseAppCheck
+import FirebaseCore
+import Foundation
 
 class MyAppCheckProvider: NSObject, AppCheckProvider {
   func getToken(completion handler: @escaping AppCheckTokenHandler) {

FirebaseAppCheck/Apps/AppCheckCustomProvideApp/AppCheckCustomProvideApp/SceneDelegate.swift

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import UIKit
 import SwiftUI
+import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
   var window: UIWindow?

FirebaseAppCheck/Apps/FIRAppCheckTestApp/FIRAppCheckTestApp/AppDelegate.swift

@@ -16,8 +16,8 @@
 
 import UIKit
 
-import FirebaseCore
 import FirebaseAppCheck
+import FirebaseCore
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {

FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift

@@ -18,8 +18,8 @@
 
 import Foundation
 
-import FirebaseCore
 import FirebaseAppCheck
+import FirebaseCore
 
 final class AppCheckAPITests {
   func usage() {

FirebaseAppDistribution/Tests/Unit/Swift/AppDistributionAPITest.swift

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import XCTest
 @testable import FirebaseAppDistribution
+import XCTest
 
 class AppDistributionAPITests: XCTestCase {
   @available(iOS 13.0.0, *)

FirebaseAppDistributionInternal/Sources/ApiService.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
-import FirebaseInstallations
 import FirebaseCore
+import FirebaseInstallations
+import Foundation
 import UIKit
 
 // Avoids exposing internal APIs to Swift users

FirebaseAppDistributionInternal/Sources/InAppFeedback.swift

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import Foundation
-import UIKit
 import Photos
+import UIKit
 
 @objc(FIRFADInAppFeedback) open class InAppFeedback: NSObject {
   @objc(

FirebaseAppDistributionInternal/Sources/Internal/InstallationsProtocol.swift

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import FirebaseInstallations
+import Foundation
 
 // Wraps around the use of FIRInstallations in a protocol to be able to inject a fake one for
 // unit testing.
-internal protocol InstallationsProtocol {
+protocol InstallationsProtocol {
   func authToken(completion: @escaping (InstallationsAuthTokenResult?, Error?) -> Void)
   func installationID(completion: @escaping (String?, Error?) -> Void)
 }

FirebaseAppDistributionInternal/Tests/Unit/ApiServiceTests.swift

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import XCTest
 import FirebaseCore
+import XCTest
 
-@testable import FirebaseInstallations
 @testable import FirebaseAppDistributionInternal
+@testable import FirebaseInstallations
 
 class ApiServiceTests: XCTestCase {
   override class func setUp() {

FirebaseAppDistributionInternal/Tests/Unit/FakeUtils/FakeInstallations.swift

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
-@testable import FirebaseInstallations
 @testable import FirebaseAppDistributionInternal
+@testable import FirebaseInstallations
+import Foundation
 
 // This is needed because importing the setter from FIRInstallationsAuthTokenResultInternal.h in
 // the bridging error results in errors.