Merge branch 'main' into ah/firebaseai-503-trait

# Conflicts:
#	FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift

Author: andrewheard

FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift

@@ -25,8 +25,8 @@ import VertexAITestApp
 
 @testable import struct FirebaseAI.BackendError
 
-@Suite(.serialized, .ignoreBackendOverloaded)
 /// Test the schema fields.
+@Suite(.serialized, .ignoreBackendOverloaded)
 struct SchemaTests {
   // Set temperature, topP and topK to lowest allowed values to make responses more deterministic.
   let generationConfig = GenerationConfig(temperature: 0.0, topP: 0.0, topK: 1)

FirebaseAuth/Sources/Swift/User/User.swift

@@ -1081,7 +1081,8 @@ extension User: NSSecureCoding {}
                           anonymous: Bool) async throws -> User {
     guard let accessToken = accessToken,
           let refreshToken = refreshToken else {
-      throw AuthErrorUtils.invalidUserTokenError(message: "Invalid user token: accessToken or refreshToken is nil")
+      throw AuthErrorUtils
+        .invalidUserTokenError(message: "Invalid user token: accessToken or refreshToken is nil")
     }
     let tokenService = SecureTokenService(withRequestConfiguration: auth.requestConfiguration,
                                           accessToken: accessToken,

FirebaseAuth/Tests/SampleSwift/SwiftApiTests/GoogleTests.swift

@@ -84,12 +84,12 @@ class GoogleTests: TestsBase {
     return returnValue
   }
 
-  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
   /// Sends http request to Google OAuth2 token server to use refresh token to exchange for Google
   /// access token.
   /// Returns a dictionary that constains "access_token", "token_type", "expires_in" and sometimes
   /// the "id_token". (The id_token is not guaranteed to be returned during a refresh exchange;
   /// see https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokenResponse)
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
   func getGoogleAccessTokenAsync() async throws -> [String: Any] {
     let googleOauth2TokenServerUrl = "https://www.googleapis.com/oauth2/v4/token"
     let bodyString = "client_id=\(Credentials.kGoogleClientID)&grant_type=refresh_token" +

FirebaseAuth/Tests/Unit/ActionCodeURLTests.swift

@@ -18,7 +18,6 @@ import XCTest
 
 /// Unit tests for ActionCodeURL
 class ActionCodeURLTests: XCTestCase {
-
   /// Tests parsing a valid URL with resetPassword mode.
   func testParseURL() {
     let urlString = "https://www.example.com?apiKey=API_KEY&mode=resetPassword&oobCode=OOB_CODE"

FirebaseFunctions/Sources/Callable+Codable.swift

@@ -282,7 +282,7 @@ public extension Callable where Request: Sendable, Response: Sendable {
               // `StreamResponseProtocol`, we know the `Response` generic argument
               // is `StreamResponse<_, _>`.
               let responseJSON = switch response {
-              case .message(let json), .result(let json): json
+              case let .message(json), let .result(json): json
               }
               let response = try decoder.decode(Response.self, from: responseJSON)
               if response is StreamResponseProtocol {

FirebaseFunctions/Sources/Functions.swift

@@ -461,7 +461,8 @@ enum FunctionsConstants {
                             options: HTTPSCallableOptions?,
                             timeout: TimeInterval,
                             context: FunctionsContext,
-                            completion: @escaping @MainActor (Result<HTTPSCallableResult, Error>) -> Void) {
+                            completion: @escaping @MainActor (Result<HTTPSCallableResult, Error>)
+                              -> Void) {
     let fetcher: GTMSessionFetcher
     do {
       fetcher = try makeFetcher(

FirebaseFunctions/Sources/HTTPSCallable.swift

@@ -77,7 +77,8 @@ open class HTTPSCallable: NSObject {
   ///   - completion: The block to call when the HTTPS request has completed.
   @objc(callWithObject:completion:) open func call(_ data: Any? = nil,
                                                    completion: @escaping @MainActor (HTTPSCallableResult?,
-                                                                          Error?) -> Void) {
+                                                                                     Error?)
+                                                     -> Void) {
     if #available(iOS 13, macCatalyst 13, macOS 10.15, tvOS 13, watchOS 7, *) {
       Task {
         do {

FirebaseStorage/Sources/StorageTask.swift

@@ -104,20 +104,20 @@ import Foundation
   /**
    * Prepares a task and begins execution.
    */
-  @objc func enqueue() -> Void
+  @objc func enqueue()
 
   /**
    * Pauses a task currently in progress.
    */
-  @objc optional func pause() -> Void
+  @objc optional func pause()
 
   /**
    * Cancels a task.
    */
-  @objc optional func cancel() -> Void
+  @objc optional func cancel()
 
   /**
    * Resumes a paused task.
    */
-  @objc optional func resume() -> Void
+  @objc optional func resume()
 }

Mintfile

@@ -1 +1 @@
-nicklockwood/SwiftFormat@0.54.0
+nicklockwood/SwiftFormat@0.55.5

scripts/style.sh

@@ -180,14 +180,10 @@ s%^./%%
 needs_formatting=false
 for f in $files; do
   if [[ "${f: -6}" == '.swift' ]]; then
-    if [[ "$system" == 'Darwin' ]]; then
-      # Match output that says:
-      # 1/1 files would have been formatted.  (with --dryrun)
-      # 1/1 files formatted.                  (without --dryrun)
-      mint run swiftformat "${swift_options[@]}" "$f" 2>&1 | grep '^1/1 files' > /dev/null
-    else
-      false
-    fi
+    # Match output that says:
+    # 1/1 files would have been formatted.  (with --dryrun)
+    # 1/1 files formatted.                  (without --dryrun)
+    mint run swiftformat "${swift_options[@]}" "$f" 2>&1 | grep '^1/1 files' > /dev/null
   else
     "$clang_format_bin" "${clang_options[@]}" "$f" | grep "<replacement " > /dev/null
   fi