fixes

FirebaseAuth/Sources/Swift/AuthProvider/FederatedAuthProvider.swift

@@ -20,17 +20,6 @@ import Foundation
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 @objc(FIRFederatedAuthProvider) public protocol FederatedAuthProvider: NSObjectProtocol {
   #if os(iOS)
-    /** @fn getCredentialWithUIDelegate:completion:
-        @brief Used to obtain an auth credential via a mobile web flow.
-            This method is available on iOS only.
-        @param UIDelegate An optional UI delegate used to present the mobile web flow.
-        @param completion Optionally; a block which is invoked asynchronously on the main thread when
-            the mobile web flow is completed.
-     */
-    @objc optional
-    func getCredentialWith(_ UIDelegate: AuthUIDelegate?,
-                           completion: ((AuthCredential?, Error?) -> Void)?)
-
     /** @fn getCredentialWithUIDelegate:completion:
         @brief Used to obtain an auth credential via a mobile web flow.
             This method is available on iOS only.

FirebaseAuth/Tests/Unit/AuthTests.swift

@@ -846,19 +846,13 @@ class AuthTests: RPCBaseTests {
   #if os(iOS)
     class FakeProvider: NSObject, FederatedAuthProvider {
       @available(iOS 13, tvOS 13, macOS 10.15, watchOS 8, *)
-      func credential(with UIDelegate: FirebaseAuth.AuthUIDelegate?) async throws ->
-        FirebaseAuth.AuthCredential {
-        fatalError("Should not use this async method yet")
-      }
-
-      func getCredentialWith(_ UIDelegate: FirebaseAuth.AuthUIDelegate?,
-                             completion: ((FirebaseAuth.AuthCredential?, Error?) -> Void)?) {
+      func credential(with UIDelegate: FirebaseAuth.AuthUIDelegate?) async throws -> AuthCredential {
         let credential = OAuthCredential(withProviderID: GoogleAuthProvider.id,
                                          sessionID: kOAuthSessionID,
                                          OAuthResponseURLString: kOAuthRequestURI)
         XCTAssertEqual(credential.OAuthResponseURLString, kOAuthRequestURI)
         XCTAssertEqual(credential.sessionID, kOAuthSessionID)
-        completion?(credential, nil)
+        return credential
       }
     }
 

FirebaseAuth/Tests/Unit/SwiftAPI.swift

@@ -349,25 +349,11 @@ class AuthAPI_hOnlyTests: XCTestCase {
   }
 
   #if os(iOS)
-    func FIRFederatedAuthProvider_hO() {
-      class FederatedAuthImplementation: NSObject, FederatedAuthProvider {
-        // TODO: Document this API breakage - needing to add this functon for classes implementing
-        // FederatedAuthProvider.
-        func credential(with UIDelegate: FirebaseAuth
-          .AuthUIDelegate?) async throws -> AuthCredential {
-          return FacebookAuthProvider.credential(withAccessToken: "token")
-        }
-        func getCredentialWith(_ UIDelegate: AuthUIDelegate?,
-                               completion: ((AuthCredential?, Error?) -> Void)? = nil) {}
-      }
-      let obj = FederatedAuthImplementation()
-      obj.getCredentialWith(nil) { _, _ in
-      }
-    }
-
     @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
     func FIRFedederatedAuthProvider_hAsync() async throws {
       class FederatedAuthImplementation: NSObject, FederatedAuthProvider {
+        // TODO: Document this API breakage - needing to add this functon for classes implementing
+        // FederatedAuthProvider.
         func credential(with UIDelegate: AuthUIDelegate?) async throws -> AuthCredential {
           return FacebookAuthProvider.credential(withAccessToken: "token")
         }
@@ -381,13 +367,8 @@ class AuthAPI_hOnlyTests: XCTestCase {
         func credential(with UIDelegate: AuthUIDelegate?) async throws -> AuthCredential {
           return FacebookAuthProvider.credential(withAccessToken: "token")
         }
-
-        func getCredentialWith(_ UIDelegate: AuthUIDelegate?,
-                               completion: ((AuthCredential?, Error?) -> Void)? = nil) {}
       }
       let obj = FederatedAuthImplementation()
-      obj.getCredentialWith(nil) { _, _ in
-      }
       @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
       func FIRFedederatedAuthProvider_hAsync() async throws {
         let obj = FederatedAuthImplementation()

Package.swift

@@ -459,6 +459,7 @@ let package = Package(
         // TODO: these tests rely on a non-zero UIApplication.shared. They run from CocoaPods.
         "PhoneAuthProviderTests.swift",
         "AuthNotificationManagerTests.swift",
+        "ObjCAPITests.m", // Only builds via CocoaPods until mixed language or its own target.
       ]
     ),
     .target(