From dc18b7f5b90caf81e5e39cc4052637b2ff238a4d Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Thu, 30 Apr 2026 18:48:30 -0400 Subject: [PATCH] refactor(global): cleanup redundant availability checks and update sample apps audit (#16143) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../Sources/Analytics+SwiftUI.swift | 2 -- FirebaseAuth/Sources/Swift/Auth/Auth.swift | 17 -------------- .../Sources/Swift/Auth/AuthComponent.swift | 1 - .../Sources/Swift/Auth/AuthDataResult.swift | 2 -- .../Sources/Swift/Auth/AuthTokenResult.swift | 2 -- .../Swift/AuthProvider/AuthCredential.swift | 1 - .../AuthProvider/EmailAuthProvider.swift | 2 -- .../AuthProvider/FacebookAuthProvider.swift | 2 -- .../AuthProvider/FederatedAuthProvider.swift | 1 - .../AuthProvider/GameCenterAuthProvider.swift | 4 ---- .../AuthProvider/GitHubAuthProvider.swift | 2 -- .../AuthProvider/GoogleAuthProvider.swift | 2 -- .../Swift/AuthProvider/OAuthCredential.swift | 1 - .../Swift/AuthProvider/OAuthProvider.swift | 1 - .../AuthProvider/PhoneAuthCredential.swift | 1 - .../AuthProvider/PhoneAuthProvider.swift | 1 - .../AuthProvider/TwitterAuthProvider.swift | 2 -- .../Sources/Swift/Backend/AuthBackend.swift | 2 -- .../Swift/Backend/AuthBackendRPCIssuer.swift | 2 -- .../Swift/Backend/AuthRPCRequest.swift | 2 -- .../Backend/AuthRequestConfiguration.swift | 1 - .../Backend/IdentityToolkitRequest.swift | 1 - .../Backend/RPC/CreateAuthURIRequest.swift | 1 - .../Backend/RPC/DeleteAccountRequest.swift | 1 - .../Backend/RPC/EmailLinkSignInRequest.swift | 1 - .../Backend/RPC/GetAccountInfoRequest.swift | 1 - .../Backend/RPC/GetAccountInfoResponse.swift | 3 +-- .../RPC/GetOOBConfirmationCodeRequest.swift | 1 - .../Backend/RPC/GetProjectConfigRequest.swift | 1 - .../RPC/GetRecaptchaConfigRequest.swift | 1 - .../Enroll/FinalizeMFAEnrollmentRequest.swift | 1 - .../FinalizeMFAEnrollmentResponse.swift | 1 - .../Enroll/StartMFAEnrollmentRequest.swift | 1 - .../Enroll/StartMFAEnrollmentResponse.swift | 1 - .../SignIn/FinalizeMFASignInRequest.swift | 1 - .../SignIn/FinalizeMFASignInResponse.swift | 1 - .../SignIn/StartMFASignInRequest.swift | 1 - .../SignIn/StartMFASignInResponse.swift | 1 - .../Unenroll/WithdrawMFARequest.swift | 1 - .../Backend/RPC/ResetPasswordRequest.swift | 1 - .../Backend/RPC/RevokeTokenRequest.swift | 5 ++--- .../Backend/RPC/SecureTokenRequest.swift | 1 - .../Backend/RPC/SecureTokenResponse.swift | 1 - .../RPC/SendVerificationTokenRequest.swift | 1 - .../Backend/RPC/SetAccountInfoRequest.swift | 1 - .../RPC/SignInWithGameCenterRequest.swift | 1 - .../Backend/RPC/SignUpNewUserRequest.swift | 1 - .../Backend/RPC/VerifyAssertionRequest.swift | 1 - .../RPC/VerifyCustomTokenRequest.swift | 1 - .../Backend/RPC/VerifyPasswordRequest.swift | 1 - .../RPC/VerifyPhoneNumberRequest.swift | 1 - .../Swift/Backend/VerifyClientRequest.swift | 1 - .../Swift/MultiFactor/MultiFactor.swift | 6 ----- .../MultiFactor/MultiFactorResolver.swift | 2 -- .../MultiFactor/MultiFactorSession.swift | 1 - .../Phone/PhoneMultiFactorAssertion.swift | 1 - .../Phone/PhoneMultiFactorGenerator.swift | 1 - .../TOTP/TOTPMultiFactorGenerator.swift | 4 +--- .../Swift/Storage/AuthKeychainServices.swift | 1 - .../Swift/Storage/AuthKeychainStorage.swift | 1 - .../Storage/AuthKeychainStorageReal.swift | 1 - .../SystemService/AuthAPNSTokenManager.swift | 1 - .../AuthAppCredentialManager.swift | 1 - .../AuthNotificationManager.swift | 1 - .../SystemService/AuthStoredUserManager.swift | 1 - .../SystemService/SecureTokenService.swift | 2 -- .../SystemService/TokenRefreshCoalescer.swift | 1 - FirebaseAuth/Sources/Swift/User/User.swift | 16 -------------- .../Sources/Swift/User/UserInfoImpl.swift | 2 -- .../Sources/Swift/User/UserMetadata.swift | 2 -- .../Swift/User/UserProfileChangeRequest.swift | 2 -- .../Swift/User/UserProfileUpdate.swift | 1 - .../Swift/Utilities/AuthCondition.swift | 1 - .../Swift/Utilities/AuthErrorUtils.swift | 1 - .../Utilities/AuthRecaptchaVerifier.swift | 5 ----- .../Swift/Utilities/AuthURLPresenter.swift | 1 - .../Swift/Utilities/AuthWebUtils.swift | 1 - .../Sources/Swift/Utilities/AuthWebView.swift | 1 - .../Utilities/AuthWebViewController.swift | 2 -- .../SwiftApiTests/FacebookTests.swift | 4 ---- .../SwiftApiTests/GoogleTests.swift | 2 -- .../SwiftApiTests/UserThreadSafetyTests.swift | 1 - .../Tests/Unit/AdditionalUserInfoTests.swift | 1 - .../Unit/AuthAPNSTokenManagerTests.swift | 1 - .../Tests/Unit/AuthAPNSTokenTests.swift | 1 - .../Unit/AuthAppCredentialManagerTests.swift | 1 - .../Tests/Unit/AuthAppCredentialTests.swift | 1 - .../Tests/Unit/AuthBackendTests.swift | 1 - .../Tests/Unit/AuthDispatcherTests.swift | 1 - .../Unit/AuthKeychainServicesTests.swift | 1 - .../Tests/Unit/AuthLifecycleTests.swift | 1 - .../Unit/AuthNotificationManagerTests.swift | 1 - .../Tests/Unit/AuthProviderIDTests.swift | 1 - FirebaseAuth/Tests/Unit/AuthTests.swift | 1 - .../Tests/Unit/AuthURLPresenterTests.swift | 1 - .../Unit/AuthUseUserAccessGroupTests.swift | 1 - .../Tests/Unit/AuthUserDefaultsTests.swift | 1 - .../Tests/Unit/AuthWebUtilsTests.swift | 1 - .../Tests/Unit/CreateAuthURITests.swift | 1 - .../Tests/Unit/DeleteAccountTests.swift | 1 - .../Tests/Unit/EmailAuthProviderTests.swift | 1 - .../Tests/Unit/EmailLinkSignInTests.swift | 1 - .../Unit/FacebookAuthProviderTests.swift | 1 - .../Unit/Fakes/FakeAuthKeychainStorage.swift | 1 - .../Unit/Fakes/FakeBackendRPCIssuer.swift | 1 - .../FinalizeMFAEnrollmentRequestTests.swift | 1 - .../Unit/FinalizeMFASignInRequestTests.swift | 1 - .../Tests/Unit/GetAccountInfoTests.swift | 1 - .../Unit/GetOOBConfirmationCodeTests.swift | 1 - .../Tests/Unit/GetProjectConfigTests.swift | 1 - .../Tests/Unit/GetRecaptchaConfigTests.swift | 1 - .../Tests/Unit/GitHubAuthProviderTests.swift | 1 - .../Tests/Unit/GoogleAuthProviderTests.swift | 1 - .../Unit/IdentityToolkitRequestTests.swift | 1 - .../Tests/Unit/MultiFactorResolverTests.swift | 1 - .../Tests/Unit/OAuthProviderTests.swift | 1 - .../Tests/Unit/PhoneAuthProviderTests.swift | 1 - FirebaseAuth/Tests/Unit/RPCBaseTests.swift | 1 - .../Tests/Unit/ResetPasswordTests.swift | 1 - .../Tests/Unit/RevokeTokenTests.swift | 1 - .../Tests/Unit/SecureTokenRequestTests.swift | 1 - .../Tests/Unit/SecureTokenTests.swift | 1 - .../Unit/SendVerificationCodeTests.swift | 1 - .../Tests/Unit/SetAccountInfoTests.swift | 1 - .../Unit/SignInWithGameCenterTests.swift | 1 - .../Tests/Unit/SignUpNewUserTests.swift | 1 - .../Unit/StartMFAEnrollmentRequestTests.swift | 1 - .../Unit/StartMFASignInRequestTests.swift | 1 - FirebaseAuth/Tests/Unit/SwiftAPI.swift | 17 ++------------ .../Unit/TokenRefreshCoalescerTests.swift | 1 - .../Tests/Unit/TwitterAuthProviderTests.swift | 1 - .../Tests/Unit/UserMetadataTests.swift | 1 - FirebaseAuth/Tests/Unit/UserTests.swift | 1 - .../Tests/Unit/VerifyAssertionTests.swift | 1 - .../Tests/Unit/VerifyClientTests.swift | 1 - .../Tests/Unit/VerifyCustomTokenTests.swift | 1 - .../Tests/Unit/VerifyPasswordTests.swift | 1 - .../Tests/Unit/VerifyPhoneNumberTests.swift | 1 - FirebaseCore/Sources/FIRApp.m | 11 +--------- .../Sources/Realtime/FWebSocketConnection.m | 22 +++++++++---------- .../Analytics/FIRIAMClearcutLogStorage.m | 10 ++++----- .../Analytics/FIRIAMClearcutUploader.m | 10 ++++----- .../Sources/Token/FIRMessagingAuthKeychain.m | 8 +++---- .../UnitTestsSwift/FIRMessagingAPITest.swift | 1 - .../Swift/CustomSignals.swift | 1 - .../Swift/SwiftAPI/AsyncAwaitTests.swift | 1 - .../Tests/Swift/SwiftAPI/Codable.swift | 1 - .../Tests/Swift/SwiftAPI/Value.swift | 1 - FirebaseStorage/Sources/AsyncAwait.swift | 1 - .../Sources/Internal/StorageDeleteTask.swift | 1 - .../Internal/StorageFetcherService.swift | 1 - .../Internal/StorageGetDownloadURLTask.swift | 1 - .../Internal/StorageGetMetadataTask.swift | 1 - .../Internal/StorageInternalTask.swift | 1 - .../Sources/Internal/StorageListTask.swift | 1 - .../Internal/StorageTokenAuthorizer.swift | 1 - .../Internal/StorageUpdateMetadataTask.swift | 1 - .../Sources/Internal/StorageUtils.swift | 1 - FirebaseStorage/Sources/Result.swift | 2 -- FirebaseStorage/Sources/Storage.swift | 3 --- .../Sources/StorageDownloadTask.swift | 1 - FirebaseStorage/Sources/StorageError.swift | 2 -- .../Sources/StorageListResult.swift | 1 - FirebaseStorage/Sources/StorageMetadata.swift | 1 - .../Sources/StorageObservableTask.swift | 1 - .../Sources/StorageReference.swift | 1 - FirebaseStorage/Sources/StorageTask.swift | 1 - .../Sources/StorageTaskSnapshot.swift | 1 - .../Sources/StorageUploadTask.swift | 1 - .../Tests/Unit/StorageAPITests.swift | 1 - .../Tests/Unit/StorageAuthorizerTests.swift | 1 - .../Tests/Unit/StorageComponentTests.swift | 1 - .../Tests/Unit/StorageDeleteTests.swift | 1 - .../Tests/Unit/StorageGetMetadataTests.swift | 1 - .../Tests/Unit/StorageListTests.swift | 1 - .../Tests/Unit/StorageMetadataTests.swift | 1 - .../Tests/Unit/StoragePathTests.swift | 1 - .../Tests/Unit/StorageReferenceTests.swift | 1 - .../Tests/Unit/StorageTestHelpers.swift | 1 - FirebaseStorage/Tests/Unit/StorageTests.swift | 1 - .../Unit/StorageUpdateMetadataTests.swift | 1 - .../Tests/Unit/StorageUtilsTests.swift | 1 - 182 files changed, 28 insertions(+), 303 deletions(-) diff --git a/FirebaseAnalytics/Sources/Analytics+SwiftUI.swift b/FirebaseAnalytics/Sources/Analytics+SwiftUI.swift index c33b2ea69f..8271a4fc21 100644 --- a/FirebaseAnalytics/Sources/Analytics+SwiftUI.swift +++ b/FirebaseAnalytics/Sources/Analytics+SwiftUI.swift @@ -17,7 +17,6 @@ import SwiftUI /// 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) struct LoggedAnalyticsModifier: ViewModifier { /// The name of the view to log in the `AnalyticsParameterScreenName` parameter. @@ -42,7 +41,6 @@ } } - @available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, *) @available(watchOS, unavailable) public extension View { /// Logs `screen_view` events in Google Analytics for Firebase when this view appears on screen. diff --git a/FirebaseAuth/Sources/Swift/Auth/Auth.swift b/FirebaseAuth/Sources/Swift/Auth/Auth.swift index e75a551fb9..5fc3ed9e0d 100644 --- a/FirebaseAuth/Sources/Swift/Auth/Auth.swift +++ b/FirebaseAuth/Sources/Swift/Auth/Auth.swift @@ -74,7 +74,6 @@ import FirebaseCoreExtension } #endif -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension Auth: AuthInterop { /// Retrieves the Firebase authentication token, possibly refreshing it if it has expired. /// @@ -144,7 +143,6 @@ extension Auth: AuthInterop { /// Manages authentication for Firebase apps. /// /// This class is thread-safe. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @preconcurrency @objc(FIRAuth) open class Auth: NSObject { /// Gets the auth object for the default Firebase app. @@ -261,7 +259,6 @@ extension Auth: AuthInterop { /// Sets the `currentUser` on the receiver to the provided user object. /// - Parameter user: The user object to be set as the current user of the calling Auth instance. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func updateCurrentUser(_ user: User) async throws { return try await withCheckedThrowingContinuation { continuation in self.updateCurrentUser(user) { error in @@ -427,7 +424,6 @@ extension Auth: AuthInterop { /// - Parameter email: The user's email address. /// - Parameter password: The user's password. /// - Returns: The `AuthDataResult` after a successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func signIn(withEmail email: String, password: String) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -485,7 +481,6 @@ extension Auth: AuthInterop { /// - Parameter email: The user's email address. /// - Parameter link: The email sign-in link. /// - Returns: The `AuthDataResult` after a successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func signIn(withEmail email: String, link: String) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in self.signIn(withEmail: email, link: link) { result, error in @@ -584,7 +579,6 @@ extension Auth: AuthInterop { /// protocol, this is used for presenting the web context. If nil, a default AuthUIDelegate /// will be used. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @available(tvOS, unavailable) @available(macOS, unavailable) @available(watchOS, unavailable) @@ -683,7 +677,6 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeSessionExpired` - Indicates that the SMS code has expired. /// - Parameter credential: The credential supplied by the IdP. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func signIn(with credential: AuthCredential) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -749,7 +742,6 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeOperationNotAllowed` - Indicates that anonymous accounts are /// not enabled. Enable them in the Auth section of the Firebase console. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult @objc open func signInAnonymously() async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -812,7 +804,6 @@ extension Auth: AuthInterop { /// belong to different projects. /// - Parameter token: A self-signed custom auth token. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func signIn(withCustomToken token: String) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -941,7 +932,6 @@ extension Auth: AuthInterop { /// - Parameter email: The user's email address. /// - Parameter password: The user's desired password. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func createUser(withEmail email: String, password: String) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -991,7 +981,6 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeInvalidActionCode` - Indicates the OOB code is invalid. /// - Parameter code: The reset code. /// - Parameter newPassword: The new password. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func confirmPasswordReset(withCode code: String, newPassword: String) async throws { return try await withCheckedThrowingContinuation { continuation in self.confirmPasswordReset(withCode: code, newPassword: newPassword) { error in @@ -1037,7 +1026,6 @@ extension Auth: AuthInterop { /// Checks the validity of an out of band code. /// - Parameter code: The out of band code to check validity. /// - Returns: An `ActionCodeInfo`. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func checkActionCode(_ code: String) async throws -> ActionCodeInfo { return try await withCheckedThrowingContinuation { continuation in self.checkActionCode(code) { info, error in @@ -1068,7 +1056,6 @@ extension Auth: AuthInterop { /// Checks the validity of a verify password reset code. /// - Parameter code: The password reset code to be verified. /// - Returns: An email. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func verifyPasswordResetCode(_ code: String) async throws -> String { return try await withCheckedThrowingContinuation { continuation in self.verifyPasswordResetCode(code) { code, error in @@ -1101,7 +1088,6 @@ extension Auth: AuthInterop { /// This method will not work for out of band codes which require an additional parameter, /// such as password reset code. /// - Parameter code: The out of band code to be applied. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func applyActionCode(_ code: String) async throws { return try await withCheckedThrowingContinuation { continuation in self.applyActionCode(code) { error in @@ -1216,7 +1202,6 @@ extension Auth: AuthInterop { /// - Parameter email: The email address of the user. /// - Parameter actionCodeSettings: An `ActionCodeSettings` object containing settings related to /// handling action codes. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func sendPasswordReset(withEmail email: String, actionCodeSettings: ActionCodeSettings? = nil) async throws { return try await withCheckedThrowingContinuation { continuation in @@ -1271,7 +1256,6 @@ extension Auth: AuthInterop { /// - Parameter email: The email address of the user. /// - Parameter actionCodeSettings: An `ActionCodeSettings` object containing settings related to /// handling action codes. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func sendSignInLink(toEmail email: String, actionCodeSettings: ActionCodeSettings) async throws { return try await withCheckedThrowingContinuation { continuation in @@ -1480,7 +1464,6 @@ extension Auth: AuthInterop { /// Revoke the users token with authorization code. /// - Parameter authorizationCode: The authorization code used to perform the revocation. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func revokeToken(withAuthorizationCode authorizationCode: String) async throws { return try await withCheckedThrowingContinuation { continuation in self.revokeToken(withAuthorizationCode: authorizationCode) { error in diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift b/FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift index af50c79fd3..daef328767 100644 --- a/FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift +++ b/FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift @@ -19,7 +19,6 @@ import FirebaseAuthInterop import FirebaseCore import FirebaseCoreExtension -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRAuthComponent) class AuthComponent: NSObject, Library, ComponentLifecycleMaintainer { // MARK: - Private Variables diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift b/FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift index 9d6dacd268..eee1365625 100644 --- a/FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift +++ b/FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift @@ -14,14 +14,12 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension AuthDataResult: NSSecureCoding {} /// Helper object that contains the result of a successful sign-in, link and reauthenticate /// action. /// /// It contains references to a `User` instance and an `AdditionalUserInfo` instance. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRAuthDataResult) open class AuthDataResult: NSObject { /// The signed in user. @objc public let user: User diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift b/FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift index 90be2649ef..4d8815b795 100644 --- a/FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift +++ b/FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift @@ -14,12 +14,10 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension AuthTokenResult: NSSecureCoding {} /// A data class containing the ID token JWT string and other properties associated with the /// token including the decoded payload claims. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRAuthTokenResult) open class AuthTokenResult: NSObject { /// Stores the JWT string of the ID token. @objc open var token: String diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/AuthCredential.swift b/FirebaseAuth/Sources/Swift/AuthProvider/AuthCredential.swift index 2ae683ae22..ac3e03474b 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/AuthCredential.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/AuthCredential.swift @@ -15,7 +15,6 @@ import Foundation /// Public representation of a credential. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRAuthCredential) open class AuthCredential: NSObject, @unchecked Sendable { /// The name of the identity provider for the credential. @objc public let provider: String diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift index e87445b84a..6d132da6b4 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift @@ -15,7 +15,6 @@ import Foundation /// A concrete implementation of `AuthProvider` for Email & Password Sign In. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIREmailAuthProvider) open class EmailAuthProvider: NSObject { /// A string constant identifying the email & password identity provider. @objc public static let id = "password" @@ -37,7 +36,6 @@ import Foundation } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIREmailPasswordAuthCredential) class EmailAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { let email: String diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift index b02ee16854..de980737e1 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift @@ -15,7 +15,6 @@ import Foundation /// Utility class for constructing Facebook Sign In credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRFacebookAuthProvider) open class FacebookAuthProvider: NSObject { /// A string constant identifying the Facebook identity provider. @objc public static let id = "facebook.com" @@ -33,7 +32,6 @@ import Foundation } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRFacebookAuthCredential) class FacebookAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { let accessToken: String? diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/FederatedAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/FederatedAuthProvider.swift index 0399b0584e..f3316d07cf 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/FederatedAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/FederatedAuthProvider.swift @@ -15,7 +15,6 @@ import Foundation /// Utility type for constructing federated auth provider credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRFederatedAuthProvider) public protocol FederatedAuthProvider: NSObjectProtocol { #if os(iOS) diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift index 935418f27d..f122fd9e55 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift @@ -19,17 +19,14 @@ // TODO: Delete this when minimum iOS version passes 13.5. /// WarningWorkaround is needed because playerID is deprecated in iOS 13.0 but still needed until /// 13.5 when the fetchItems API was introduced. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) private protocol WarningWorkaround { static func pre135Credential(localPlayer: GKLocalPlayer, completion: @escaping (AuthCredential?, Error?) -> Void) } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension GameCenterAuthProvider: WarningWorkaround {} /// A concrete implementation of `AuthProvider` for Game Center Sign In. Not available on watchOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRGameCenterAuthProvider) open class GameCenterAuthProvider: NSObject { /// A string constant identifying the Game Center identity provider. @objc public static let id = "gc.apple.com" @@ -127,7 +124,6 @@ } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRGameCenterAuthCredential) class GameCenterAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { let playerID: String? diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift index 8765acaa7d..c3cf53f60d 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift @@ -15,7 +15,6 @@ import Foundation /// Utility class for constructing GitHub Sign In credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRGitHubAuthProvider) open class GitHubAuthProvider: NSObject { /// A string constant identifying the GitHub identity provider. @objc public static let id = "github.com" @@ -33,7 +32,6 @@ import Foundation } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRGitHubAuthCredential) class GitHubAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { let token: String? diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift index 38cfa40386..24c77b4b14 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift @@ -15,7 +15,6 @@ import Foundation /// Utility class for constructing Google Sign In credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRGoogleAuthProvider) open class GoogleAuthProvider: NSObject { /// A string constant identifying the Google identity provider. @objc public static let id = "google.com" @@ -35,7 +34,6 @@ import Foundation } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRGoogleAuthCredential) class GoogleAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { let idToken: String? diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift index 8029fd6df5..7d5c444e13 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift @@ -15,7 +15,6 @@ import Foundation /// Internal implementation of `AuthCredential` for generic credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIROAuthCredential) open class OAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { /// The ID Token associated with this credential. diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift index 8dd2b00b99..b1283d84b4 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift @@ -16,7 +16,6 @@ import CommonCrypto import Foundation /// Utility class for constructing OAuth Sign In credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIROAuthProvider) open class OAuthProvider: NSObject, FederatedAuthProvider { @objc public static let id = "OAuth" diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift index a930fadc2e..9d05e4df41 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift @@ -17,7 +17,6 @@ import Foundation /// Implementation of AuthCredential for Phone Auth credentials. /// /// This class is available on iOS only. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRPhoneAuthCredential) open class PhoneAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { enum CredentialKind { diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift index c039518226..d03e287969 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift @@ -20,7 +20,6 @@ import Foundation /// A concrete implementation of `AuthProvider` for phone auth providers. /// /// This class is available on iOS only. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRPhoneAuthProvider) open class PhoneAuthProvider: NSObject, @unchecked Sendable { /// A string constant identifying the phone identity provider. @objc public static let id = "phone" diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift index d735ee0865..0d44bc1803 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift @@ -15,7 +15,6 @@ import Foundation /// Utility class for constructing Twitter Sign In credentials. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRTwitterAuthProvider) open class TwitterAuthProvider: NSObject { /// A string constant identifying the Twitter identity provider. @objc public static let id = "twitter.com" @@ -34,7 +33,6 @@ import Foundation } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRTwitterAuthCredential) class TwitterAuthCredential: AuthCredential, NSSecureCoding, @unchecked Sendable { let token: String? diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift index 655aa6376a..ebfa01afd0 100644 --- a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift +++ b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift @@ -21,12 +21,10 @@ import Foundation import GTMSessionFetcherCore #endif -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) protocol AuthBackendProtocol: Sendable { func call(with request: T) async throws -> T.Response } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class AuthBackend: AuthBackendProtocol { static func authUserAgent() -> String { return "FirebaseAuth.iOS/\(FirebaseVersion()) \(GTMFetcherStandardUserAgentString(nil))" diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthBackendRPCIssuer.swift b/FirebaseAuth/Sources/Swift/Backend/AuthBackendRPCIssuer.swift index bcf4f6dcab..d52e63e1bb 100644 --- a/FirebaseAuth/Sources/Swift/Backend/AuthBackendRPCIssuer.swift +++ b/FirebaseAuth/Sources/Swift/Backend/AuthBackendRPCIssuer.swift @@ -21,7 +21,6 @@ import Foundation @preconcurrency import GTMSessionFetcherCore #endif -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) protocol AuthBackendRPCIssuerProtocol: Sendable { /// Asynchronously send a HTTP request. /// - Parameter request: The request to be made. @@ -34,7 +33,6 @@ protocol AuthBackendRPCIssuerProtocol: Sendable { contentType: String) async -> (Data?, Error?) } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class AuthBackendRPCIssuer: AuthBackendRPCIssuerProtocol { let fetcherService: GTMSessionFetcherService diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthRPCRequest.swift b/FirebaseAuth/Sources/Swift/Backend/AuthRPCRequest.swift index eeacfbea89..c8e0c48ab5 100644 --- a/FirebaseAuth/Sources/Swift/Backend/AuthRPCRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/AuthRPCRequest.swift @@ -15,7 +15,6 @@ import Foundation /// The generic interface for an RPC request needed by AuthBackend. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) protocol AuthRPCRequest { associatedtype Response: AuthRPCResponse @@ -36,7 +35,6 @@ protocol AuthRPCRequest { // Default implementation of AuthRPCRequests. This produces similar behaviour to an optional method // in Obj-C. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension AuthRPCRequest { func injectRecaptchaFields(recaptchaResponse: String?, recaptchaVersion: String) { fatalError("Internal FirebaseAuth Error: unimplemented injectRecaptchaFields") diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift b/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift index 91f99c266f..21cb7a2f3a 100644 --- a/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift +++ b/FirebaseAuth/Sources/Swift/Backend/AuthRequestConfiguration.swift @@ -18,7 +18,6 @@ import FirebaseAppCheckInterop import FirebaseCoreExtension /// Defines configurations to be added to a request to Firebase Auth's backend. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class AuthRequestConfiguration { /// The Firebase Auth API key used in the request. let apiKey: String diff --git a/FirebaseAuth/Sources/Swift/Backend/IdentityToolkitRequest.swift b/FirebaseAuth/Sources/Swift/Backend/IdentityToolkitRequest.swift index 7378b517a7..e0c02b7f25 100644 --- a/FirebaseAuth/Sources/Swift/Backend/IdentityToolkitRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/IdentityToolkitRequest.swift @@ -31,7 +31,6 @@ private let kIdentityPlatformStagingAPIHost = "staging-identitytoolkit.sandbox.googleapis.com" /// Represents a request to an identity toolkit endpoint. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class IdentityToolkitRequest { /// Gets the RPC's endpoint. let endpoint: String diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/CreateAuthURIRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/CreateAuthURIRequest.swift index 987b7d28fe..71945ab546 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/CreateAuthURIRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/CreateAuthURIRequest.swift @@ -43,7 +43,6 @@ private let kTenantIDKey = "tenantId" /// Represents the parameters for the createAuthUri endpoint. /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/createAuthUri -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class CreateAuthURIRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = CreateAuthURIResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift index 543d5af3b8..49cc4d3d1f 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift @@ -25,7 +25,6 @@ private let kIDTokenKey = "idToken" /// The key for the "localID" value in the request. private let kLocalIDKey = "localId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class DeleteAccountRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = DeleteAccountResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/EmailLinkSignInRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/EmailLinkSignInRequest.swift index 72a2351798..a086de250f 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/EmailLinkSignInRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/EmailLinkSignInRequest.swift @@ -32,7 +32,6 @@ private let kPostBodyKey = "postBody" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class EmailLinkSignInRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = EmailLinkSignInResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoRequest.swift index 5dba854b17..04e00be5b6 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoRequest.swift @@ -23,7 +23,6 @@ private let kIDTokenKey = "idToken" /// Represents the parameters for the getAccountInfo endpoint. /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/getAccountInfo -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetAccountInfoRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = GetAccountInfoResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoResponse.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoResponse.swift index 4fb5795bcd..ae8262dd90 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoResponse.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoResponse.swift @@ -14,9 +14,8 @@ import Foundation -/// Represents the response from the setAccountInfo endpoint. +/// Represents the response from the getAccountInfo endpoint. /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/getAccountInfo -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct GetAccountInfoResponse: AuthRPCResponse { /// Represents the provider user info part of the response from the getAccountInfo endpoint. /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/getAccountInfo diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift index dd3ac4fc46..381351ea87 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift @@ -102,7 +102,6 @@ private let kClientType = "clientType" /// The key for the "recaptchaVersion" value in the request. private let kRecaptchaVersion = "recaptchaVersion" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = GetOOBConfirmationCodeResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/GetProjectConfigRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/GetProjectConfigRequest.swift index 1a1b011ff0..f4a5d57314 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/GetProjectConfigRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/GetProjectConfigRequest.swift @@ -17,7 +17,6 @@ import Foundation /// The "getProjectConfig" endpoint. private let kGetProjectConfigEndPoint = "getProjectConfig" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetProjectConfigRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = GetProjectConfigResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/GetRecaptchaConfigRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/GetRecaptchaConfigRequest.swift index 075d8273a1..d6337f1534 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/GetRecaptchaConfigRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/GetRecaptchaConfigRequest.swift @@ -43,7 +43,6 @@ private let kVersionKey = "version" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetRecaptchaConfigRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = GetRecaptchaConfigResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentRequest.swift index 0c1154d5a6..aceaa9a5ac 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentRequest.swift @@ -19,7 +19,6 @@ private let kFinalizeMFAEnrollmentEndPoint = "accounts/mfaEnrollment:finalize" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class FinalizeMFAEnrollmentRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = FinalizeMFAEnrollmentResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentResponse.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentResponse.swift index 595e3b4595..d76a8680df 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentResponse.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentResponse.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct FinalizeMFAEnrollmentResponse: AuthRPCResponse { private(set) var idToken: String? private(set) var refreshToken: String? diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentRequest.swift index a36c7bb3bc..567c13643c 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentRequest.swift @@ -31,7 +31,6 @@ private let kRecaptchaVersion = "recaptchaVersion" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StartMFAEnrollmentRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = StartMFAEnrollmentResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentResponse.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentResponse.swift index 7c91b54227..c0487a0af0 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentResponse.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/StartMFAEnrollmentResponse.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct StartMFAEnrollmentResponse: AuthRPCResponse { private(set) var phoneSessionInfo: AuthProtoStartMFAPhoneResponseInfo? private(set) var totpSessionInfo: AuthProtoStartMFATOTPEnrollmentResponseInfo? diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInRequest.swift index 7e8b67eca9..3fa504013c 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInRequest.swift @@ -19,7 +19,6 @@ private let kFinalizeMFASignInEndPoint = "accounts/mfaSignIn:finalize" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class FinalizeMFASignInRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = FinalizeMFAEnrollmentResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInResponse.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInResponse.swift index 850a969e6c..fe286bd083 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInResponse.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/FinalizeMFASignInResponse.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct FinalizeMFASignInResponse: AuthRPCResponse { var IDToken: String? var refreshToken: String? diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInRequest.swift index ae28451fb9..029288fb59 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInRequest.swift @@ -20,7 +20,6 @@ private let kStartMFASignInEndPoint = "accounts/mfaSignIn:start" private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StartMFASignInRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = StartMFASignInResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInResponse.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInResponse.swift index 35fc6f0bb4..659292c8fa 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInResponse.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/SignIn/StartMFASignInResponse.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct StartMFASignInResponse: AuthRPCResponse { let responseInfo: AuthProtoStartMFAPhoneResponseInfo diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Unenroll/WithdrawMFARequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Unenroll/WithdrawMFARequest.swift index f2324db3ca..cc0ec8df40 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Unenroll/WithdrawMFARequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Unenroll/WithdrawMFARequest.swift @@ -19,7 +19,6 @@ private let kWithdrawMFAEndPoint = "accounts/mfaEnrollment:withdraw" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class WithdrawMFARequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = WithdrawMFAResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/ResetPasswordRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/ResetPasswordRequest.swift index c0b2629683..3f523730d9 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/ResetPasswordRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/ResetPasswordRequest.swift @@ -26,7 +26,6 @@ private let kCurrentPasswordKey = "newPassword" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class ResetPasswordRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = ResetPasswordResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/RevokeTokenRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/RevokeTokenRequest.swift index 94e6deeeab..38d94d55c7 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/RevokeTokenRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/RevokeTokenRequest.swift @@ -29,10 +29,9 @@ private let kTokenKey = "token" /// The key for the ID Token associated with this credential. private let kIDTokenKey = "idToken" -/// Represents the parameters for the verifyPassword endpoint. +/// Represents the parameters for the revokeToken endpoint. /// -/// See https: // developers.google.com/identity/toolkit/web/reference/relyingparty/verifyPassword -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) +/// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/revokeToken class RevokeTokenRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = RevokeTokenResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenRequest.swift index cd26caa83f..13dfb79283 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenRequest.swift @@ -59,7 +59,6 @@ private let kCodeKey = "code" private nonisolated(unsafe) var gAPIHost = "securetoken.googleapis.com" /// Represents the parameters for the token endpoint. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SecureTokenRequest: AuthRPCRequest { typealias Response = SecureTokenResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenResponse.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenResponse.swift index 44409ba92d..2d92efd60b 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenResponse.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/SecureTokenResponse.swift @@ -28,7 +28,6 @@ private let kAccessTokenKey = "access_token" private let kIDTokenKey = "id_token" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct SecureTokenResponse: AuthRPCResponse { var approximateExpirationDate: Date? var refreshToken: String? diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/SendVerificationTokenRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/SendVerificationTokenRequest.swift index 729cf1d200..fce536f9df 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/SendVerificationTokenRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/SendVerificationTokenRequest.swift @@ -48,7 +48,6 @@ enum CodeIdentity: Equatable { case empty } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SendVerificationCodeRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = SendVerificationCodeResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift index 5e310d4a65..03505fda24 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift @@ -78,7 +78,6 @@ private let kTenantIDKey = "tenantId" /// Represents the parameters for the setAccountInfo endpoint. /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/setAccountInfo -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SetAccountInfoRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = SetAccountInfoResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/SignInWithGameCenterRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/SignInWithGameCenterRequest.swift index 34f94f8748..719341a3db 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/SignInWithGameCenterRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/SignInWithGameCenterRequest.swift @@ -17,7 +17,6 @@ import Foundation private let kSignInWithGameCenterEndPoint = "signInWithGameCenter" /// The request to sign in with Game Center account -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SignInWithGameCenterRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = SignInWithGameCenterResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/SignUpNewUserRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/SignUpNewUserRequest.swift index 68cfe6b5e3..dd434a0c8b 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/SignUpNewUserRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/SignUpNewUserRequest.swift @@ -44,7 +44,6 @@ private let kReturnSecureTokenKey = "returnSecureToken" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SignUpNewUserRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = SignUpNewUserResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionRequest.swift index 30c924ff40..05593c9e65 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionRequest.swift @@ -79,7 +79,6 @@ private let kLastNameKey = "lastName" /// Represents the parameters for the verifyAssertion endpoint. /// See https://developers.google.com/identity/toolkit/web/reference/relyingparty/verifyAssertion -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyAssertionRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = VerifyAssertionResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyCustomTokenRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyCustomTokenRequest.swift index b8a9727890..eee3c9bd16 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyCustomTokenRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyCustomTokenRequest.swift @@ -26,7 +26,6 @@ private let kReturnSecureTokenKey = "returnSecureToken" /// The key for the tenant id value in the request. private let kTenantIDKey = "tenantId" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyCustomTokenRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = VerifyCustomTokenResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPasswordRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPasswordRequest.swift index 4c1096d5fb..3c62d023b1 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPasswordRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPasswordRequest.swift @@ -46,7 +46,6 @@ private let kTenantIDKey = "tenantId" /// Represents the parameters for the verifyPassword endpoint. /// See https: // developers.google.com/identity/toolkit/web/reference/relyingparty/verifyPassword -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyPasswordRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = VerifyPasswordResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPhoneNumberRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPhoneNumberRequest.swift index 07ddf16752..c6c9637542 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPhoneNumberRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/VerifyPhoneNumberRequest.swift @@ -56,7 +56,6 @@ extension AuthOperationType { } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyPhoneNumberRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = VerifyPhoneNumberResponse diff --git a/FirebaseAuth/Sources/Swift/Backend/VerifyClientRequest.swift b/FirebaseAuth/Sources/Swift/Backend/VerifyClientRequest.swift index 5821fc55c7..076a1e628c 100644 --- a/FirebaseAuth/Sources/Swift/Backend/VerifyClientRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/VerifyClientRequest.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyClientRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = VerifyClientResponse diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift index e227117c98..aa5510b64e 100644 --- a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift +++ b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift @@ -16,14 +16,12 @@ import Foundation #if os(iOS) || os(macOS) - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension MultiFactor: NSSecureCoding {} /// The interface defining the multi factor related properties and operations pertaining to a /// user. /// /// This class is available on iOS and macOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRMultiFactor) open class MultiFactor: NSObject { @objc open var enrolledFactors: [MultiFactorInfo] @@ -43,7 +41,6 @@ import Foundation /// Get a session for a second factor enrollment operation. /// /// This is used to identify the current user trying to enroll a second factor. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func session() async throws -> MultiFactorSession { return try await withCheckedThrowingContinuation { continuation in self.getSessionWithCompletion { session, error in @@ -166,7 +163,6 @@ import Foundation /// - Parameter assertion: The `MultiFactorAssertion`. /// - Parameter displayName: An optional display name associated with the multi factor to /// enroll. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func enroll(with assertion: MultiFactorAssertion, displayName: String?) async throws { return try await withCheckedThrowingContinuation { continuation in self.enroll(with: assertion, displayName: displayName) { error in @@ -190,7 +186,6 @@ import Foundation } /// Unenroll the given multi factor. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func unenroll(with factorInfo: MultiFactorInfo) async throws { try await unenroll(withFactorUID: factorInfo.uid) } @@ -240,7 +235,6 @@ import Foundation } /// Unenroll the given multi factor. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func unenroll(withFactorUID factorUID: String) async throws { return try await withCheckedThrowingContinuation { continuation in self.unenroll(withFactorUID: factorUID) { error in diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorResolver.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorResolver.swift index 374f86de88..19ca049633 100644 --- a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorResolver.swift +++ b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorResolver.swift @@ -20,7 +20,6 @@ import Foundation /// second factor. /// /// This class is available on iOS and macOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRMultiFactorResolver) open class MultiFactorResolver: NSObject { /// The opaque session identifier for the current sign-in flow. @@ -92,7 +91,6 @@ import Foundation /// A helper function to help users complete sign in with a second factor using a /// - Parameter assertion: The assertion confirming the user successfully /// completed the second factor challenge. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func resolveSignIn(with assertion: MultiFactorAssertion) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in self.resolveSignIn(with: assertion) { result, error in diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorSession.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorSession.swift index d22578a291..195a75bcb0 100644 --- a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorSession.swift +++ b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorSession.swift @@ -24,7 +24,6 @@ import Foundation /// existing user, notably the confirmation that the user passed the first factor challenge. /// /// This class is available on iOS and macOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRMultiFactorSession) open class MultiFactorSession: NSObject { /// The ID token for an enroll flow. This has to be retrieved after recent authentication. let idToken: String? diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorAssertion.swift b/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorAssertion.swift index 941b0c244f..78188dd6aa 100644 --- a/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorAssertion.swift +++ b/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorAssertion.swift @@ -20,7 +20,6 @@ import Foundation /// second factor. /// /// This class is available on iOS and macOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRPhoneMultiFactorAssertion) open class PhoneMultiFactorAssertion: MultiFactorAssertion { var authCredential: PhoneAuthCredential? diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorGenerator.swift b/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorGenerator.swift index 74c50abfb9..3a49eb1cf8 100644 --- a/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorGenerator.swift +++ b/FirebaseAuth/Sources/Swift/MultiFactor/Phone/PhoneMultiFactorGenerator.swift @@ -22,7 +22,6 @@ import Foundation /// Depending on the type of second factor, this will help generate the assertion. /// /// This class is available on iOS and macOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRPhoneMultiFactorGenerator) open class PhoneMultiFactorGenerator: NSObject { /// Initializes the MFA assertion to confirm ownership of the phone second factor. diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/TOTP/TOTPMultiFactorGenerator.swift b/FirebaseAuth/Sources/Swift/MultiFactor/TOTP/TOTPMultiFactorGenerator.swift index c24dedb3b2..14e362ac7a 100644 --- a/FirebaseAuth/Sources/Swift/MultiFactor/TOTP/TOTPMultiFactorGenerator.swift +++ b/FirebaseAuth/Sources/Swift/MultiFactor/TOTP/TOTPMultiFactorGenerator.swift @@ -21,7 +21,6 @@ import Foundation /// the assertion. /// /// This class is available on iOS and macOS. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRTOTPMultiFactorGenerator) open class TOTPMultiFactorGenerator: NSObject { /// Creates a TOTP secret as part of enrolling a TOTP second factor. Used for generating a /// QR code URL or inputting into a TOTP app. This method uses the auth instance corresponding @@ -69,10 +68,9 @@ import Foundation /// Creates a TOTP secret as part of enrolling a TOTP second factor. /// /// Used for generating a QR code URL or inputting into a TOTP app. This - /// method uses the auth instance correspondingto the user in the multiFactorSession. + /// method uses the auth instance corresponding to the user in the multiFactorSession. /// - Parameter session: The multiFactorSession instance. /// - Returns: The TOTP secret. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open class func generateSecret(with session: MultiFactorSession) async throws -> TOTPSecret { return try await withCheckedThrowingContinuation { continuation in self.generateSecret(with: session) { secret, error in diff --git a/FirebaseAuth/Sources/Swift/Storage/AuthKeychainServices.swift b/FirebaseAuth/Sources/Swift/Storage/AuthKeychainServices.swift index fb3004da26..b9ab31b6bf 100644 --- a/FirebaseAuth/Sources/Swift/Storage/AuthKeychainServices.swift +++ b/FirebaseAuth/Sources/Swift/Storage/AuthKeychainServices.swift @@ -22,7 +22,6 @@ import Foundation private let kAccountPrefix = "firebase_auth_1_" /// The utility class to manipulate data in iOS Keychain. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class AuthKeychainServices: Sendable { /// The name of the keychain service. private let service: String diff --git a/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorage.swift b/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorage.swift index a5e0689d6e..78486616bc 100644 --- a/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorage.swift +++ b/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorage.swift @@ -16,7 +16,6 @@ import Foundation /// Protocol to manage keychain updates. Tests can do a fake implementation. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) protocol AuthKeychainStorage: Sendable { func get(query: [String: Any], result: inout AnyObject?) -> OSStatus func add(query: [String: Any]) -> OSStatus diff --git a/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorageReal.swift b/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorageReal.swift index c2f4d762fc..4286474b31 100644 --- a/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorageReal.swift +++ b/FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorageReal.swift @@ -15,7 +15,6 @@ import Foundation /// The utility class to update the real keychain -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class AuthKeychainStorageReal: AuthKeychainStorage { static let shared: AuthKeychainStorageReal = .init() diff --git a/FirebaseAuth/Sources/Swift/SystemService/AuthAPNSTokenManager.swift b/FirebaseAuth/Sources/Swift/SystemService/AuthAPNSTokenManager.swift index f7da822342..c444217fb3 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/AuthAPNSTokenManager.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/AuthAPNSTokenManager.swift @@ -30,7 +30,6 @@ extension UIApplication: AuthAPNSTokenApplication {} /// A class to manage APNs token in memory. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAPNSTokenManager: @unchecked Sendable /* TODO: sendable */ { /// The timeout for registering for remote notification. /// diff --git a/FirebaseAuth/Sources/Swift/SystemService/AuthAppCredentialManager.swift b/FirebaseAuth/Sources/Swift/SystemService/AuthAppCredentialManager.swift index a513dd1cbb..a2951986a6 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/AuthAppCredentialManager.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/AuthAppCredentialManager.swift @@ -16,7 +16,6 @@ import Foundation /// A class to manage app credentials backed by iOS Keychain. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAppCredentialManager { let kKeychainDataKey = "app_credentials" let kFullCredentialKey = "full_credential" diff --git a/FirebaseAuth/Sources/Swift/SystemService/AuthNotificationManager.swift b/FirebaseAuth/Sources/Swift/SystemService/AuthNotificationManager.swift index 94b0960f53..a910cd62f2 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/AuthNotificationManager.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/AuthNotificationManager.swift @@ -17,7 +17,6 @@ import UIKit /// A class represents a credential that proves the identity of the app. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @preconcurrency class AuthNotificationManager { /// The key to locate payload data in the remote notification. diff --git a/FirebaseAuth/Sources/Swift/SystemService/AuthStoredUserManager.swift b/FirebaseAuth/Sources/Swift/SystemService/AuthStoredUserManager.swift index 2fe9d3de38..e0b52c728a 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/AuthStoredUserManager.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/AuthStoredUserManager.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthStoredUserManager { /// Key of user access group stored in user defaults. Used for retrieve the /// user access group at launch. diff --git a/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift b/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift index 17da597043..bc013b3ae1 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift @@ -17,7 +17,6 @@ import Foundation private let kFiveMinutes = 5 * 60.0 -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) actor SecureTokenServiceInternal { /// Coalescer to deduplicate concurrent token refresh requests. /// When multiple requests arrive at the same time, only one network call is made. @@ -130,7 +129,6 @@ actor SecureTokenServiceInternal { } /// A class represents a credential that proves the identity of the app. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRSecureTokenService) // objc Needed for decoding old versions final class SecureTokenService: NSObject, NSSecureCoding, Sendable { /// Internal actor to enforce serialization diff --git a/FirebaseAuth/Sources/Swift/SystemService/TokenRefreshCoalescer.swift b/FirebaseAuth/Sources/Swift/SystemService/TokenRefreshCoalescer.swift index abcc60f499..0ce4a22364 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/TokenRefreshCoalescer.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/TokenRefreshCoalescer.swift @@ -33,7 +33,6 @@ import Foundation /// /// // Only ONE network call is made. All three tasks receive the same refreshed token. /// ``` -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) actor TokenRefreshCoalescer { /// The in-flight token refresh task, if any. /// When this is set, all concurrent calls wait for this task instead of starting their own. diff --git a/FirebaseAuth/Sources/Swift/User/User.swift b/FirebaseAuth/Sources/Swift/User/User.swift index 3081d9e55d..5fdccb6282 100644 --- a/FirebaseAuth/Sources/Swift/User/User.swift +++ b/FirebaseAuth/Sources/Swift/User/User.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension User: NSSecureCoding {} /// Represents a user. @@ -26,7 +25,6 @@ extension User: NSSecureCoding {} /// ID token is automatically refreshed. /// /// This class is thread-safe. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRUser) open class User: NSObject, UserInfo { /// Indicates the user represents an anonymous user. @objc public internal(set) var isAnonymous: Bool { @@ -166,7 +164,6 @@ extension User: NSSecureCoding {} message: "`updateEmail` is deprecated and will be removed in a future release. Use sendEmailVerification(beforeUpdatingEmail:) instead." ) #endif // !FIREBASE_CI - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func updateEmail(to email: String) async throws { return try await withCheckedThrowingContinuation { continuation in self.updateEmail(to: email) { error in @@ -226,7 +223,6 @@ extension User: NSSecureCoding {} /// considered too weak. The `NSLocalizedFailureReasonErrorKey` field in the `userInfo` /// dictionary object will contain more detailed explanation that can be shown to the user. /// - Parameter password: The new password for the user. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func updatePassword(to password: String) async throws { return try await withCheckedThrowingContinuation { continuation in self.updatePassword(to: password) { error in @@ -281,7 +277,6 @@ extension User: NSSecureCoding {} /// - Parameter credential: The new phone number credential corresponding to the /// phone number to be added to the Firebase account, if a phone number is already linked to the /// account this new phone number will replace it. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func updatePhoneNumber(_ credential: PhoneAuthCredential) async throws { return try await withCheckedThrowingContinuation { continuation in self.updatePhoneNumber(credential) { error in @@ -340,7 +335,6 @@ extension User: NSSecureCoding {} /// May fail with an `AuthErrorCodeRequiresRecentLogin` error code. In this case /// you should call `reauthenticate(with:)` before re-invoking /// `updateEmail(to:)`. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func reload() async throws { return try await withCheckedThrowingContinuation { continuation in self.reload { error in @@ -459,7 +453,6 @@ extension User: NSSecureCoding {} /// This can be a successful third-party identity provider sign-in, or an email address and /// password. /// - Returns: The `AuthDataResult` after the reauthentication. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func reauthenticate(with credential: AuthCredential) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -511,7 +504,6 @@ extension User: NSSecureCoding {} /// protocol, used for presenting the web context. If nil, a default `AuthUIDelegate` /// will be used. /// - Returns: The `AuthDataResult` after the reauthentication. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func reauthenticate(with provider: FederatedAuthProvider, uiDelegate: AuthUIDelegate?) async throws -> AuthDataResult { @@ -564,7 +556,6 @@ extension User: NSSecureCoding {} /// - Parameter forceRefresh: Forces a token refresh. Useful if the token becomes invalid for some /// reason other than an expiration. /// - Returns: The Firebase authentication token. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func getIDToken(forcingRefresh forceRefresh: Bool = false) async throws -> String { return try await withCheckedThrowingContinuation { continuation in self.getIDTokenForcingRefresh(forceRefresh) { tokenResult, error in @@ -649,7 +640,6 @@ extension User: NSSecureCoding {} /// - Parameter forceRefresh: Forces a token refresh. Useful if the token becomes invalid for some /// reason other than an expiration. /// - Returns: The Firebase authentication token. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func getIDTokenResult(forcingRefresh forceRefresh: Bool = false) async throws -> AuthTokenResult { return try await withCheckedThrowingContinuation { continuation in @@ -747,7 +737,6 @@ extension User: NSSecureCoding {} /// `updatePassword(to:)` on `User`. /// - Parameter credential: The credential for the identity provider. /// - Returns: An `AuthDataResult`. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func link(with credential: AuthCredential) async throws -> AuthDataResult { return try await withCheckedThrowingContinuation { continuation in @@ -797,7 +786,6 @@ extension User: NSSecureCoding {} /// protocol used for presenting the web context. If nil, a default `AuthUIDelegate` /// will be used. /// - Returns: An AuthDataResult. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func link(with provider: FederatedAuthProvider, uiDelegate: AuthUIDelegate?) async throws -> AuthDataResult { @@ -856,7 +844,6 @@ extension User: NSSecureCoding {} /// `reauthenticate(with:)`. /// - Parameter provider: The provider ID of the provider to unlink. /// - Returns: The user. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func unlink(fromProvider provider: String) async throws -> User { return try await userProfileUpdate.unlink(user: self, fromProvider: provider) } @@ -937,7 +924,6 @@ extension User: NSSecureCoding {} /// * `AuthErrorCodeUserNotFound` - Indicates the user account was not found. /// - Parameter actionCodeSettings: An `ActionCodeSettings` object containing settings related to /// handling action codes. The default value is `nil`. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func sendEmailVerification(with actionCodeSettings: ActionCodeSettings? = nil) async throws { return try await withCheckedThrowingContinuation { continuation in self.sendEmailVerification(with: actionCodeSettings) { error in @@ -994,7 +980,6 @@ extension User: NSSecureCoding {} /// operation that requires a recent login from the user. This error indicates the user /// has not signed in recently enough. To resolve, reauthenticate the user by calling /// `reauthenticate(with:)`. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func delete() async throws { return try await withCheckedThrowingContinuation { continuation in self.delete { error in @@ -1059,7 +1044,6 @@ extension User: NSSecureCoding {} /// - Parameter newEmail: The email to be updated to. /// - Parameter actionCodeSettings: An `ActionCodeSettings` object containing settings related to /// handling action codes. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func sendEmailVerification(beforeUpdatingEmail newEmail: String, actionCodeSettings: ActionCodeSettings? = nil) async throws { return try await withCheckedThrowingContinuation { continuation in diff --git a/FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift b/FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift index 8d3b96d0e4..1d7a54dca7 100644 --- a/FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift +++ b/FirebaseAuth/Sources/Swift/User/UserInfoImpl.swift @@ -14,10 +14,8 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension UserInfoImpl: NSSecureCoding {} -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRUserInfoImpl) // objc Needed for decoding old versions class UserInfoImpl: NSObject, UserInfo { /// A convenience factory method for constructing a `UserInfo` instance from data diff --git a/FirebaseAuth/Sources/Swift/User/UserMetadata.swift b/FirebaseAuth/Sources/Swift/User/UserMetadata.swift index fa014ac616..221c9cf63c 100644 --- a/FirebaseAuth/Sources/Swift/User/UserMetadata.swift +++ b/FirebaseAuth/Sources/Swift/User/UserMetadata.swift @@ -14,11 +14,9 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension UserMetadata: NSSecureCoding {} /// A data class representing the metadata corresponding to a Firebase user. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRUserMetadata) open class UserMetadata: NSObject { /// Stores the last sign in date for the corresponding Firebase user. @objc public let lastSignInDate: Date? diff --git a/FirebaseAuth/Sources/Swift/User/UserProfileChangeRequest.swift b/FirebaseAuth/Sources/Swift/User/UserProfileChangeRequest.swift index 493f3d80f9..b7656b4904 100644 --- a/FirebaseAuth/Sources/Swift/User/UserProfileChangeRequest.swift +++ b/FirebaseAuth/Sources/Swift/User/UserProfileChangeRequest.swift @@ -18,7 +18,6 @@ import Foundation /// /// Properties are marked as being part of a profile update when they are set. Setting a /// property value to nil is not the same as leaving the property unassigned. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRUserProfileChangeRequest) open class UserProfileChangeRequest: NSObject { /// The name of the user. @objc open var displayName: String? { @@ -104,7 +103,6 @@ import Foundation /// Commits any pending changes. /// /// This method should only be called once. Once called, property values should not be changed. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func commitChanges() async throws { return try await withCheckedThrowingContinuation { continuation in self.commitChanges { error in diff --git a/FirebaseAuth/Sources/Swift/User/UserProfileUpdate.swift b/FirebaseAuth/Sources/Swift/User/UserProfileUpdate.swift index 8df8ef0f6a..3351549394 100644 --- a/FirebaseAuth/Sources/Swift/User/UserProfileUpdate.swift +++ b/FirebaseAuth/Sources/Swift/User/UserProfileUpdate.swift @@ -15,7 +15,6 @@ import Foundation /// Actor to serialize the update profile calls. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) actor UserProfileUpdate { func link(user: User, with credential: AuthCredential) async throws -> AuthDataResult { let accessToken = try await user.internalGetTokenAsync(backend: user.backend) diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthCondition.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthCondition.swift index da8c9c1639..f215eb8185 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthCondition.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthCondition.swift @@ -15,7 +15,6 @@ import Foundation /// Utility struct to make the execution of one task dependent upon a signal from another task. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) struct AuthCondition { private let waiter: () async -> Void private let stream: AsyncStream.Continuation diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthErrorUtils.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthErrorUtils.swift index 17d76c810a..58dd95506e 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthErrorUtils.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthErrorUtils.swift @@ -30,7 +30,6 @@ private let kURLResponseErrorCodeInternalError = "auth/internal-error" private let kFIRAuthErrorMessageMalformedJWT = "Failed to parse JWT. Check the userInfo dictionary for the full token." -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthErrorUtils { static let internalErrorDomain = "FIRAuthInternalErrorDomain" static let userInfoDeserializedResponseKey = "FIRAuthErrorUserInfoDeserializedResponseKey" diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift index c16175d070..84d6d254fc 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthRecaptchaVerifier.swift @@ -21,7 +21,6 @@ #endif import RecaptchaInterop - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthRecaptchaConfig { var siteKey: String? let enablementStatus: [AuthRecaptchaProvider: AuthRecaptchaEnablementStatus] @@ -33,7 +32,6 @@ } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum AuthRecaptchaEnablementStatus: String, CaseIterable { case enforce = "ENFORCE" case audit = "AUDIT" @@ -43,7 +41,6 @@ var stringValue: String { rawValue } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum AuthRecaptchaProvider: String, CaseIterable { case password = "EMAIL_PASSWORD_PROVIDER" case phone = "PHONE_PROVIDER" @@ -52,7 +49,6 @@ var stringValue: String { rawValue } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum AuthRecaptchaAction: String { case defaultAction case signInWithPassword @@ -66,7 +62,6 @@ var stringValue: String { rawValue } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthRecaptchaVerifier { private(set) weak var auth: Auth? private(set) var agentConfig: AuthRecaptchaConfig? diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift index c59ced1cfe..4b6079e8be 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift @@ -20,7 +20,6 @@ import WebKit /// A Class responsible for presenting URL via SFSafariViewController or WKWebView. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthURLPresenter: NSObject, SFSafariViewControllerDelegate, AuthWebViewControllerDelegate { /// Presents an URL to interact with user. diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthWebUtils.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthWebUtils.swift index 69210b9326..6087e28fbc 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthWebUtils.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthWebUtils.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthWebUtils { static func randomString(withLength length: Int) -> String { var randomString = "" diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthWebView.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthWebView.swift index 8950052112..e759cce7dc 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthWebView.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthWebView.swift @@ -18,7 +18,6 @@ import WebKit /// A class responsible for creating a WKWebView for use within Firebase Auth. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthWebView: UIView { lazy var webView: WKWebView = createWebView() lazy var spinner: UIActivityIndicatorView = createSpinner() diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthWebViewController.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthWebViewController.swift index ee954b0029..99f968806f 100644 --- a/FirebaseAuth/Sources/Swift/Utilities/AuthWebViewController.swift +++ b/FirebaseAuth/Sources/Swift/Utilities/AuthWebViewController.swift @@ -19,7 +19,6 @@ import WebKit /// Defines a delegate for AuthWebViewController - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) protocol AuthWebViewControllerDelegate: AnyObject { /// Notifies the delegate that the web view controller is being cancelled by the user. /// - Parameter webViewController: The web view controller in question. @@ -47,7 +46,6 @@ completion: @escaping (URL?, Error?) -> Void) } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthWebViewController: UIViewController, WKNavigationDelegate { // MARK: - Properties diff --git a/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/FacebookTests.swift b/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/FacebookTests.swift index a4790f0094..8ae4b911f6 100644 --- a/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/FacebookTests.swift +++ b/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/FacebookTests.swift @@ -44,7 +44,6 @@ import XCTest // deleteFacebookTestingAccountbyID(facebookAccountID) // } // -// @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) // func testSignInWithFacebookAsync() async throws { // let auth = Auth.auth() // let userInfoDict = try await createFacebookTestingAccountAsync() @@ -88,7 +87,6 @@ import XCTest // deleteFacebookTestingAccountbyID(facebookAccountID) // } // -// @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) // func testLinkAnonymousAccountToFacebookAccountAsync() async throws { // let auth = Auth.auth() // try await signInAnonymouslyAsync() @@ -147,7 +145,6 @@ import XCTest // return returnValue // } // -// @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 // /// account. @@ -189,7 +186,6 @@ import XCTest // waitForExpectations(timeout: TestsBase.kExpectationsTimeout) // } // -// @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 { // let urltoDeleteTestUser = "https://graph.facebook.com/\(accountID)" diff --git a/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/GoogleTests.swift b/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/GoogleTests.swift index a61215c6b7..b3651acf55 100644 --- a/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/GoogleTests.swift +++ b/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/GoogleTests.swift @@ -37,7 +37,6 @@ class GoogleTests: TestsBase { waitForExpectations(timeout: TestsBase.kExpectationsTimeout) } - @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() @@ -89,7 +88,6 @@ class GoogleTests: TestsBase { /// 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" + diff --git a/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/UserThreadSafetyTests.swift b/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/UserThreadSafetyTests.swift index aa654bbe60..1cd78e4e1e 100644 --- a/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/UserThreadSafetyTests.swift +++ b/FirebaseAuth/Tests/SampleSwift/SwiftApiTests/UserThreadSafetyTests.swift @@ -16,7 +16,6 @@ import FirebaseCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class UserThreadSafetyTests: XCTestCase { // A basic user setup for testing purposes. private func createTestUser() throws -> User { diff --git a/FirebaseAuth/Tests/Unit/AdditionalUserInfoTests.swift b/FirebaseAuth/Tests/Unit/AdditionalUserInfoTests.swift index f6fe96e2c9..fd71c14d44 100644 --- a/FirebaseAuth/Tests/Unit/AdditionalUserInfoTests.swift +++ b/FirebaseAuth/Tests/Unit/AdditionalUserInfoTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AdditionalUserInfoTests: XCTestCase { let kFakeProfile = ["email": "user@mail.com", "given_name": "User", "family_name": "Doe"] let kUserName = "User Doe" diff --git a/FirebaseAuth/Tests/Unit/AuthAPNSTokenManagerTests.swift b/FirebaseAuth/Tests/Unit/AuthAPNSTokenManagerTests.swift index 4cf6f8f29a..36e214f614 100644 --- a/FirebaseAuth/Tests/Unit/AuthAPNSTokenManagerTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthAPNSTokenManagerTests.swift @@ -19,7 +19,6 @@ @testable import FirebaseAuth import FirebaseCoreInternal - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAPNSTokenManagerTests: XCTestCase { private var fakeApplication: FakeApplication? var manager: AuthAPNSTokenManager? diff --git a/FirebaseAuth/Tests/Unit/AuthAPNSTokenTests.swift b/FirebaseAuth/Tests/Unit/AuthAPNSTokenTests.swift index 84d75f67e4..6fcb060391 100644 --- a/FirebaseAuth/Tests/Unit/AuthAPNSTokenTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthAPNSTokenTests.swift @@ -18,7 +18,6 @@ @testable import FirebaseAuth - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAPNSTokenTests: XCTestCase { /** @fn testProperties @brief Tests the properties of the class. diff --git a/FirebaseAuth/Tests/Unit/AuthAppCredentialManagerTests.swift b/FirebaseAuth/Tests/Unit/AuthAppCredentialManagerTests.swift index a0bedde930..a546ee32bb 100644 --- a/FirebaseAuth/Tests/Unit/AuthAppCredentialManagerTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthAppCredentialManagerTests.swift @@ -18,7 +18,6 @@ @testable import FirebaseAuth - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAppCredentialManagerTests: XCTestCase { let kReceipt = "FAKE_RECEIPT" let kVerificationTimeout = 1.0 diff --git a/FirebaseAuth/Tests/Unit/AuthAppCredentialTests.swift b/FirebaseAuth/Tests/Unit/AuthAppCredentialTests.swift index 3d47ed9c78..798ab40b7d 100644 --- a/FirebaseAuth/Tests/Unit/AuthAppCredentialTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthAppCredentialTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAppCredentialTests: XCTestCase { private let kReceipt = "RECEIPT" private let kSecret = "SECRET" diff --git a/FirebaseAuth/Tests/Unit/AuthBackendTests.swift b/FirebaseAuth/Tests/Unit/AuthBackendTests.swift index 73a74691e7..094657537a 100644 --- a/FirebaseAuth/Tests/Unit/AuthBackendTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthBackendTests.swift @@ -26,7 +26,6 @@ import FirebaseCoreExtension private let kFakeAPIKey = "kTestAPIKey" private let kFakeAppID = "kTestFirebaseAppID" -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthBackendTests: RPCBaseTests { let kFakeErrorDomain = "fakeDomain" let kFakeErrorCode = -1 diff --git a/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift b/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift index 57dc9e394c..9dd8427063 100644 --- a/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthDispatcherTests: XCTestCase { let kTestDelay = 0.1 let kMaxDifferenceBetweenTimeIntervals = 0.4 diff --git a/FirebaseAuth/Tests/Unit/AuthKeychainServicesTests.swift b/FirebaseAuth/Tests/Unit/AuthKeychainServicesTests.swift index 4c1e1f2d43..e60073fcdd 100644 --- a/FirebaseAuth/Tests/Unit/AuthKeychainServicesTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthKeychainServicesTests.swift @@ -19,7 +19,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthKeychainServicesTests: XCTestCase { static let accountPrefix = "firebase_auth_1_" static let key = "ACCOUNT" diff --git a/FirebaseAuth/Tests/Unit/AuthLifecycleTests.swift b/FirebaseAuth/Tests/Unit/AuthLifecycleTests.swift index 6c43c93c3e..cc3ce9a4ca 100644 --- a/FirebaseAuth/Tests/Unit/AuthLifecycleTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthLifecycleTests.swift @@ -18,7 +18,6 @@ import XCTest @testable import FirebaseAuth import FirebaseCore -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthLifecycleTests: XCTestCase { private let kFakeAPIKey = "FAKE_API_KEY" private let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000", diff --git a/FirebaseAuth/Tests/Unit/AuthNotificationManagerTests.swift b/FirebaseAuth/Tests/Unit/AuthNotificationManagerTests.swift index ec438e85b4..be0bd73074 100644 --- a/FirebaseAuth/Tests/Unit/AuthNotificationManagerTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthNotificationManagerTests.swift @@ -18,7 +18,6 @@ @testable import FirebaseAuth - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthNotificationManagerTests: XCTestCase { /** @var kReceipt @brief A fake receipt used for testing. diff --git a/FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift b/FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift index a52fd85490..306a79ff6e 100644 --- a/FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift @@ -16,7 +16,6 @@ import FirebaseAuth import Foundation import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class AuthProviderIDTests: XCTestCase { // Verify that AuthProviderID enum values match the class values published for Objective-C // compatibility. diff --git a/FirebaseAuth/Tests/Unit/AuthTests.swift b/FirebaseAuth/Tests/Unit/AuthTests.swift index 5ae1d52210..a206c7c998 100644 --- a/FirebaseAuth/Tests/Unit/AuthTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthTests.swift @@ -20,7 +20,6 @@ import FirebaseAuthInterop import FirebaseCore -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthTests: RPCBaseTests { static let kAccessToken = "TEST_ACCESS_TOKEN" static let kNewAccessToken = "NEW_ACCESS_TOKEN" diff --git a/FirebaseAuth/Tests/Unit/AuthURLPresenterTests.swift b/FirebaseAuth/Tests/Unit/AuthURLPresenterTests.swift index c2da95aa97..a5bb148ba5 100644 --- a/FirebaseAuth/Tests/Unit/AuthURLPresenterTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthURLPresenterTests.swift @@ -21,7 +21,6 @@ import FirebaseCore import SafariServices - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthURLPresenterTests: XCTestCase { /** @fn testFIRAuthURLPresenterNonNilUIDelegate @brief Tests @c FIRAuthURLPresenter class showing UI with a non-nil UIDelegate. diff --git a/FirebaseAuth/Tests/Unit/AuthUseUserAccessGroupTests.swift b/FirebaseAuth/Tests/Unit/AuthUseUserAccessGroupTests.swift index 9deee328ba..25bebb52a7 100644 --- a/FirebaseAuth/Tests/Unit/AuthUseUserAccessGroupTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthUseUserAccessGroupTests.swift @@ -18,7 +18,6 @@ import XCTest @testable import FirebaseAuth import FirebaseCore -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class UseUserAccessGroupTests: RPCBaseTests { static var auth: Auth? diff --git a/FirebaseAuth/Tests/Unit/AuthUserDefaultsTests.swift b/FirebaseAuth/Tests/Unit/AuthUserDefaultsTests.swift index 15d9780bea..cdeb2fdf28 100644 --- a/FirebaseAuth/Tests/Unit/AuthUserDefaultsTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthUserDefaultsTests.swift @@ -18,7 +18,6 @@ import XCTest @testable import FirebaseAuth import FirebaseCore -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthUserDefaultsTests: XCTestCase { let kKey = "ACCOUNT" let kData = "DATA" diff --git a/FirebaseAuth/Tests/Unit/AuthWebUtilsTests.swift b/FirebaseAuth/Tests/Unit/AuthWebUtilsTests.swift index 3353e9e003..d7da925f86 100644 --- a/FirebaseAuth/Tests/Unit/AuthWebUtilsTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthWebUtilsTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthWebUtilsTests: XCTestCase { /** @fn testExtractDomainWithHTTP @brief Test case for extracting the domain from a URL with "http://" scheme. diff --git a/FirebaseAuth/Tests/Unit/CreateAuthURITests.swift b/FirebaseAuth/Tests/Unit/CreateAuthURITests.swift index fde2b4d155..0ea2417834 100644 --- a/FirebaseAuth/Tests/Unit/CreateAuthURITests.swift +++ b/FirebaseAuth/Tests/Unit/CreateAuthURITests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class CreateAuthURITests: RPCBaseTests { /** @var kContinueURITestKey @brief The key for the "continueUri" value in the request. diff --git a/FirebaseAuth/Tests/Unit/DeleteAccountTests.swift b/FirebaseAuth/Tests/Unit/DeleteAccountTests.swift index 5dabf73662..a3cc3d9107 100644 --- a/FirebaseAuth/Tests/Unit/DeleteAccountTests.swift +++ b/FirebaseAuth/Tests/Unit/DeleteAccountTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class DeleteAccountTests: RPCBaseTests { /** @var kLocalIDKey @brief The name of the "localID" property in the request. diff --git a/FirebaseAuth/Tests/Unit/EmailAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/EmailAuthProviderTests.swift index eaf700beeb..3ea9888009 100644 --- a/FirebaseAuth/Tests/Unit/EmailAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/EmailAuthProviderTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FIREmailAuthProviderTests @brief Tests for @c FIREmailAuthProvider */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class EmailAuthProviderTests: XCTestCase { /** @fn testEmailAuthCredentialCodingLink @brief Tests successful archiving and unarchiving of @c EmailAuthCredential. diff --git a/FirebaseAuth/Tests/Unit/EmailLinkSignInTests.swift b/FirebaseAuth/Tests/Unit/EmailLinkSignInTests.swift index 49e9e7dabb..fa433dfc6d 100644 --- a/FirebaseAuth/Tests/Unit/EmailLinkSignInTests.swift +++ b/FirebaseAuth/Tests/Unit/EmailLinkSignInTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class EmailLinkSignInTests: RPCBaseTests { /** @var kTestEmail @brief The key for the "email" value in the request. diff --git a/FirebaseAuth/Tests/Unit/FacebookAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/FacebookAuthProviderTests.swift index a8aed27bcd..6ec93932a7 100644 --- a/FirebaseAuth/Tests/Unit/FacebookAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/FacebookAuthProviderTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FIRFacebookAuthProviderTests @brief Tests for @c FIRFacebookAuthProvider */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class FacebookAuthProviderTests: XCTestCase { /** @fn testCredentialWithToken @brief Tests the @c credentialWithToken method to make sure the credential it produces populates diff --git a/FirebaseAuth/Tests/Unit/Fakes/FakeAuthKeychainStorage.swift b/FirebaseAuth/Tests/Unit/Fakes/FakeAuthKeychainStorage.swift index d40846b988..38596df910 100644 --- a/FirebaseAuth/Tests/Unit/Fakes/FakeAuthKeychainStorage.swift +++ b/FirebaseAuth/Tests/Unit/Fakes/FakeAuthKeychainStorage.swift @@ -18,7 +18,6 @@ import Foundation import XCTest /// The utility class to update the real keychain -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class FakeAuthKeychainStorage: AuthKeychainStorage { // Fake Keychain. It's a dictionary, keyed by service name, for each key-value store dictionary private let fakeKeychain = UnfairLock<[String: [String: Any]]>([:]) diff --git a/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift b/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift index a3e7d12db4..ec3a0cf0f5 100644 --- a/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift +++ b/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift @@ -21,7 +21,6 @@ import XCTest // TODO(ncooke3): Refactor to make checked Sendable. /// An implementation of `AuthBackendRPCIssuerProtocol` which is used to test /// backend request, response, and glue logic. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class FakeBackendRPCIssuer: AuthBackendRPCIssuerProtocol, @unchecked Sendable { /** @property requestURL @brief The URL which was requested. diff --git a/FirebaseAuth/Tests/Unit/FinalizeMFAEnrollmentRequestTests.swift b/FirebaseAuth/Tests/Unit/FinalizeMFAEnrollmentRequestTests.swift index 5e306fa6c1..c129042080 100644 --- a/FirebaseAuth/Tests/Unit/FinalizeMFAEnrollmentRequestTests.swift +++ b/FirebaseAuth/Tests/Unit/FinalizeMFAEnrollmentRequestTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FinalizeMFAEnrollmentRequestTests @brief Tests for @c FinalizeMFAEnrollmentRequest */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class FinalizeMFAEnrollmentRequestTests: RPCBaseTests { let kAPIKey = "APIKey" diff --git a/FirebaseAuth/Tests/Unit/FinalizeMFASignInRequestTests.swift b/FirebaseAuth/Tests/Unit/FinalizeMFASignInRequestTests.swift index 7e7a09180e..08498d565c 100644 --- a/FirebaseAuth/Tests/Unit/FinalizeMFASignInRequestTests.swift +++ b/FirebaseAuth/Tests/Unit/FinalizeMFASignInRequestTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FinalizeMFASignInRequestTests @brief Tests for @c FinalizeMFASignInRequest */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class FinalizeMFASignInRequestTests: RPCBaseTests { let kAPIKey = "APIKey" diff --git a/FirebaseAuth/Tests/Unit/GetAccountInfoTests.swift b/FirebaseAuth/Tests/Unit/GetAccountInfoTests.swift index ec5eba4e2d..6a499262ca 100644 --- a/FirebaseAuth/Tests/Unit/GetAccountInfoTests.swift +++ b/FirebaseAuth/Tests/Unit/GetAccountInfoTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetAccountInfoTests: RPCBaseTests { /** var kTestAccessToken brief testing token. diff --git a/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift b/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift index 362d3fef95..65f4b88744 100644 --- a/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift +++ b/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetOOBConfirmationCodeTests: RPCBaseTests { private let kRequestTypeKey = "requestType" private let kPasswordResetRequestTypeValue = "PASSWORD_RESET" diff --git a/FirebaseAuth/Tests/Unit/GetProjectConfigTests.swift b/FirebaseAuth/Tests/Unit/GetProjectConfigTests.swift index a49e7709fa..90d3a2982e 100644 --- a/FirebaseAuth/Tests/Unit/GetProjectConfigTests.swift +++ b/FirebaseAuth/Tests/Unit/GetProjectConfigTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetProjectConfigTests: RPCBaseTests { /** @var kGetProjectConfigEndPoint @brief The "getProjectConfig" endpoint. diff --git a/FirebaseAuth/Tests/Unit/GetRecaptchaConfigTests.swift b/FirebaseAuth/Tests/Unit/GetRecaptchaConfigTests.swift index bf0b1cd5c3..c47522ae19 100644 --- a/FirebaseAuth/Tests/Unit/GetRecaptchaConfigTests.swift +++ b/FirebaseAuth/Tests/Unit/GetRecaptchaConfigTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetRecaptchaConfigTests: RPCBaseTests { /** @fn testGetRecaptchaConfigRequest @brief Tests get Recaptcha config request. diff --git a/FirebaseAuth/Tests/Unit/GitHubAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/GitHubAuthProviderTests.swift index 241c381ca7..c11fd927a9 100644 --- a/FirebaseAuth/Tests/Unit/GitHubAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/GitHubAuthProviderTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FIRGitHubAuthProviderTests @brief Tests for @c FIRGitHubAuthProvider */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GitHubAuthProviderTests: XCTestCase { /** @fn testCredentialWithToken @brief Tests the @c credentialWithToken method to make sure the credential it produces populates diff --git a/FirebaseAuth/Tests/Unit/GoogleAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/GoogleAuthProviderTests.swift index 419ac6653d..e296ec9053 100644 --- a/FirebaseAuth/Tests/Unit/GoogleAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/GoogleAuthProviderTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FIRGoogleAuthProviderTests @brief Tests for @c FIRGoogleAuthProvider */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GoogleAuthProviderTests: XCTestCase { let kAccessToken = "Token" let kIDToken = "idToken" diff --git a/FirebaseAuth/Tests/Unit/IdentityToolkitRequestTests.swift b/FirebaseAuth/Tests/Unit/IdentityToolkitRequestTests.swift index 441198a4d1..ab8b0194dc 100644 --- a/FirebaseAuth/Tests/Unit/IdentityToolkitRequestTests.swift +++ b/FirebaseAuth/Tests/Unit/IdentityToolkitRequestTests.swift @@ -20,7 +20,6 @@ import FirebaseCore /// @class IdentityToolkitRequestTests /// @brief Tests for @c IdentityToolkitRequest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class IdentityToolkitRequestTests: XCTestCase { let kEndpoint = "endpoint" let kAPIKey = "APIKey" diff --git a/FirebaseAuth/Tests/Unit/MultiFactorResolverTests.swift b/FirebaseAuth/Tests/Unit/MultiFactorResolverTests.swift index 145ed8d679..1a2bd9113b 100644 --- a/FirebaseAuth/Tests/Unit/MultiFactorResolverTests.swift +++ b/FirebaseAuth/Tests/Unit/MultiFactorResolverTests.swift @@ -19,7 +19,6 @@ import XCTest import FirebaseCore #if os(iOS) - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class MultiFactorResolverTests: RPCBaseTests { static var auth: Auth? override class func setUp() { diff --git a/FirebaseAuth/Tests/Unit/OAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/OAuthProviderTests.swift index d4b2b47d6f..bd44d8fe66 100644 --- a/FirebaseAuth/Tests/Unit/OAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/OAuthProviderTests.swift @@ -19,7 +19,6 @@ import XCTest import FirebaseCore #if os(iOS) - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class OAuthProviderTests: RPCBaseTests { static let kFakeAuthorizedDomain = "test.firebaseapp.com" static let kFakeAuthorizedWebDomain = "test.web.app" diff --git a/FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift index e5a3e3bf76..491c44752c 100644 --- a/FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift @@ -21,7 +21,6 @@ import FirebaseCore import SafariServices - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class PhoneAuthProviderTests: RPCBaseTests { static let kFakeAuthorizedDomain = "test.firebaseapp.com" static let kFakeAPIKey = "asdfghjkl" diff --git a/FirebaseAuth/Tests/Unit/RPCBaseTests.swift b/FirebaseAuth/Tests/Unit/RPCBaseTests.swift index 2d70b0276e..ade183ef9b 100644 --- a/FirebaseAuth/Tests/Unit/RPCBaseTests.swift +++ b/FirebaseAuth/Tests/Unit/RPCBaseTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class RPCBaseTests: XCTestCase { let kEmail = "user@company.com" let kFakePassword = "!@#$%^" diff --git a/FirebaseAuth/Tests/Unit/ResetPasswordTests.swift b/FirebaseAuth/Tests/Unit/ResetPasswordTests.swift index bb28a9cfa1..f9a9f8d903 100644 --- a/FirebaseAuth/Tests/Unit/ResetPasswordTests.swift +++ b/FirebaseAuth/Tests/Unit/ResetPasswordTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class ResetPasswordTests: RPCBaseTests { let kTestOOBCode = "OOBCode" let kTestNewPassword = "newPassword:-)" diff --git a/FirebaseAuth/Tests/Unit/RevokeTokenTests.swift b/FirebaseAuth/Tests/Unit/RevokeTokenTests.swift index 8fab2237e4..0cdc4a9459 100644 --- a/FirebaseAuth/Tests/Unit/RevokeTokenTests.swift +++ b/FirebaseAuth/Tests/Unit/RevokeTokenTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class RevokeTokenTests: RPCBaseTests { private let kAPPTokenKey = "appToken" private let kFakeAppToken = "kAPPTokenKey" diff --git a/FirebaseAuth/Tests/Unit/SecureTokenRequestTests.swift b/FirebaseAuth/Tests/Unit/SecureTokenRequestTests.swift index 8d6b38a7f3..9ff4ab9002 100644 --- a/FirebaseAuth/Tests/Unit/SecureTokenRequestTests.swift +++ b/FirebaseAuth/Tests/Unit/SecureTokenRequestTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class SecureTokenRequestTests @brief Tests for @c SecureTokenRequest */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SecureTokenRequestTests: XCTestCase { let kAPIKey = "APIKey" let kEmulatorHostAndPort = "emulatorhost:12345" diff --git a/FirebaseAuth/Tests/Unit/SecureTokenTests.swift b/FirebaseAuth/Tests/Unit/SecureTokenTests.swift index d906bbd533..796267c34a 100644 --- a/FirebaseAuth/Tests/Unit/SecureTokenTests.swift +++ b/FirebaseAuth/Tests/Unit/SecureTokenTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SecureTokenTests: RPCBaseTests { private let kEmulatorHostAndPort = "emulatorhost:12345" diff --git a/FirebaseAuth/Tests/Unit/SendVerificationCodeTests.swift b/FirebaseAuth/Tests/Unit/SendVerificationCodeTests.swift index e92bdf40f2..6ccf280198 100644 --- a/FirebaseAuth/Tests/Unit/SendVerificationCodeTests.swift +++ b/FirebaseAuth/Tests/Unit/SendVerificationCodeTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SendVerificationCodeTests: RPCBaseTests { private let kTestSecret = "secret" private let kTestReceipt = "receipt" diff --git a/FirebaseAuth/Tests/Unit/SetAccountInfoTests.swift b/FirebaseAuth/Tests/Unit/SetAccountInfoTests.swift index b3ccb3e8ad..7d9d8cb8dc 100644 --- a/FirebaseAuth/Tests/Unit/SetAccountInfoTests.swift +++ b/FirebaseAuth/Tests/Unit/SetAccountInfoTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SetAccountInfoTests: RPCBaseTests { func testSetAccountInfoRequest() async throws { let kExpectedAPIURL = diff --git a/FirebaseAuth/Tests/Unit/SignInWithGameCenterTests.swift b/FirebaseAuth/Tests/Unit/SignInWithGameCenterTests.swift index 989e436c57..585525d3c7 100644 --- a/FirebaseAuth/Tests/Unit/SignInWithGameCenterTests.swift +++ b/FirebaseAuth/Tests/Unit/SignInWithGameCenterTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SignInWithGameCenterTests: RPCBaseTests { private let kEmailKey = "email" private let kTestEmail = "testgmail.com" diff --git a/FirebaseAuth/Tests/Unit/SignUpNewUserTests.swift b/FirebaseAuth/Tests/Unit/SignUpNewUserTests.swift index 01c76eaf19..4cd9174f71 100644 --- a/FirebaseAuth/Tests/Unit/SignUpNewUserTests.swift +++ b/FirebaseAuth/Tests/Unit/SignUpNewUserTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class SignUpNewUserTests: RPCBaseTests { private let kEmailKey = "email" private let kTestEmail = "testgmail.com" diff --git a/FirebaseAuth/Tests/Unit/StartMFAEnrollmentRequestTests.swift b/FirebaseAuth/Tests/Unit/StartMFAEnrollmentRequestTests.swift index bde8558031..eeeff0e40e 100644 --- a/FirebaseAuth/Tests/Unit/StartMFAEnrollmentRequestTests.swift +++ b/FirebaseAuth/Tests/Unit/StartMFAEnrollmentRequestTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class StartMFAEnrollmentRequestTests @brief Tests for @c StartMFAEnrollmentRequest */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StartMFAEnrollmentRequestTests: RPCBaseTests { let kAPIKey = "APIKey" let kIDToken = "idToken" diff --git a/FirebaseAuth/Tests/Unit/StartMFASignInRequestTests.swift b/FirebaseAuth/Tests/Unit/StartMFASignInRequestTests.swift index 837273c403..111cfab1e8 100644 --- a/FirebaseAuth/Tests/Unit/StartMFASignInRequestTests.swift +++ b/FirebaseAuth/Tests/Unit/StartMFASignInRequestTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class StartMFASignInRequestTests @brief Tests for @c StartMFASignInRequest */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StartMFASignInRequestTests: RPCBaseTests { let kAPIKey = "APIKey" let kMfaEnrollmentId = "mfaEnrollmentId" diff --git a/FirebaseAuth/Tests/Unit/SwiftAPI.swift b/FirebaseAuth/Tests/Unit/SwiftAPI.swift index fc6c2f466d..817a890d27 100644 --- a/FirebaseAuth/Tests/Unit/SwiftAPI.swift +++ b/FirebaseAuth/Tests/Unit/SwiftAPI.swift @@ -26,7 +26,6 @@ import FirebaseCore /// This file tests public methods and enums. Each function maps to a public header file. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AuthAPI_hOnlyTests: XCTestCase { // Each function corresponds with a public header. func FIRActionCodeSettings_h() { @@ -46,7 +45,6 @@ class AuthAPI_hOnlyTests: XCTestCase { codeSettings.linkDomain = "" } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRAuthAdditionalUserInfo_h(credential: AuthCredential) async throws { let auth = FirebaseAuth.Auth.auth() let user = auth.currentUser! @@ -59,7 +57,6 @@ class AuthAPI_hOnlyTests: XCTestCase { let _: String = additionalUserInfo.username {} } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func ActionCodeOperationTests() async throws { let auth = FirebaseAuth.Auth.auth() let info = try await auth.checkActionCode("code") @@ -165,7 +162,6 @@ class AuthAPI_hOnlyTests: XCTestCase { } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRAuth_hAsync(credential: AuthCredential) async throws { let auth = FirebaseAuth.Auth.auth() let user = auth.currentUser! @@ -344,8 +340,7 @@ class AuthAPI_hOnlyTests: XCTestCase { } #if os(iOS) - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) - func FIRFedederatedAuthProvider_hAsync() async throws { + func FIRFederatedAuthProvider_hAsync() async throws { class FederatedAuthImplementation: NSObject, FederatedAuthProvider { // TODO: Document this API breakage - needing to add this function for classes implementing // FederatedAuthProvider. @@ -363,8 +358,7 @@ class AuthAPI_hOnlyTests: XCTestCase { return FacebookAuthProvider.credential(withAccessToken: "token") } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) - func FIRFedederatedAuthProvider_hAsync() async throws { + func FIRFederatedAuthProvider_hAsync() async throws { let obj = FederatedAuthImplementation() _ = try await obj.credential(with: nil) } @@ -377,7 +371,6 @@ class AuthAPI_hOnlyTests: XCTestCase { } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRGameCenterAuthProvider_hAsync() async throws { _ = try await GameCenterAuthProvider.getCredential() } @@ -410,7 +403,6 @@ class AuthAPI_hOnlyTests: XCTestCase { let _: [MultiFactorInfo] = obj.enrolledFactors } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRMultiFactor_hAsync(obj: MultiFactor) async throws { let provider = PhoneAuthProvider.provider(auth: FirebaseAuth.Auth.auth()) let credential = provider.credential(withVerificationID: "id", @@ -451,7 +443,6 @@ class AuthAPI_hOnlyTests: XCTestCase { } } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRMultiFactorResolver_hAsync(error: NSError) async throws { let provider = PhoneAuthProvider.provider(auth: FirebaseAuth.Auth.auth()) let credential = provider.credential(withVerificationID: "id", @@ -499,7 +490,6 @@ class AuthAPI_hOnlyTests: XCTestCase { let _: [String: String] = provider.customParameters {} } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIROAuthProvider_h() async throws { let provider = OAuthProvider(providerID: "abc") #if os(iOS) @@ -528,7 +518,6 @@ class AuthAPI_hOnlyTests: XCTestCase { _ = provider.credential(withVerificationID: "id", verificationCode: "code") } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRPhoneAuthProvider_hAsync(mfi: PhoneMultiFactorInfo) async throws { _ = PhoneAuthProvider.provider() let provider = PhoneAuthProvider.provider(auth: FirebaseAuth.Auth.auth()) @@ -568,7 +557,6 @@ class AuthAPI_hOnlyTests: XCTestCase { ) } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRTOTPMultiFactorGenerator_hAsync(session: MultiFactorSession) async throws { _ = try await TOTPMultiFactorGenerator.generateSecret(with: session) } @@ -649,7 +637,6 @@ class AuthAPI_hOnlyTests: XCTestCase { let _: URL = changeRequest.photoURL {} } - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func FIRUser_hAsync() async throws { let auth = FirebaseAuth.Auth.auth() let user = auth.currentUser! diff --git a/FirebaseAuth/Tests/Unit/TokenRefreshCoalescerTests.swift b/FirebaseAuth/Tests/Unit/TokenRefreshCoalescerTests.swift index 128b92fb1e..b48988f0df 100644 --- a/FirebaseAuth/Tests/Unit/TokenRefreshCoalescerTests.swift +++ b/FirebaseAuth/Tests/Unit/TokenRefreshCoalescerTests.swift @@ -21,7 +21,6 @@ actor Counter { func value() -> Int { valueInternal } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class TokenRefreshCoalescerTests: XCTestCase { /// Tests that when multiple concurrent refresh requests arrive for the same token, /// only ONE network call is made. diff --git a/FirebaseAuth/Tests/Unit/TwitterAuthProviderTests.swift b/FirebaseAuth/Tests/Unit/TwitterAuthProviderTests.swift index d48ea0c240..b0da9fd6c3 100644 --- a/FirebaseAuth/Tests/Unit/TwitterAuthProviderTests.swift +++ b/FirebaseAuth/Tests/Unit/TwitterAuthProviderTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FIRTwitterAuthProviderTests @brief Tests for @c FIRTwitterAuthProvider */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class TwitterAuthProviderTests: XCTestCase { /** @fn testCredentialWithToken @brief Tests the @c credentialWithToken method to make sure the credential it produces populates diff --git a/FirebaseAuth/Tests/Unit/UserMetadataTests.swift b/FirebaseAuth/Tests/Unit/UserMetadataTests.swift index 42be2742fc..d5f0058af9 100644 --- a/FirebaseAuth/Tests/Unit/UserMetadataTests.swift +++ b/FirebaseAuth/Tests/Unit/UserMetadataTests.swift @@ -20,7 +20,6 @@ import XCTest /** @class FIRUserMetadataTests @brief Tests for @c FIRUserMetadata. */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class UserMetadataTests: XCTestCase { let kCreationDateTimeIntervalInSeconds: TimeInterval = 1_505_858_500 let kLastSignInDateTimeIntervalInSeconds: TimeInterval = 1_505_858_583 diff --git a/FirebaseAuth/Tests/Unit/UserTests.swift b/FirebaseAuth/Tests/Unit/UserTests.swift index 24f426d1bd..fec9a0dc68 100644 --- a/FirebaseAuth/Tests/Unit/UserTests.swift +++ b/FirebaseAuth/Tests/Unit/UserTests.swift @@ -18,7 +18,6 @@ import XCTest @testable import FirebaseAuth import FirebaseCore -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class UserTests: RPCBaseTests { static let kFakeAPIKey = "FAKE_API_KEY" let kFacebookAccessToken = "FACEBOOK_ACCESS_TOKEN" diff --git a/FirebaseAuth/Tests/Unit/VerifyAssertionTests.swift b/FirebaseAuth/Tests/Unit/VerifyAssertionTests.swift index c8b58bcd60..b6d2d17dfa 100644 --- a/FirebaseAuth/Tests/Unit/VerifyAssertionTests.swift +++ b/FirebaseAuth/Tests/Unit/VerifyAssertionTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyAssertionTests: RPCBaseTests { private let kTestProviderID = "ProviderID" private let kProviderIDKey = "providerId" diff --git a/FirebaseAuth/Tests/Unit/VerifyClientTests.swift b/FirebaseAuth/Tests/Unit/VerifyClientTests.swift index e501069633..30422b1162 100644 --- a/FirebaseAuth/Tests/Unit/VerifyClientTests.swift +++ b/FirebaseAuth/Tests/Unit/VerifyClientTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyClientTests: RPCBaseTests { private let kAPPTokenKey = "appToken" private let kFakeAppToken = "kAPPTokenKey" diff --git a/FirebaseAuth/Tests/Unit/VerifyCustomTokenTests.swift b/FirebaseAuth/Tests/Unit/VerifyCustomTokenTests.swift index a40e00a51b..690b0ae093 100644 --- a/FirebaseAuth/Tests/Unit/VerifyCustomTokenTests.swift +++ b/FirebaseAuth/Tests/Unit/VerifyCustomTokenTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyCustomTokenTests: RPCBaseTests { private let kTestTokenKey = "token" private let kTestToken = "test token" diff --git a/FirebaseAuth/Tests/Unit/VerifyPasswordTests.swift b/FirebaseAuth/Tests/Unit/VerifyPasswordTests.swift index 9f93d86daa..2515ace0d9 100644 --- a/FirebaseAuth/Tests/Unit/VerifyPasswordTests.swift +++ b/FirebaseAuth/Tests/Unit/VerifyPasswordTests.swift @@ -17,7 +17,6 @@ import XCTest @testable import FirebaseAuth -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyPasswordTests: RPCBaseTests { let kTestOOBCode = "OOBCode" let kTestEmail = "testEmail." diff --git a/FirebaseAuth/Tests/Unit/VerifyPhoneNumberTests.swift b/FirebaseAuth/Tests/Unit/VerifyPhoneNumberTests.swift index 10831736a5..0fc0527218 100644 --- a/FirebaseAuth/Tests/Unit/VerifyPhoneNumberTests.swift +++ b/FirebaseAuth/Tests/Unit/VerifyPhoneNumberTests.swift @@ -18,7 +18,6 @@ import XCTest @testable import FirebaseAuth #if os(iOS) - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class VerifyPhoneNumberTests: RPCBaseTests { private let kVerificationCode = "12345678" private let kVerificationID = "55432" diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index 0cbcea1043..b3b4da7c3c 100644 --- a/FirebaseCore/Sources/FIRApp.m +++ b/FirebaseCore/Sources/FIRApp.m @@ -832,16 +832,7 @@ static FIRApp *sDefaultApp; #elif TARGET_OS_OSX NSNotificationName notificationName = NSApplicationDidBecomeActiveNotification; #elif TARGET_OS_WATCH - // TODO(ncooke3): Remove when minimum supported watchOS version is watchOS 7.0. - // On watchOS 7.0+, heartbeats are logged when the watch app becomes active. - // On watchOS 6.0, heartbeats are logged when the Firebase app is configuring. - // While it does not cover all use cases, logging when the Firebase app is - // configuring is done because watchOS lifecycle notifications are a - // watchOS 7.0+ feature. - NSNotificationName notificationName = kFIRAppReadyToConfigureSDKNotification; - if (@available(watchOS 7.0, *)) { - notificationName = WKApplicationDidBecomeActiveNotification; - } + NSNotificationName notificationName = WKApplicationDidBecomeActiveNotification; #endif [[NSNotificationCenter defaultCenter] addObserver:self diff --git a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m index cde7c1a72f..c90cc6629d 100644 --- a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m +++ b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m @@ -113,18 +113,16 @@ static NSString *const kGoogleAppIDHeader = @"X-Firebase-GMPID"; [session webSocketTaskWithRequest:req]; self.webSocketTask = task; - if (@available(watchOS 7.0, *)) { - [[NSNotificationCenter defaultCenter] - addObserverForName:WKApplicationWillResignActiveNotification - object:nil - queue:opQueue - usingBlock:^(NSNotification *_Nonnull note) { - FFLog(@"I-RDB083015", - @"Received watchOS background notification, " - @"closing web socket."); - [self onClosed]; - }]; - } + [[NSNotificationCenter defaultCenter] + addObserverForName:WKApplicationWillResignActiveNotification + object:nil + queue:opQueue + usingBlock:^(NSNotification *_Nonnull note) { + FFLog(@"I-RDB083015", + @"Received watchOS background notification, " + @"closing web socket."); + [self onClosed]; + }]; #else // TODO(mmaksym): Remove googleAppID and userAgent from FSRWebSocket as // they are passed via NSURLRequest. diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m index 0a98ce0f34..95a7849b4f 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m @@ -95,12 +95,10 @@ static NSString *const kEventExtensionJson = @"extension_js"; selector:@selector(appWillBecomeInactive:) name:UIApplicationWillResignActiveNotification object:nil]; - if (@available(iOS 13.0, tvOS 13.0, *)) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appWillBecomeInactive:) - name:UISceneWillDeactivateNotification - object:nil]; - } + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(appWillBecomeInactive:) + name:UISceneWillDeactivateNotification + object:nil]; @try { [self loadFromCachePath:cachePath]; diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m index 6a4fad0808..ebe5aa8638 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m @@ -102,12 +102,10 @@ static NSString *FIRIAM_UserDefaultsKeyForNextValidClearcutUploadTimeInMills = selector:@selector(scheduleNextSendFromForeground:) name:UIApplicationWillEnterForegroundNotification object:nil]; - if (@available(iOS 13.0, tvOS 13.0, *)) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(scheduleNextSendFromForeground:) - name:UISceneWillEnterForegroundNotification - object:nil]; - } + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(scheduleNextSendFromForeground:) + name:UISceneWillEnterForegroundNotification + object:nil]; _userDefaults = userDefaults ? userDefaults : [GULUserDefaults standardUserDefaults]; // it would be 0 if it does not exist, which is equivalent to saying that // you can send now diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m b/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m index 50957cec8e..f05eb2d92b 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m +++ b/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m @@ -66,11 +66,9 @@ NSString *const kFIRMessagingKeychainWildcardIdentifier = @"*"; finalQuery[(__bridge NSString *)kSecAttrService] = service; } - if (@available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, watchOS 6.0, *)) { - // Ensures that the keychain query behaves the same across all platforms. - // See go/firebase-macos-keychain-popups for details. - finalQuery[(__bridge id)kSecUseDataProtectionKeychain] = (__bridge id)kCFBooleanTrue; - } + // Ensures that the keychain query behaves the same across all platforms. + // See go/firebase-macos-keychain-popups for details. + finalQuery[(__bridge id)kSecUseDataProtectionKeychain] = (__bridge id)kCFBooleanTrue; return finalQuery; } diff --git a/FirebaseMessaging/Tests/UnitTestsSwift/FIRMessagingAPITest.swift b/FirebaseMessaging/Tests/UnitTestsSwift/FIRMessagingAPITest.swift index 8705e09a07..268459332b 100644 --- a/FirebaseMessaging/Tests/UnitTestsSwift/FIRMessagingAPITest.swift +++ b/FirebaseMessaging/Tests/UnitTestsSwift/FIRMessagingAPITest.swift @@ -123,7 +123,6 @@ class CustomDelegate: NSObject, MessagingDelegate { func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {} } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) func apiAsync() async throws { let messaging = Messaging.messaging() let topic = "cat_video" diff --git a/FirebaseRemoteConfig/Swift/CustomSignals.swift b/FirebaseRemoteConfig/Swift/CustomSignals.swift index 669d2afc77..41c249f544 100644 --- a/FirebaseRemoteConfig/Swift/CustomSignals.swift +++ b/FirebaseRemoteConfig/Swift/CustomSignals.swift @@ -83,7 +83,6 @@ extension CustomSignalValue: ExpressibleByFloatLiteral { } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) public extension RemoteConfig { /// Sets custom signals for this Remote Config instance. /// - Parameter customSignals: A dictionary mapping string keys to custom diff --git a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/AsyncAwaitTests.swift b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/AsyncAwaitTests.swift index 9f7d8f578c..582e016f01 100644 --- a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/AsyncAwaitTests.swift +++ b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/AsyncAwaitTests.swift @@ -17,7 +17,6 @@ import FirebaseCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class AsyncAwaitTests: APITestBase { func testFetchThenActivate() async throws { let status = try await config.fetch() diff --git a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Codable.swift b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Codable.swift index 3ccacbb75d..bfe14e1ed4 100644 --- a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Codable.swift +++ b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Codable.swift @@ -16,7 +16,6 @@ import FirebaseRemoteConfig import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class CodableTests: APITestBase { // MARK: - Test decoding Remote Config JSON values diff --git a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Value.swift b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Value.swift index d7d7ad8fc0..64f5414752 100644 --- a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Value.swift +++ b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Value.swift @@ -16,7 +16,6 @@ import FirebaseRemoteConfig import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class ValueTests: APITestBase { func testFetchAndActivateAllTypes() async throws { let status = try await config.fetchAndActivate() diff --git a/FirebaseStorage/Sources/AsyncAwait.swift b/FirebaseStorage/Sources/AsyncAwait.swift index cdcea1bec4..9cdf950345 100644 --- a/FirebaseStorage/Sources/AsyncAwait.swift +++ b/FirebaseStorage/Sources/AsyncAwait.swift @@ -14,7 +14,6 @@ import Foundation -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) public extension StorageReference { /// Asynchronously downloads the object at the StorageReference to a Data object in memory. /// A Data object of the provided max size will be allocated, so ensure that the device has diff --git a/FirebaseStorage/Sources/Internal/StorageDeleteTask.swift b/FirebaseStorage/Sources/Internal/StorageDeleteTask.swift index d2917d18c4..454405a36e 100644 --- a/FirebaseStorage/Sources/Internal/StorageDeleteTask.swift +++ b/FirebaseStorage/Sources/Internal/StorageDeleteTask.swift @@ -21,7 +21,6 @@ import Foundation #endif /// Task which provides the ability to delete an object in Firebase Storage. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum StorageDeleteTask { static func deleteTask(reference: StorageReference, queue: DispatchQueue, diff --git a/FirebaseStorage/Sources/Internal/StorageFetcherService.swift b/FirebaseStorage/Sources/Internal/StorageFetcherService.swift index 809d258f87..6364efe310 100644 --- a/FirebaseStorage/Sources/Internal/StorageFetcherService.swift +++ b/FirebaseStorage/Sources/Internal/StorageFetcherService.swift @@ -21,7 +21,6 @@ import Foundation #endif /// Manage Storage's fetcherService -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) actor StorageFetcherService { static let shared = StorageFetcherService() diff --git a/FirebaseStorage/Sources/Internal/StorageGetDownloadURLTask.swift b/FirebaseStorage/Sources/Internal/StorageGetDownloadURLTask.swift index be4e99f406..d0fac4b304 100644 --- a/FirebaseStorage/Sources/Internal/StorageGetDownloadURLTask.swift +++ b/FirebaseStorage/Sources/Internal/StorageGetDownloadURLTask.swift @@ -15,7 +15,6 @@ import Foundation /// Task which provides the ability to get a download URL for an object in Firebase Storage. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum StorageGetDownloadURLTask { static func getDownloadURLTask(reference: StorageReference, queue: DispatchQueue, diff --git a/FirebaseStorage/Sources/Internal/StorageGetMetadataTask.swift b/FirebaseStorage/Sources/Internal/StorageGetMetadataTask.swift index dffbe26c46..bb58eaeb4a 100644 --- a/FirebaseStorage/Sources/Internal/StorageGetMetadataTask.swift +++ b/FirebaseStorage/Sources/Internal/StorageGetMetadataTask.swift @@ -15,7 +15,6 @@ import Foundation /// Task which provides the ability to delete an object in Firebase Storage. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum StorageGetMetadataTask { static func getMetadataTask(reference: StorageReference, queue: DispatchQueue, diff --git a/FirebaseStorage/Sources/Internal/StorageInternalTask.swift b/FirebaseStorage/Sources/Internal/StorageInternalTask.swift index aac100bb5e..537a26ef3b 100644 --- a/FirebaseStorage/Sources/Internal/StorageInternalTask.swift +++ b/FirebaseStorage/Sources/Internal/StorageInternalTask.swift @@ -21,7 +21,6 @@ import Foundation #endif /// Implement StorageTasks that are not directly exposed via the public API. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @preconcurrency class StorageInternalTask: StorageTask { private var fetcher: GTMSessionFetcher? diff --git a/FirebaseStorage/Sources/Internal/StorageListTask.swift b/FirebaseStorage/Sources/Internal/StorageListTask.swift index 8d9369a676..a8cda3d624 100644 --- a/FirebaseStorage/Sources/Internal/StorageListTask.swift +++ b/FirebaseStorage/Sources/Internal/StorageListTask.swift @@ -15,7 +15,6 @@ import Foundation /// A Task that lists the entries under a StorageReference -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum StorageListTask { static func listTask(reference: StorageReference, queue: DispatchQueue, diff --git a/FirebaseStorage/Sources/Internal/StorageTokenAuthorizer.swift b/FirebaseStorage/Sources/Internal/StorageTokenAuthorizer.swift index 3dec3a3872..ebbdb39844 100644 --- a/FirebaseStorage/Sources/Internal/StorageTokenAuthorizer.swift +++ b/FirebaseStorage/Sources/Internal/StorageTokenAuthorizer.swift @@ -25,7 +25,6 @@ internal import FirebaseCoreExtension import GTMSessionFetcherCore #endif -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageTokenAuthorizer: NSObject, GTMSessionFetcherAuthorizer { func authorizeRequest(_ request: NSMutableURLRequest?, completionHandler handler: @escaping (Error?) -> Void) { diff --git a/FirebaseStorage/Sources/Internal/StorageUpdateMetadataTask.swift b/FirebaseStorage/Sources/Internal/StorageUpdateMetadataTask.swift index 12f4924576..6fb5b93742 100644 --- a/FirebaseStorage/Sources/Internal/StorageUpdateMetadataTask.swift +++ b/FirebaseStorage/Sources/Internal/StorageUpdateMetadataTask.swift @@ -15,7 +15,6 @@ import Foundation /// A Task that lists the entries under a StorageReference -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) enum StorageUpdateMetadataTask { static func updateMetadataTask(reference: StorageReference, queue: DispatchQueue, diff --git a/FirebaseStorage/Sources/Internal/StorageUtils.swift b/FirebaseStorage/Sources/Internal/StorageUtils.swift index 6ea83db36a..c0876a6ca4 100644 --- a/FirebaseStorage/Sources/Internal/StorageUtils.swift +++ b/FirebaseStorage/Sources/Internal/StorageUtils.swift @@ -21,7 +21,6 @@ private import UniformTypeIdentifiers import CoreServices #endif // os(iOS) || os(tvOS) -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageUtils { class func defaultRequestForReference(reference: StorageReference, queryParams: [String: String]? = nil) diff --git a/FirebaseStorage/Sources/Result.swift b/FirebaseStorage/Sources/Result.swift index af2f11961a..3a73da64f9 100644 --- a/FirebaseStorage/Sources/Result.swift +++ b/FirebaseStorage/Sources/Result.swift @@ -22,7 +22,6 @@ import Foundation /// an `Error`. /// - Returns: A closure parameterized with an optional generic and optional `Error` to match /// Objective-C APIs. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) private func getResultCallback(completion: @escaping (Result) -> Void) -> (_: T?, _: Error?) -> Void { @@ -39,7 +38,6 @@ private func getResultCallback(completion: @escaping (Result) -> Vo } } -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) public extension StorageReference { /// Asynchronously retrieves a long lived download URL with a revokable token. /// diff --git a/FirebaseStorage/Sources/Storage.swift b/FirebaseStorage/Sources/Storage.swift index cd0b4e24f9..ad93ae1068 100644 --- a/FirebaseStorage/Sources/Storage.swift +++ b/FirebaseStorage/Sources/Storage.swift @@ -31,7 +31,6 @@ internal import FirebaseCoreExtension /// /// If you provide a custom instance of `FirebaseApp`, /// the storage location will be specified via the `FirebaseOptions.storageBucket` property. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorage) open class Storage: NSObject { // MARK: - Public APIs @@ -114,7 +113,6 @@ internal import FirebaseCoreExtension /// Creates a `StorageReference` initialized at the root Firebase Storage location. /// - Returns: An instance of `StorageReference` referencing the root of the storage bucket. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc open func reference() -> StorageReference { configured = true let path = StoragePath(with: storageBucket) @@ -131,7 +129,6 @@ internal import FirebaseCoreExtension /// - Returns: An instance of StorageReference at the given child path. /// - Throws: Throws a fatal error if `url` is not associated with the `FirebaseApp` used to /// initialize this Storage instance. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc open func reference(forURL url: String) -> StorageReference { configured = true do { diff --git a/FirebaseStorage/Sources/StorageDownloadTask.swift b/FirebaseStorage/Sources/StorageDownloadTask.swift index 70a2e64629..c78413ac73 100644 --- a/FirebaseStorage/Sources/StorageDownloadTask.swift +++ b/FirebaseStorage/Sources/StorageDownloadTask.swift @@ -33,7 +33,6 @@ import Foundation * specified `callbackQueue` in Storage, or the main queue if left unspecified. */ @objc(FIRStorageDownloadTask) -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open class StorageDownloadTask: StorageObservableTask, StorageTaskManagement { /** * Prepares a task and begins execution. diff --git a/FirebaseStorage/Sources/StorageError.swift b/FirebaseStorage/Sources/StorageError.swift index fb863afa14..f3e02340a2 100644 --- a/FirebaseStorage/Sources/StorageError.swift +++ b/FirebaseStorage/Sources/StorageError.swift @@ -23,7 +23,6 @@ public let StorageErrorDomain: String = "FIRStorageErrorDomain" * https://cloud.google.com/storage/docs/json_api/v1/status-codes * This is never publicly exposed to end developers (as they will simply see an NSError). */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageErrorCode) public enum StorageErrorCode: Int, Swift.Error { case unknown = -13000 case objectNotFound = -13010 @@ -103,7 +102,6 @@ public let StorageErrorDomain: String = "FIRStorageErrorDomain" } /// Firebase Storage errors -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) public enum StorageError: Error, CustomNSError { case unknown(message: String, serverError: [String: Any]) case objectNotFound(object: String, serverError: [String: Any]) diff --git a/FirebaseStorage/Sources/StorageListResult.swift b/FirebaseStorage/Sources/StorageListResult.swift index 418b3c25f2..b32f62bf0d 100644 --- a/FirebaseStorage/Sources/StorageListResult.swift +++ b/FirebaseStorage/Sources/StorageListResult.swift @@ -15,7 +15,6 @@ import Foundation /** Contains the prefixes and items returned by a `StorageReference.list()` call. */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageListResult) open class StorageListResult: NSObject { /** * The prefixes (folders) returned by a `list()` operation. diff --git a/FirebaseStorage/Sources/StorageMetadata.swift b/FirebaseStorage/Sources/StorageMetadata.swift index d0a53e6945..a2637c0e96 100644 --- a/FirebaseStorage/Sources/StorageMetadata.swift +++ b/FirebaseStorage/Sources/StorageMetadata.swift @@ -22,7 +22,6 @@ import Foundation * and a Storage reference to the object in question. Full documentation can be found in the * [GCS documentation](https://cloud.google.com/storage/docs/json_api/v1/objects#resource) */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageMetadata) open class StorageMetadata: NSObject { // MARK: - Public APIs diff --git a/FirebaseStorage/Sources/StorageObservableTask.swift b/FirebaseStorage/Sources/StorageObservableTask.swift index 4330526496..41fc342ace 100644 --- a/FirebaseStorage/Sources/StorageObservableTask.swift +++ b/FirebaseStorage/Sources/StorageObservableTask.swift @@ -21,7 +21,6 @@ import Foundation * Observers produce a `StorageHandle`, which is used to keep track of and remove specific * observers at a later date. */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageObservableTask) open class StorageObservableTask: StorageTask { /** * Observes changes in the upload status: Resume, Pause, Progress, Success, and Failure. diff --git a/FirebaseStorage/Sources/StorageReference.swift b/FirebaseStorage/Sources/StorageReference.swift index 10524cfdaa..74d5d11bb0 100644 --- a/FirebaseStorage/Sources/StorageReference.swift +++ b/FirebaseStorage/Sources/StorageReference.swift @@ -17,7 +17,6 @@ import Foundation /// `StorageReference` represents a reference to a Google Cloud Storage object. Developers can /// upload and download objects, as well as get/set object metadata, and delete an object at the /// path. See the [Cloud docs](https://cloud.google.com/storage/) for more details. -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageReference) open class StorageReference: NSObject { // MARK: - Public APIs diff --git a/FirebaseStorage/Sources/StorageTask.swift b/FirebaseStorage/Sources/StorageTask.swift index 84bc23fba2..4954ae6953 100644 --- a/FirebaseStorage/Sources/StorageTask.swift +++ b/FirebaseStorage/Sources/StorageTask.swift @@ -29,7 +29,6 @@ import Foundation * If no queue is specified, it defaults to the main queue. * This class is thread-safe. */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageTask) open class StorageTask: NSObject { /** * An immutable view of the task and associated metadata, progress, error, etc. diff --git a/FirebaseStorage/Sources/StorageTaskSnapshot.swift b/FirebaseStorage/Sources/StorageTaskSnapshot.swift index 1d6a019fe5..d7b291b06a 100644 --- a/FirebaseStorage/Sources/StorageTaskSnapshot.swift +++ b/FirebaseStorage/Sources/StorageTaskSnapshot.swift @@ -19,7 +19,6 @@ import Foundation * A snapshot contains a task, storage reference, metadata (if it exists), * progress, and an error (if one occurred). */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageTaskSnapshot) open class StorageTaskSnapshot: NSObject { /** * The task this snapshot represents. diff --git a/FirebaseStorage/Sources/StorageUploadTask.swift b/FirebaseStorage/Sources/StorageUploadTask.swift index 80a25209b4..60d63befcb 100644 --- a/FirebaseStorage/Sources/StorageUploadTask.swift +++ b/FirebaseStorage/Sources/StorageUploadTask.swift @@ -38,7 +38,6 @@ import Foundation * Uploads are performed on a background queue, and callbacks are raised on the developer * specified `callbackQueue` in Storage, or the main queue if unspecified. */ -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRStorageUploadTask) open class StorageUploadTask: StorageObservableTask, StorageTaskManagement { /** diff --git a/FirebaseStorage/Tests/Unit/StorageAPITests.swift b/FirebaseStorage/Tests/Unit/StorageAPITests.swift index 2a6c98516f..8f232be450 100644 --- a/FirebaseStorage/Tests/Unit/StorageAPITests.swift +++ b/FirebaseStorage/Tests/Unit/StorageAPITests.swift @@ -20,7 +20,6 @@ import XCTest import FirebaseCore import FirebaseStorage -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) final class StorageAPITests: XCTestCase { func StorageAPIs() { let app = FirebaseApp.app() diff --git a/FirebaseStorage/Tests/Unit/StorageAuthorizerTests.swift b/FirebaseStorage/Tests/Unit/StorageAuthorizerTests.swift index f5b16cab63..6ba105d669 100644 --- a/FirebaseStorage/Tests/Unit/StorageAuthorizerTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageAuthorizerTests.swift @@ -18,7 +18,6 @@ import GTMSessionFetcherCore import SharedTestUtilities import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageAuthorizerTests: StorageTestHelpers { var appCheckTokenSuccess: FIRAppCheckTokenResultFake! var appCheckTokenError: FIRAppCheckTokenResultFake! diff --git a/FirebaseStorage/Tests/Unit/StorageComponentTests.swift b/FirebaseStorage/Tests/Unit/StorageComponentTests.swift index 6342a15c59..e1f0618d24 100644 --- a/FirebaseStorage/Tests/Unit/StorageComponentTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageComponentTests.swift @@ -23,7 +23,6 @@ import SharedTestUtilities import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageComponentTests: StorageTestHelpers { /// Test that the objc class is available for the component system to update the user agent. func testComponentsBeingRegistered() throws { diff --git a/FirebaseStorage/Tests/Unit/StorageDeleteTests.swift b/FirebaseStorage/Tests/Unit/StorageDeleteTests.swift index 3a1bc9dd85..bee66cb59b 100644 --- a/FirebaseStorage/Tests/Unit/StorageDeleteTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageDeleteTests.swift @@ -17,7 +17,6 @@ import Foundation import GTMSessionFetcherCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageDeleteTests: StorageTestHelpers { func testFetcherConfiguration() async { let testBlock = { (fetcher: GTMSessionFetcher!, diff --git a/FirebaseStorage/Tests/Unit/StorageGetMetadataTests.swift b/FirebaseStorage/Tests/Unit/StorageGetMetadataTests.swift index 96f5e0fe87..448b2791fe 100644 --- a/FirebaseStorage/Tests/Unit/StorageGetMetadataTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageGetMetadataTests.swift @@ -17,7 +17,6 @@ import Foundation import GTMSessionFetcherCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageGetMetadataTests: StorageTestHelpers { func testFetcherConfiguration() async { let testBlock = { (fetcher: GTMSessionFetcher!, diff --git a/FirebaseStorage/Tests/Unit/StorageListTests.swift b/FirebaseStorage/Tests/Unit/StorageListTests.swift index 37140f1262..b40b8b343b 100644 --- a/FirebaseStorage/Tests/Unit/StorageListTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageListTests.swift @@ -17,7 +17,6 @@ import Foundation import GTMSessionFetcherCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageListTests: StorageTestHelpers { func testValidatesInput() { let expectation = self.expectation(description: #function) diff --git a/FirebaseStorage/Tests/Unit/StorageMetadataTests.swift b/FirebaseStorage/Tests/Unit/StorageMetadataTests.swift index a56dd6cedb..9a348e2889 100644 --- a/FirebaseStorage/Tests/Unit/StorageMetadataTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageMetadataTests.swift @@ -19,7 +19,6 @@ import GTMSessionFetcherCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageMetadataTests: StorageTestHelpers { func testInitializeNoMetadata() { let metadata = StorageMetadata(dictionary: [:]) diff --git a/FirebaseStorage/Tests/Unit/StoragePathTests.swift b/FirebaseStorage/Tests/Unit/StoragePathTests.swift index a6106dd42b..3acc075d99 100644 --- a/FirebaseStorage/Tests/Unit/StoragePathTests.swift +++ b/FirebaseStorage/Tests/Unit/StoragePathTests.swift @@ -16,7 +16,6 @@ import Foundation import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StoragePathTests: XCTestCase { func testGSURI() throws { let path = try StoragePath.path(string: "gs://bucket/path/to/object") diff --git a/FirebaseStorage/Tests/Unit/StorageReferenceTests.swift b/FirebaseStorage/Tests/Unit/StorageReferenceTests.swift index 78d3c459db..449900aeed 100644 --- a/FirebaseStorage/Tests/Unit/StorageReferenceTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageReferenceTests.swift @@ -23,7 +23,6 @@ import SharedTestUtilities import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageReferenceTests: XCTestCase { override class func setUp() { let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000", diff --git a/FirebaseStorage/Tests/Unit/StorageTestHelpers.swift b/FirebaseStorage/Tests/Unit/StorageTestHelpers.swift index accda78c68..2009eae6c2 100644 --- a/FirebaseStorage/Tests/Unit/StorageTestHelpers.swift +++ b/FirebaseStorage/Tests/Unit/StorageTestHelpers.swift @@ -20,7 +20,6 @@ import GTMSessionFetcherCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageTestHelpers: XCTestCase { var app: FirebaseApp! diff --git a/FirebaseStorage/Tests/Unit/StorageTests.swift b/FirebaseStorage/Tests/Unit/StorageTests.swift index 3774629426..bbc19194c6 100644 --- a/FirebaseStorage/Tests/Unit/StorageTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageTests.swift @@ -23,7 +23,6 @@ import SharedTestUtilities import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageTests: XCTestCase { override class func setUp() { let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000", diff --git a/FirebaseStorage/Tests/Unit/StorageUpdateMetadataTests.swift b/FirebaseStorage/Tests/Unit/StorageUpdateMetadataTests.swift index 8019ee5bc6..de7659c829 100644 --- a/FirebaseStorage/Tests/Unit/StorageUpdateMetadataTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageUpdateMetadataTests.swift @@ -17,7 +17,6 @@ import Foundation import GTMSessionFetcherCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageUpdateMetadataTests: StorageTestHelpers { var metadata: StorageMetadata! diff --git a/FirebaseStorage/Tests/Unit/StorageUtilsTests.swift b/FirebaseStorage/Tests/Unit/StorageUtilsTests.swift index f21c06bf94..e1b2291e1f 100644 --- a/FirebaseStorage/Tests/Unit/StorageUtilsTests.swift +++ b/FirebaseStorage/Tests/Unit/StorageUtilsTests.swift @@ -19,7 +19,6 @@ import FirebaseCore import XCTest -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class StorageUtilsTests: StorageTestHelpers { func testCommonExtensionToMIMEType() { let extensionToMIMEType = [