removed cruft of checks for pre ios17

app was bumped to target ios17 with #484 and thus the code no longer need to check manually for iOS 14, 15, or 16
beeminder · Nov 26, 2024 · 635dd1b · 635dd1b
1 parent 05d65e7
commit 635dd1b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 25 deletions.
diff --git a/BeeKit/HeathKit/HealthKitConfig.swift b/BeeKit/HeathKit/HealthKitConfig.swift
@@ -53,18 +53,14 @@ public class HealthKitConfig : NSObject {
             QuantityHealthKitMetric(humanText: "Vitamin E", databaseString: "dietaryVitaminE", category: .Nutrition, hkQuantityTypeIdentifier: .dietaryVitaminE),
             QuantityHealthKitMetric(humanText: "Vitamin K", databaseString: "dietaryVitaminK", category: .Nutrition, hkQuantityTypeIdentifier: .dietaryVitaminK),
             QuantityHealthKitMetric(humanText: "Water", databaseString: "water", category: .Nutrition, hkQuantityTypeIdentifier: .dietaryWater),
-
+            
             // Sleep
             TimeInBedHealthKitMetric(humanText: "Time in bed", databaseString: "timeInBed", category: .Sleep),
             TimeAsleepHealthKitMetric(humanText: "Time asleep", databaseString: "timeAsleep", category: .Sleep),
-
+
+            QuantityHealthKitMetric(humanText: "Time in Daylight", databaseString: "timeInDaylight", category: .Other, hkQuantityTypeIdentifier: .timeInDaylight),
         ]
-
-        if #available(iOS 17, *) {
-            // Other
-            allMetrics.append(QuantityHealthKitMetric(humanText: "Time in Daylight", databaseString: "timeInDaylight", category: .Other, hkQuantityTypeIdentifier: .timeInDaylight))
-        }
-
+
         return allMetrics
     }()
 }
diff --git a/BeeKit/HeathKit/TotalSleepMinutes.swift b/BeeKit/HeathKit/TotalSleepMinutes.swift
@@ -18,23 +18,14 @@ enum SleepResolution {
 }
 
 func isRelevantToSleep(_ sample: HKCategorySample) -> Bool {
-    var relevantValues: [HKCategoryValueSleepAnalysis]
-    if #available(iOS 16.0, *) {
-        relevantValues = [
+    let relevantValues: [HKCategoryValueSleepAnalysis] = [
             HKCategoryValueSleepAnalysis.awake,
             HKCategoryValueSleepAnalysis.asleepUnspecified,
             HKCategoryValueSleepAnalysis.asleepREM,
             HKCategoryValueSleepAnalysis.asleepDeep,
             HKCategoryValueSleepAnalysis.asleepCore,
             HKCategoryValueSleepAnalysis.asleepUnspecified
         ]
-    } else {
-        // Fallback on earlier versions
-        relevantValues = [
-            HKCategoryValueSleepAnalysis.awake,
-            HKCategoryValueSleepAnalysis.asleep
-        ]
-    }
 
     return relevantValues.contains(HKCategoryValueSleepAnalysis(rawValue: sample.value)!)
 }

diff --git a/BeeSwift/AddDataIntentHandler.swift b/BeeSwift/AddDataIntentHandler.swift
@@ -10,7 +10,6 @@ import Foundation
 import Intents
 import BeeKit
 
-@available(iOS 14.0, *)
 class AddDataIntentHandler: NSObject, AddDataIntentHandling {
     func resolveValue(for intent: AddDataIntent) async -> AddDataValueResolutionResult {
         if let value = intent.value {

diff --git a/BeeSwift/LogReader.swift b/BeeSwift/LogReader.swift
@@ -6,8 +6,6 @@
 import Foundation
 import OSLog
 
-
-@available(iOS 15.0, *)
 class LogReader {
     private var allMessagesTask: Task<[OSLogEntryLog], Never>!
 

diff --git a/BeeSwift/Settings/LogsViewController.swift b/BeeSwift/Settings/LogsViewController.swift
@@ -7,8 +7,6 @@ import Foundation
 import OSLog
 import OrderedCollections
 
-
-@available(iOS 15.0, *)
 class LogsViewController: UIViewController {
 
     let logTextView = UITextView()

diff --git a/BeeSwiftIntents/IntentHandler.swift b/BeeSwiftIntents/IntentHandler.swift
@@ -8,7 +8,6 @@
 import Foundation
 import Intents
 
-@available(iOS 14.0, *)
 class IntentHandler : INExtension {
     override func handler(for intent: INIntent) -> Any? {
         AddDataIntentHandler()

diff --git a/BeeSwiftTests/LogReaderTests.swift b/BeeSwiftTests/LogReaderTests.swift
@@ -11,7 +11,6 @@ import OSLog
 
 @testable import BeeSwift
 
-@available(iOS 15.0, *)
 final class LogReaderTests: XCTestCase {
     private let logger = Logger(subsystem: "com.beeminder.beeminder", category: "LogReaderTests")