Removed Unused Availability Checks (#13023)

Author: yakovmanshin

FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m

@@ -23,13 +23,10 @@
 
 @implementation FIRAppDistributionUIService
 
-API_AVAILABLE(ios(9.0))
-SFSafariViewController *_safariVC;
-
 API_AVAILABLE(ios(12.0))
 ASWebAuthenticationSession *_webAuthenticationVC;
 
-API_AVAILABLE(ios(11.0))
+// TODO: Remove this when the deployment target becomes iOS 12+
 SFAuthenticationSession *_safariAuthenticationVC;
 
 - (instancetype)init {
@@ -74,7 +71,7 @@ + (NSError *_Nullable)mapErrorToAppDistributionError:(NSError *_Nullable)error {
     if ([error code] == ASWebAuthenticationSessionErrorCodeCanceledLogin) {
       return [self getAppDistributionError:FIRAppDistributionErrorAuthenticationCancelled];
     }
-  } else if (@available(iOS 11.0, *)) {
+  } else {
     if ([error code] == SFAuthenticationErrorCanceledLogin) {
       return [self getAppDistributionError:FIRAppDistributionErrorAuthenticationCancelled];
     }
@@ -110,7 +107,7 @@ - (void)appDistributionRegistrationFlow:(NSURL *)URL
     _webAuthenticationVC = authenticationVC;
 
     [authenticationVC start];
-  } else if (@available(iOS 11.0, *)) {
+  } else {
     _safariAuthenticationVC = [[SFAuthenticationSession alloc]
               initWithURL:URL
         callbackURLScheme:callbackURL
@@ -123,13 +120,6 @@ - (void)appDistributionRegistrationFlow:(NSURL *)URL
         }];
 
     [_safariAuthenticationVC start];
-  } else if (@available(iOS 9.0, *)) {
-    SFSafariViewController *safariVC = [[SFSafariViewController alloc] initWithURL:URL];
-
-    safariVC.delegate = self;
-    _safariVC = safariVC;
-    [self->_safariHostingViewController presentViewController:safariVC animated:YES completion:nil];
-    self.registrationFlowCompletion = completion;
   }
 }
 
@@ -244,16 +234,16 @@ - (void)resetUIState {
 
   self.registrationFlowCompletion = nil;
 
-  if (@available(iOS 11.0, *)) {
-    _safariAuthenticationVC = nil;
-  } else if (@available(iOS 12.0, *)) {
+  if (@available(iOS 12.0, *)) {
     _webAuthenticationVC = nil;
-  } else if (@available(iOS 9.0, *)) {
-    _safariVC = nil;
   }
+  // TODO: Remove this when the deployment target becomes iOS 12+
+  // `_safariAuthenticationVC` is cleared unconditionally just in case;
+  // It’s supposed to be assigned only when run on iOS 11.
+  _safariAuthenticationVC = nil;
 }
 
-- (void)safariViewControllerDidFinish:(SFSafariViewController *)controller NS_AVAILABLE_IOS(9.0) {
+- (void)safariViewControllerDidFinish:(SFSafariViewController *)controller {
   NSError *error =
       [[self class] getAppDistributionError:FIRAppDistributionErrorAuthenticationCancelled];
   [self logRegistrationCompletion:error authType:[SFSafariViewController description]];

FirebaseAuth/Tests/Unit/FIRAuthTests.m

@@ -2938,19 +2938,15 @@ - (void)testAppDidReceiveRemoteNotificationWithCompletion_NotificationManagerHan
 }
 
 - (void)testAppOpenURL_AuthPresenterCanHandleURL {
-  if (@available(iOS 9.0, *)) {
-    // 'application:openURL:options:' is only available on iOS 9.0 or newer.
-    NSURL *url = [NSURL URLWithString:@"https://localhost"];
+  NSURL *url = [NSURL URLWithString:@"https://localhost"];
 
-    OCMExpect([self.mockAuthURLPresenter canHandleURL:url]).andReturn(YES);
+  OCMExpect([self.mockAuthURLPresenter canHandleURL:url]).andReturn(YES);
 
-    XCTAssertTrue([self.fakeApplicationDelegate
-        application:[GULAppDelegateSwizzler sharedApplication]
-            openURL:url
-            options:@{}]);
+  XCTAssertTrue([self.fakeApplicationDelegate application:[GULAppDelegateSwizzler sharedApplication]
+                                                  openURL:url
+                                                  options:@{}]);
 
-    [self.mockAuthURLPresenter verify];
-  }
+  [self.mockAuthURLPresenter verify];
 }
 
 - (void)testAppOpenURLWithSourceApplication_AuthPresenterCanHandleURL {

FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m

@@ -453,11 +453,7 @@ - (void)testCallbackQueue {
   __block BOOL done = NO;
   [database.reference.childByAutoId observeSingleEventOfType:FIRDataEventTypeValue
                                                    withBlock:^(FIRDataSnapshot *snapshot) {
-                                                     if (@available(iOS 10.0, macOS 10.12, *)) {
-                                                       dispatch_assert_queue(callbackQueue);
-                                                     } else {
-                                                       NSAssert(YES, @"Test requires iOS 10");
-                                                     }
+                                                     dispatch_assert_queue(callbackQueue);
                                                      done = YES;
                                                    }];
   WAIT_FOR(done);

FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.m

@@ -176,6 +176,9 @@ - (void)handleRetrievalProcessWithResult:(FIRDLRetrievalProcessResult *)result {
 - (nullable NSURL *)uniqueMatchLinkToCheck {
   _clipboardContentAtMatchProcessStart = nil;
   NSString *pasteboardContents = [self retrievePasteboardContents];
+  if (!pasteboardContents) {
+    return nil;
+  }
   NSInteger linkStringMinimumLength =
       expectedCopiedLinkStringSuffix.length + /* ? or & */ 1 + /* http:// */ 7;
   if ((pasteboardContents.length >= linkStringMinimumLength) &&
@@ -201,21 +204,17 @@ - (nullable NSURL *)uniqueMatchLinkToCheck {
   return nil;
 }
 
-- (NSString *)retrievePasteboardContents {
+- (nullable NSString *)retrievePasteboardContents {
   if (![self isPasteboardRetrievalEnabled]) {
     // Pasteboard check for dynamic link is disabled by user.
-    return @"";
+    return nil;
   }
 
-  NSString *pasteboardContents = @"";
-  if (@available(iOS 10.0, *)) {
-    if ([[UIPasteboard generalPasteboard] hasURLs]) {
-      pasteboardContents = [UIPasteboard generalPasteboard].string;
-    }
+  if ([[UIPasteboard generalPasteboard] hasURLs]) {
+    return [UIPasteboard generalPasteboard].string;
   } else {
-    pasteboardContents = [UIPasteboard generalPasteboard].string;
+    return nil;
   }
-  return pasteboardContents;
 }
 
 /**

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m

@@ -167,19 +167,11 @@ - (void)loadFromCachePath:(NSString *)cacheFilePath {
   id fetchedClearcutRetryRecords;
   NSData *data = [NSData dataWithContentsOfFile:filePath];
   if (data) {
-    if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
-      fetchedClearcutRetryRecords = [NSKeyedUnarchiver
-          unarchivedObjectOfClasses:[NSSet setWithObjects:[FIRIAMClearcutLogRecord class],
-                                                          [NSMutableArray class], nil]
-                           fromData:data
-                              error:nil];
-    } else {
-      // Fallback on earlier versions
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      fetchedClearcutRetryRecords = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath];
-#pragma clang diagnostic pop
-    }
+    fetchedClearcutRetryRecords = [NSKeyedUnarchiver
+        unarchivedObjectOfClasses:[NSSet setWithObjects:[FIRIAMClearcutLogRecord class],
+                                                        [NSMutableArray class], nil]
+                         fromData:data
+                            error:nil];
   }
   if (fetchedClearcutRetryRecords) {
     @synchronized(self) {

FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m

@@ -155,19 +155,11 @@ - (void)loadFromCachePath:(NSString *)cacheFilePath {
   id fetchedActivityRecords;
   NSData *data = [NSData dataWithContentsOfFile:filePath];
   if (data) {
-    if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
-      fetchedActivityRecords = [NSKeyedUnarchiver
-          unarchivedObjectOfClasses:[NSSet setWithObjects:[FIRIAMActivityRecord class],
-                                                          [NSMutableArray class], nil]
-                           fromData:data
-                              error:nil];
-    } else {
-      // Fallback on earlier versions
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      fetchedActivityRecords = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath];
-#pragma clang diagnostic pop
-    }
+    fetchedActivityRecords = [NSKeyedUnarchiver
+        unarchivedObjectOfClasses:[NSSet setWithObjects:[FIRIAMActivityRecord class],
+                                                        [NSMutableArray class], nil]
+                         fromData:data
+                            error:nil];
   }
   if (fetchedActivityRecords) {
     @synchronized(self) {

FirebaseMLModelDownloader/Sources/FileDownloader.swift

@@ -63,11 +63,9 @@ class ModelFileDownloader: NSObject, FileDownloader {
     self.conditions = conditions
     configuration = URLSessionConfiguration.ephemeral
     /// Wait for network connectivity.
-    if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
-      self.configuration.waitsForConnectivity = true
-      /// Wait for 10 minutes.
-      self.configuration.timeoutIntervalForResource = 600
-    }
+    configuration.waitsForConnectivity = true
+    /// Wait for 10 minutes.
+    configuration.timeoutIntervalForResource = 600
     configuration.allowsCellularAccess = conditions.allowsCellularAccess
   }
 

FirebaseMLModelDownloader/Sources/ModelInfoRetriever.swift

@@ -523,18 +523,10 @@ extension ModelInfoRetriever {
 
   /// Parse date from string - used to get download URL expiry time.
   private static func getDateFromString(_ strDate: String) -> Date? {
-    if #available(iOS 11, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
-      let dateFormatter = ISO8601DateFormatter()
-      dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
-      dateFormatter.formatOptions = [.withFractionalSeconds]
-      return dateFormatter.date(from: strDate)
-    } else {
-      let dateFormatter = DateFormatter()
-      dateFormatter.locale = Locale(identifier: "en-US_POSIX")
-      dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
-      dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
-      return dateFormatter.date(from: strDate)
-    }
+    let dateFormatter = ISO8601DateFormatter()
+    dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
+    dateFormatter.formatOptions = [.withFractionalSeconds]
+    return dateFormatter.date(from: strDate)
   }
 
   /// Return model info created from server response.

FirebaseSharedSwift/Sources/third_party/FirebaseDataEncoder/FirebaseDataEncoder.swift

@@ -122,7 +122,6 @@ public class FirebaseDataEncoder {
     case millisecondsSince1970
 
     /// Encode the `Date` as an ISO-8601-formatted string (in RFC 3339 format).
-    @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
     case iso8601
 
     /// Encode the `Date` as a string formatted by the given formatter.
@@ -823,11 +822,7 @@ extension __JSONEncoder {
       return NSNumber(value: 1000.0 * date.timeIntervalSince1970)
 
     case .iso8601:
-      if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
         return NSString(string: _iso8601Formatter.string(from: date))
-      } else {
-        fatalError("ISO8601DateFormatter is unavailable on this platform.")
-      }
 
     case .formatted(let formatter):
       return NSString(string: formatter.string(from: date))
@@ -1080,7 +1075,6 @@ public class FirebaseDataDecoder {
     case millisecondsSince1970
 
     /// Decode the `Date` as an ISO-8601-formatted string (in RFC 3339 format).
-    @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
     case iso8601
 
     /// Decode the `Date` as a string parsed by the given formatter.
@@ -2443,16 +2437,12 @@ extension __JSONDecoder {
       return Date(timeIntervalSince1970: double / 1000.0)
 
     case .iso8601:
-      if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
         let string = try self.unbox(value, as: String.self)!
         guard let date = _iso8601Formatter.date(from: string) else {
           throw DecodingError.dataCorrupted(DecodingError.Context(codingPath: self.codingPath, debugDescription: "Expected date string to be ISO8601-formatted."))
         }
 
         return date
-      } else {
-        fatalError("ISO8601DateFormatter is unavailable on this platform.")
-      }
 
     case .formatted(let formatter):
       let string = try self.unbox(value, as: String.self)!
@@ -2621,7 +2611,6 @@ fileprivate struct _JSONKey : CodingKey {
 //===----------------------------------------------------------------------===//
 
 // NOTE: This value is implicitly lazy and _must_ be lazy. We're compiled against the latest SDK (w/ ISO8601DateFormatter), but linked against whichever Foundation the user has. ISO8601DateFormatter might not exist, so we better not hit this code path on an older OS.
-@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
 fileprivate var _iso8601Formatter: ISO8601DateFormatter = {
   let formatter = ISO8601DateFormatter()
   formatter.formatOptions = .withInternetDateTime

FirebaseSharedSwift/Tests/third_party/DataEncoderTests.swift

@@ -302,7 +302,6 @@ class TestFirebaseDataEncoder: XCTestCase {
   }
 
   func testEncodingDateISO8601() {
-    if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
       let formatter = ISO8601DateFormatter()
       formatter.formatOptions = .withInternetDateTime
 
@@ -319,7 +318,6 @@ class TestFirebaseDataEncoder: XCTestCase {
                      expected: expected,
                      dateEncodingStrategy: .iso8601,
                      dateDecodingStrategy: .iso8601)
-    }
   }
 
   func testEncodingDateFormatted() {