Skip to content

[Infra] Remove outdated availability and Swift version guards #1711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Infra] Remove outdated availability and Swift version guards #1711

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9146fb9
Refactor: Remove outdated availability and Swift version guards
google-labs-jules[bot] Jun 20, 2025
7af22c6
Refactor: Remove #if compiler directives
google-labs-jules[bot] Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion abtesting/Shared/AppConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ class AppConfig: ObservableObject {
}

#if compiler(>=5.5) && canImport(_Concurrency)
@available(iOS 15, tvOS 15, macOS 12, watchOS 8, *)
func updateFromRemoteConfigAsync() async {
let remoteConfig = RemoteConfig.remoteConfig()
let oldValue = remoteConfig["color_scheme"].stringValue ?? "nil"
Expand Down
17 changes: 5 additions & 12 deletions abtesting/Shared/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,11 @@ struct FirebaseList: View {
var body: some View {
VStack {
#if compiler(>=5.5) && canImport(_Concurrency)
if #available(iOS 15, tvOS 15, macOS 12, watchOS 8, *) {
BasicList(data: data)
.preferredColorScheme(appConfig.colorScheme)
.foregroundColor(appConfig.colorScheme == .dark ? .orange : .primary)
.task { await appConfig.updateFromRemoteConfigAsync() }
.refreshable { await appConfig.updateFromRemoteConfigAsync() }
} else {
BasicList(data: data)
.preferredColorScheme(appConfig.colorScheme)
.foregroundColor(appConfig.colorScheme == .dark ? .orange : .primary)
.onAppear { appConfig.updateFromRemoteConfig() }
}
BasicList(data: data)
.preferredColorScheme(appConfig.colorScheme)
.foregroundColor(appConfig.colorScheme == .dark ? .orange : .primary)
.task { await appConfig.updateFromRemoteConfigAsync() }
.refreshable { await appConfig.updateFromRemoteConfigAsync() }
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The .task and .refreshable view modifiers were introduced in iOS 15, tvOS 15, macOS 12, and watchOS 8. The pull request description states that the macOS deployment target is 11.0 and the watchOS deployment target is 7.0. Removing the #available check means this code will be compiled and potentially run on macOS 11 and watchOS 7, where these modifiers are not available, leading to a runtime crash.

        if #available(iOS 15, tvOS 15, macOS 12, watchOS 8, *) {
          BasicList(data: data)
            .preferredColorScheme(appConfig.colorScheme)
            .foregroundColor(appConfig.colorScheme == .dark ? .orange : .primary)
            .task { await appConfig.updateFromRemoteConfigAsync() }
            .refreshable { await appConfig.updateFromRemoteConfigAsync() }
        } else {
          BasicList(data: data)
            .preferredColorScheme(appConfig.colorScheme)
            .foregroundColor(appConfig.colorScheme == .dark ? .orange : .primary)
            .onAppear { appConfig.updateFromRemoteConfig() }
        }

#else
BasicList(data: data)
.preferredColorScheme(appConfig.colorScheme)
Expand Down
8 changes: 3 additions & 5 deletions abtesting/Shared/UITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,9 @@ class UITests: XCTestCase {
}

func testLaunchPerformance() throws {
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) {
// This measures how long it takes to launch your application.
measure(metrics: [XCTApplicationLaunchMetric()]) {
XCUIApplication().launch()
}
// This measures how long it takes to launch your application.
measure(metrics: [XCTApplicationLaunchMetric()]) {
XCUIApplication().launch()
}
}
}
10 changes: 4 additions & 6 deletions analytics/AnalyticsExample/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
didFinishLaunchingWithOptions launchOptions: [UIApplication
.LaunchOptionsKey: Any]?) -> Bool {
FirebaseApp.configure()
if #available(iOS 14, *) {
SKPaymentQueue.default().add(FirebaseApp.app()!)
print("\(SKPaymentQueue.default().transactionObservers as [AnyObject])")
SKPaymentQueue.default().add(FirebaseApp.app()!)
print("\(SKPaymentQueue.default().transactionObservers as [AnyObject])")

(SKPaymentQueue.default().transactionObservers as [AnyObject]).forEach {
print($0)
}
(SKPaymentQueue.default().transactionObservers as [AnyObject]).forEach {
print($0)
}
print("done")
return true
Expand Down
8 changes: 3 additions & 5 deletions appdistribution/AppDistributionUITests/AppDistributionExampleUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ class AppDistributionExampleUITests: XCTestCase {
}

func testLaunchPerformance() throws {
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) {
// This measures how long it takes to launch your application.
measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) {
XCUIApplication().launch()
}
// This measures how long it takes to launch your application.
measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) {
XCUIApplication().launch()
}
}
}
1 change: 0 additions & 1 deletion authentication/LegacyAuthQuickstart/AuthenticationExampleSwift/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}

// [START new_delegate]
@available(iOS 9.0, *)
func application(_ application: UIApplication, open url: URL,
options: [UIApplication.OpenURLOptionsKey: Any])
-> Bool {
Expand Down
12 changes: 2 additions & 10 deletions authentication/LegacyAuthQuickstart/AuthenticationExampleSwift/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,8 @@ class MainViewController: UITableViewController {
}
}
case .authApple:
if #available(iOS 13, *) {
action = UIAlertAction(title: "Apple", style: .default) { UIAlertAction in
self.startSignInWithAppleFlow()
}
} else {
continue
action = UIAlertAction(title: "Apple", style: .default) { UIAlertAction in
self.startSignInWithAppleFlow()
}
case .authFacebook:
action = UIAlertAction(title: "Facebook", style: .default) { UIAlertAction in
Expand Down Expand Up @@ -1026,7 +1022,6 @@ class MainViewController: UITableViewController {
// Unhashed nonce.
fileprivate var currentNonce: String?

@available(iOS 13, *)
func startSignInWithAppleFlow() {
let nonce = randomNonceString()
currentNonce = nonce
Expand Down Expand Up @@ -1066,7 +1061,6 @@ class MainViewController: UITableViewController {
// [END random_nonce]

// [START sha_256]
@available(iOS 13, *)
private func sha256(_ input: String) -> String {
let inputData = Data(input.utf8)
let hashedData = SHA256.hash(data: inputData)
Expand All @@ -1080,7 +1074,6 @@ class MainViewController: UITableViewController {
// [END sha_256]
}

@available(iOS 13.0, *)
extension MainViewController: ASAuthorizationControllerDelegate {
func authorizationController(controller: ASAuthorizationController,
didCompleteWithAuthorization authorization: ASAuthorization) {
Expand Down Expand Up @@ -1113,7 +1106,6 @@ extension MainViewController: ASAuthorizationControllerDelegate {
}
}

@available(iOS 13.0, *)
extension MainViewController: ASAuthorizationControllerPresentationContextProviding {
func presentationAnchor(for controller: ASAuthorizationController) -> ASPresentationAnchor {
return view.window!
Expand Down
23 changes: 8 additions & 15 deletions crashlytics/Shared/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct ContentView: View {
private var crashlyticsReference = Crashlytics.crashlytics()

#if compiler(>=5.5) && canImport(_Concurrency)
@available(iOS 15, tvOS 15, macOS 12, watchOS 8, *) func checkForUnsentReportsAsync() async {
func checkForUnsentReportsAsync() async {
let reportFound = await crashlyticsReference.checkForUnsentReports()
if reportFound {
crashlyticsReference.sendUnsentReports()
Expand All @@ -51,24 +51,17 @@ struct ContentView: View {
}

var body: some View {
if #available(iOS 15, tvOS 15, macOS 12, watchOS 8, *) {
#if compiler(>=5.5) && canImport(_Concurrency)
CrashButtonView()
.task {
await self.checkForUnsentReportsAsync()
}
#else
CrashButtonView()
.onAppear {
self.checkForUnsentReports()
}
#endif
} else {
#if compiler(>=5.5) && canImport(_Concurrency)
CrashButtonView()
.task {
await self.checkForUnsentReportsAsync()
}
#else
CrashButtonView()
.onAppear {
self.checkForUnsentReports()
}
}
#endif
}
}

Expand Down
8 changes: 3 additions & 5 deletions crashlytics/Shared/UITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ class UITests: XCTestCase {
}

func testLaunchPerformance() throws {
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) {
// This measures how long it takes to launch your application.
measure(metrics: [XCTApplicationLaunchMetric()]) {
XCUIApplication().launch()
}
// This measures how long it takes to launch your application.
measure(metrics: [XCTApplicationLaunchMetric()]) {
XCUIApplication().launch()
}
}
}
16 changes: 6 additions & 10 deletions database/DatabaseExampleSwiftUI/DatabaseExample/Shared/Views/PostCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,13 @@ struct PostCell: View {
#if os(iOS) || os(macOS)
starButton
.onTapGesture {
if #available(iOS 15, macOS 12, *) {
#if compiler(>=5.5) && canImport(_Concurrency)
Task { await
post.didTapStarButtonAsync()
}
#else
post.didTapStarButton()
#endif
} else {
#if compiler(>=5.5) && canImport(_Concurrency)
Task { await
post.didTapStarButtonAsync()
}
#else
post.didTapStarButton()
}
#endif
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The original code included an #available(iOS 15, macOS 12, *) check before calling the async version post.didTapStarButtonAsync(). While Task { ... } is available from macOS 10.15, the didTapStarButtonAsync function itself might be using APIs that are only available from macOS 12 (similar to URLSession.shared.data(from:) in Process.swift). Given the macOS deployment target is 11.0, removing this #available check could lead to a runtime crash on macOS 11 if didTapStarButtonAsync relies on macOS 12+ APIs. It's safer to either keep the #available check or confirm that didTapStarButtonAsync is compatible with macOS 11.

                  if #available(iOS 15, macOS 12, *) {
                    #if compiler(>=5.5) && canImport(_Concurrency)
                      Task { await
                        post.didTapStarButtonAsync()
                      }
                    #else
                      post.didTapStarButton()
                    #endif
                  } else {
                    post.didTapStarButton()
                  }

}
#elseif os(tvOS)
starButton
Expand Down
10 changes: 2 additions & 8 deletions firestore/FirestoreExample/UINavigationBar+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ extension UINavigationBar {
static let firebaseTitleTextAttributes =
[NSAttributedString.Key.foregroundColor: UIColor.white]

@available(iOS 13.0, *)
var firebaseNavigationBarAppearance: UINavigationBarAppearance {
let navBarAppearance = UINavigationBarAppearance()
navBarAppearance.configureWithOpaqueBackground()
Expand All @@ -29,23 +28,18 @@ extension UINavigationBar {
return navBarAppearance
}

@available(iOS 13.0, *)
func applyAppearance(_ appearance: UINavigationBarAppearance) {
standardAppearance = appearance
compactAppearance = appearance
scrollEdgeAppearance = appearance
if #available(iOS 15.0, *) {
compactScrollEdgeAppearance = appearance
}
compactScrollEdgeAppearance = appearance
}

func applyFirebaseAppearance() {
barTintColor = UINavigationBar.firebaseBlue
isTranslucent = false
titleTextAttributes = UINavigationBar.firebaseTitleTextAttributes

if #available(iOS 13.0, *) {
applyAppearance(firebaseNavigationBarAppearance)
}
applyAppearance(firebaseNavigationBarAppearance)
}
}
2 changes: 0 additions & 2 deletions functions/LegacyFunctionsQuickstart/FunctionsExampleSwift/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true
}

@available(iOS 9.0, *)
func application(_ app: UIApplication, open url: URL,
options: [UIApplication.OpenURLOptionsKey: Any]) -> Bool {
guard let sourceApplication =
Expand All @@ -51,7 +50,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return handleOpenUrl(url, sourceApplication: sourceApplication)
}

@available(iOS 8.0, *)
func application(_ application: UIApplication, open url: URL, sourceApplication: String?,
annotation: Any) -> Bool {
return handleOpenUrl(url, sourceApplication: sourceApplication)
Expand Down
Loading
Loading