From 8de9ea7afe3dfed1815c08a424ab4e12b794e971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bj=C3=B6rkert?= Date: Sat, 28 Feb 2026 23:27:40 +0100 Subject: [PATCH] Remove unnecessary iOS version checks for deployment target 16.6 - Remove `if #available(iOS 16.0, *)` guard in GeneralSettingsView since the deployment target (16.6) guarantees availability - Remove `#if swift(>=5.9)` wrapper in EKEventStore+Extensions since Xcode versions supporting iOS 16.6 targets include Swift 5.9+ - Keep `if #available(iOS 17, *)` check for requestFullAccessToEvents as it guards an API above the deployment target Co-Authored-By: Claude Opus 4.6 --- .../Extensions/EKEventStore+Extensions.swift | 24 ++++++------------- LoopFollow/Settings/GeneralSettingsView.swift | 12 ++++------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/LoopFollow/Extensions/EKEventStore+Extensions.swift b/LoopFollow/Extensions/EKEventStore+Extensions.swift index 2e8089dca..c9b81e2f2 100644 --- a/LoopFollow/Extensions/EKEventStore+Extensions.swift +++ b/LoopFollow/Extensions/EKEventStore+Extensions.swift @@ -4,26 +4,16 @@ import EventKit import Foundation -#if swift(>=5.9) - extension EKEventStore { - func requestCalendarAccess(completion: @escaping (Bool, Error?) -> Void) { - if #available(iOS 17, *) { - requestFullAccessToEvents { granted, error in - completion(granted, error) - } - } else { - requestAccess(to: .event) { granted, error in - completion(granted, error) - } +extension EKEventStore { + func requestCalendarAccess(completion: @escaping (Bool, Error?) -> Void) { + if #available(iOS 17, *) { + requestFullAccessToEvents { granted, error in + completion(granted, error) } - } - } -#else - extension EKEventStore { - func requestCalendarAccess(completion: @escaping (Bool, Error?) -> Void) { + } else { requestAccess(to: .event) { granted, error in completion(granted, error) } } } -#endif +} diff --git a/LoopFollow/Settings/GeneralSettingsView.swift b/LoopFollow/Settings/GeneralSettingsView.swift index e94a9040e..e552f076c 100644 --- a/LoopFollow/Settings/GeneralSettingsView.swift +++ b/LoopFollow/Settings/GeneralSettingsView.swift @@ -50,14 +50,12 @@ struct GeneralSettingsView: View { Toggle("Snoozer emoji", isOn: $snoozerEmoji.value) Toggle("Force portrait mode", isOn: $forcePortraitMode.value) .onChange(of: forcePortraitMode.value) { _ in - if #available(iOS 16.0, *) { - let window = UIApplication.shared.connectedScenes - .compactMap { $0 as? UIWindowScene } - .flatMap { $0.windows } - .first + let window = UIApplication.shared.connectedScenes + .compactMap { $0 as? UIWindowScene } + .flatMap { $0.windows } + .first - window?.rootViewController?.setNeedsUpdateOfSupportedInterfaceOrientations() - } + window?.rootViewController?.setNeedsUpdateOfSupportedInterfaceOrientations() } }