Remove unnecessary compiler checks for Concurrency support (#12232)

firebase · Jan 3, 2024 · 0fe8385 · 0fe8385
1 parent 5ac4a05
commit 0fe8385
Show file tree

Hide file tree

Showing 26 changed files with 2,078 additions and 2,214 deletions.
diff --git a/FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift b/FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift
@@ -63,18 +63,16 @@ final class AppCheckAPITests {
     }
 
     // Get token (async/await)
-    #if compiler(>=5.5.2) && canImport(_Concurrency)
-      if #available(iOS 13.0, macOS 11.15, macCatalyst 13.0, tvOS 13.0, watchOS 7.0, *) {
-        // async/await is a Swift 5.5+ feature available on iOS 15+
-        Task {
-          do {
-            try await AppCheck.appCheck().token(forcingRefresh: false)
-          } catch {
-            // ...
-          }
+    if #available(iOS 13.0, macOS 11.15, macCatalyst 13.0, tvOS 13.0, watchOS 7.0, *) {
+      // async/await is a Swift 5.5+ feature available on iOS 15+
+      Task {
+        do {
+          try await AppCheck.appCheck().token(forcingRefresh: false)
+        } catch {
+          // ...
         }
       }
-    #endif // compiler(>=5.5.2) && canImport(_Concurrency)
+    }
 
     // Set `AppCheckProviderFactory`
     AppCheck.setAppCheckProviderFactory(DummyAppCheckProviderFactory())
@@ -97,18 +95,16 @@ final class AppCheckAPITests {
       }
 
       // Get token (async/await)
-      #if compiler(>=5.5.2) && canImport(_Concurrency)
-        if #available(iOS 13.0, macOS 11.15, macCatalyst 13.0, tvOS 13.0, watchOS 7.0, *) {
-          // async/await is a Swift 5.5+ feature available on iOS 15+
-          Task {
-            do {
-              _ = try await debugProvider.getToken()
-            } catch {
-              // ...
-            }
+      if #available(iOS 13.0, macOS 11.15, macCatalyst 13.0, tvOS 13.0, watchOS 7.0, *) {
+        // async/await is a Swift 5.5+ feature available on iOS 15+
+        Task {
+          do {
+            _ = try await debugProvider.getToken()
+          } catch {
+            // ...
           }
         }
-      #endif // compiler(>=5.5.2) && canImport(_Concurrency)
+      }
 
       _ = debugProvider.localDebugToken()
       _ = debugProvider.currentDebugToken()
@@ -170,20 +166,18 @@ final class AppCheckAPITests {
             }
           }
           // Get token (async/await)
-          #if compiler(>=5.5.2) && canImport(_Concurrency)
-            if #available(iOS 13.0, macOS 11.15, macCatalyst 13.0, tvOS 13.0, watchOS 7.0, *) {
-              // async/await is a Swift 5.5+ feature available on iOS 15+
-              Task {
-                do {
-                  _ = try await deviceCheckProvider.getToken()
-                } catch AppCheckErrorCode.unsupported {
-                  // ...
-                } catch {
-                  // ...
-                }
+          if #available(iOS 13.0, macOS 11.15, macCatalyst 13.0, tvOS 13.0, watchOS 7.0, *) {
+            // async/await is a Swift 5.5+ feature available on iOS 15+
+            Task {
+              do {
+                _ = try await deviceCheckProvider.getToken()
+              } catch AppCheckErrorCode.unsupported {
+                // ...
+              } catch {
+                // ...
               }
             }
-          #endif // compiler(>=5.5.2) && canImport(_Concurrency)
+          }
         }
       }
     #endif // !os(watchOS)

diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/AccountInfoTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/AccountInfoTests.swift
@@ -75,29 +75,27 @@ class AccountInfoTests: TestsBase {
     waitForExpectations(timeout: TestsBase.kExpectationsTimeout)
   }
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @available(iOS 13, tvOS 13, macOS 10.15, watchOS 7, *)
-    func testUpdatingUsersEmailAsync() async throws {
-      let auth = Auth.auth()
-      do {
-        _ = try await auth.createUser(withEmail: kOldUserEmail, password: "password")
-        XCTFail("Did not get error for recreating a user")
-      } catch {
-        XCTAssertEqual((error as NSError).code,
-                       AuthErrorCode.emailAlreadyInUse.rawValue,
-                       "Created a user despite it already exiting.")
-      }
+  @available(iOS 13, tvOS 13, macOS 10.15, watchOS 7, *)
+  func testUpdatingUsersEmailAsync() async throws {
+    let auth = Auth.auth()
+    do {
+      _ = try await auth.createUser(withEmail: kOldUserEmail, password: "password")
+      XCTFail("Did not get error for recreating a user")
+    } catch {
+      XCTAssertEqual((error as NSError).code,
+                     AuthErrorCode.emailAlreadyInUse.rawValue,
+                     "Created a user despite it already exiting.")
+    }
 
-      let user = try await auth.signIn(withEmail: kOldUserEmail, password: "password")
-      XCTAssertEqual(user.user.email, kOldUserEmail)
-      XCTAssertEqual(auth.currentUser?.email,
-                     kOldUserEmail,
-                     "Signed user does not match request.")
+    let user = try await auth.signIn(withEmail: kOldUserEmail, password: "password")
+    XCTAssertEqual(user.user.email, kOldUserEmail)
+    XCTAssertEqual(auth.currentUser?.email,
+                   kOldUserEmail,
+                   "Signed user does not match request.")
 
-      try await auth.currentUser?.updateEmail(to: kNewUserEmail)
-      XCTAssertEqual(auth.currentUser?.email,
-                     kNewUserEmail,
-                     "Signed user does not match change.")
-    }
-  #endif
+    try await auth.currentUser?.updateEmail(to: kNewUserEmail)
+    XCTAssertEqual(auth.currentUser?.email,
+                   kNewUserEmail,
+                   "Signed user does not match change.")
+  }
 }
diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/AnonymousTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/AnonymousTests.swift
@@ -29,16 +29,14 @@ class AnonymousTests: TestsBase {
     deleteCurrentUser()
   }
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-    func testUpdatingUsersEmailAsync() async throws {
-      try await signInAnonymouslyAsync()
-      if let isAnonymous = Auth.auth().currentUser?.isAnonymous {
-        XCTAssertTrue(isAnonymous)
-      } else {
-        XCTFail("Missing currentUser after anonymous sign in")
-      }
-      try await deleteCurrentUserAsync()
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
+  func testUpdatingUsersEmailAsync() async throws {
+    try await signInAnonymouslyAsync()
+    if let isAnonymous = Auth.auth().currentUser?.isAnonymous {
+      XCTAssertTrue(isAnonymous)
+    } else {
+      XCTFail("Missing currentUser after anonymous sign in")
     }
-  #endif
+    try await deleteCurrentUserAsync()
+  }
 }
diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/EmailPasswordTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/EmailPasswordTests.swift
@@ -39,15 +39,13 @@ class EmailPasswordTests: TestsBase {
     deleteCurrentUser()
   }
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-    func testCreateAccountWithEmailAndPasswordAsync() async throws {
-      let auth = Auth.auth()
-      try await auth.createUser(withEmail: kNewEmailToCreateUser, password: "password")
-      XCTAssertEqual(auth.currentUser?.email, kNewEmailToCreateUser, "Expected email doesn't match")
-      try await deleteCurrentUserAsync()
-    }
-  #endif
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
+  func testCreateAccountWithEmailAndPasswordAsync() async throws {
+    let auth = Auth.auth()
+    try await auth.createUser(withEmail: kNewEmailToCreateUser, password: "password")
+    XCTAssertEqual(auth.currentUser?.email, kNewEmailToCreateUser, "Expected email doesn't match")
+    try await deleteCurrentUserAsync()
+  }
 
   func testSignInExistingUserWithEmailAndPassword() {
     let auth = Auth.auth()
@@ -63,14 +61,12 @@ class EmailPasswordTests: TestsBase {
     waitForExpectations(timeout: TestsBase.kExpectationsTimeout)
   }
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-    func testSignInExistingUserWithEmailAndPasswordAsync() async throws {
-      let auth = Auth.auth()
-      try await auth.signIn(withEmail: kExistingEmailToSignIn, password: "password")
-      XCTAssertEqual(auth.currentUser?.email,
-                     kExistingEmailToSignIn,
-                     "Signed user does not match request.")
-    }
-  #endif
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
+  func testSignInExistingUserWithEmailAndPasswordAsync() async throws {
+    let auth = Auth.auth()
+    try await auth.signIn(withEmail: kExistingEmailToSignIn, password: "password")
+    XCTAssertEqual(auth.currentUser?.email,
+                   kExistingEmailToSignIn,
+                   "Signed user does not match request.")
+  }
 }
diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/FacebookTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/FacebookTests.swift
@@ -44,7 +44,6 @@ import XCTest
 //    deleteFacebookTestingAccountbyID(facebookAccountID)
 //  }
 //
-//  #if compiler(>=5.5.2) && canImport(_Concurrency)
 //    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 //    func testSignInWithFacebookAsync() async throws {
 //      let auth = Auth.auth()
@@ -60,7 +59,6 @@ import XCTest
 //      try await deleteCurrentUserAsync()
 //      try await deleteFacebookTestingAccountbyIDAsync(facebookAccountID)
 //    }
-//  #endif
 //
 //  func testLinkAnonymousAccountToFacebookAccount() throws {
 //    let auth = Auth.auth()
@@ -90,7 +88,6 @@ import XCTest
 //    deleteFacebookTestingAccountbyID(facebookAccountID)
 //  }
 //
-//  #if compiler(>=5.5.2) && canImport(_Concurrency)
 //    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 //    func testLinkAnonymousAccountToFacebookAccountAsync() async throws {
 //      let auth = Auth.auth()
@@ -111,7 +108,6 @@ import XCTest
 //      try await deleteCurrentUserAsync()
 //      try await deleteFacebookTestingAccountbyIDAsync(facebookAccountID)
 //    }
-//  #endif
 //
 //  /// Creates a Facebook testing account using Facebook Graph API and return a dictionary that
 //  /// constrains "id", "access_token", "login_url", "email" and "password" of the created account.
@@ -151,7 +147,6 @@ import XCTest
 //    return returnValue
 //  }
 //
-//  #if compiler(>=5.5.2) && canImport(_Concurrency)
 //    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 //    /// Creates a Facebook testing account using Facebook Graph API and return a dictionary that
 //    /// constains "id", "access_token", "login_url", "email" and "password" of the created
@@ -174,7 +169,6 @@ import XCTest
 //      }
 //      return returnValue
 //    }
-//  #endif
 //
 //  // ** Delete a Facebook testing account by account Id using Facebook Graph API. */
 //  func deleteFacebookTestingAccountbyID(_ accountID: String) {
@@ -195,7 +189,6 @@ import XCTest
 //    waitForExpectations(timeout: TestsBase.kExpectationsTimeout)
 //  }
 //
-//  #if compiler(>=5.5.2) && canImport(_Concurrency)
 //    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 //    // ** Delete a Facebook testing account by account Id using Facebook Graph API. */
 //    func deleteFacebookTestingAccountbyIDAsync(_ accountID: String) async throws {
@@ -208,5 +201,4 @@ import XCTest
 //      fetcher.setRequestValue("text/plain", forHTTPHeaderField: "Content-Type")
 //      try await fetcher.beginFetch()
 //    }
-//  #endif
 // }
diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/GoogleTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/GoogleTests.swift
@@ -37,18 +37,16 @@ class GoogleTests: TestsBase {
     waitForExpectations(timeout: TestsBase.kExpectationsTimeout)
   }
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-    func testSignInWithGoogleAsync() async throws {
-      let auth = Auth.auth()
-      let userInfoDict = try await getGoogleAccessTokenAsync()
-      let googleAccessToken: String = try XCTUnwrap(userInfoDict["access_token"] as? String)
-      let googleIDToken: String = try XCTUnwrap(userInfoDict["id_token"] as? String)
-      let credential = GoogleAuthProvider.credential(withIDToken: googleIDToken,
-                                                     accessToken: googleAccessToken)
-      _ = try await auth.signIn(with: credential)
-    }
-  #endif
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
+  func testSignInWithGoogleAsync() async throws {
+    let auth = Auth.auth()
+    let userInfoDict = try await getGoogleAccessTokenAsync()
+    let googleAccessToken: String = try XCTUnwrap(userInfoDict["access_token"] as? String)
+    let googleIDToken: String = try XCTUnwrap(userInfoDict["id_token"] as? String)
+    let credential = GoogleAuthProvider.credential(withIDToken: googleIDToken,
+                                                   accessToken: googleAccessToken)
+    _ = try await auth.signIn(with: credential)
+  }
 
   /// Sends http request to Google OAuth2 token server to use refresh token to exchange for Google
   /// access token.
@@ -84,32 +82,30 @@ class GoogleTests: TestsBase {
     return returnValue
   }
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @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)
-    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" +
-        "&refresh_token=\(Credentials.kGoogleTestAccountRefreshToken)"
-      let postData = bodyString.data(using: .utf8)
-      let service = GTMSessionFetcherService()
-      let fetcher = service.fetcher(withURLString: googleOauth2TokenServerUrl)
-      fetcher.bodyData = postData
-      fetcher.setRequestValue(
-        "application/x-www-form-urlencoded",
-        forHTTPHeaderField: "Content-Type"
-      )
-      let data = try await fetcher.beginFetch()
-      guard let returnValue = try JSONSerialization.jsonObject(with: data, options: [])
-        as? [String: Any] else {
-        XCTFail("Failed to serialize userInfo as a Dictionary")
-        fatalError()
-      }
-      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)
+  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" +
+      "&refresh_token=\(Credentials.kGoogleTestAccountRefreshToken)"
+    let postData = bodyString.data(using: .utf8)
+    let service = GTMSessionFetcherService()
+    let fetcher = service.fetcher(withURLString: googleOauth2TokenServerUrl)
+    fetcher.bodyData = postData
+    fetcher.setRequestValue(
+      "application/x-www-form-urlencoded",
+      forHTTPHeaderField: "Content-Type"
+    )
+    let data = try await fetcher.beginFetch()
+    guard let returnValue = try JSONSerialization.jsonObject(with: data, options: [])
+      as? [String: Any] else {
+      XCTFail("Failed to serialize userInfo as a Dictionary")
+      fatalError()
     }
-  #endif
+    return returnValue
+  }
 }
diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/TestsBase.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/TestsBase.swift
@@ -21,19 +21,17 @@ import XCTest
 class TestsBase: XCTestCase {
   static let kExpectationsTimeout = 10.0
 
-  #if compiler(>=5.5.2) && canImport(_Concurrency)
-    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-    func signInAnonymouslyAsync() async throws {
-      let auth = Auth.auth()
-      try await auth.signInAnonymously()
-    }
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
+  func signInAnonymouslyAsync() async throws {
+    let auth = Auth.auth()
+    try await auth.signInAnonymously()
+  }
 
-    @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
-    func deleteCurrentUserAsync() async throws {
-      let auth = Auth.auth()
-      try await auth.currentUser?.delete()
-    }
-  #endif
+  @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
+  func deleteCurrentUserAsync() async throws {
+    let auth = Auth.auth()
+    try await auth.currentUser?.delete()
+  }
 
   func signInAnonymously() {
     let auth = Auth.auth()