Minor changes

Package.swift

@@ -31,7 +31,7 @@ let package = Package(
         .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.8.0"),
         .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.7.0"),
         .package(url: "https://github.com/StanfordSpezi/SpeziStorage", from: "1.1.2"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziNotifications.git", branch: "feature/initial-version"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziNotifications.git", from: "1.0.2"),
         .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.0"),
         .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.0-prerelease-2024-08-14"),
         .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.17.2")

Sources/SpeziScheduler/EventQuery.swift

@@ -7,7 +7,6 @@
 //
 
 import Combine
-import OSLog
 import SwiftData
 import SwiftUI
 
@@ -182,40 +181,3 @@ extension EventQuery: DynamicProperty {
         }
     }
 }
-
-
-private let logger = Logger(subsystem: "edu.stanford.spezi.scheduler", category: "EventQuery")
-
-
-private func measure<T, C: Clock>(
-    clock: C = ContinuousClock(),
-    name: @autoclosure @escaping () -> StaticString,
-    _ action: () throws -> T
-) rethrows -> T where C.Instant.Duration == Duration {
-    #if DEBUG || TEST
-    let start = clock.now
-    let result = try action()
-    let end = clock.now
-    logger.debug("Performing \(name()) took \(start.duration(to: end))")
-    return result
-    #else
-    try action()
-    #endif
-}
-
-func measure<T, C: Clock>(
-    isolation: isolated (any Actor)? = #isolation,
-    clock: C = ContinuousClock(),
-    name: @autoclosure @escaping () -> StaticString,
-    _ action: () async throws -> sending T
-) async rethrows -> sending T where C.Instant.Duration == Duration {
-#if DEBUG || TEST
-    let start = clock.now
-    let result = try await action()
-    let end = clock.now
-    logger.debug("Performing \(name()) took \(start.duration(to: end))")
-    return result
-#else
-    try await action()
-#endif
-}

Sources/SpeziScheduler/Scheduler.swift

@@ -129,20 +129,18 @@ public final class Scheduler {
             return // we have a container injected for testing purposes
         }
 
-        let testing: Bool
+        let configuration: ModelConfiguration
 #if targetEnvironment(simulator) || TEST
-        testing = true
+        configuration = ModelConfiguration(isStoredInMemoryOnly: true)
 #elseif os(macOS)
-        testing = Self.isTesting
-#else
-        testing = false
-#endif
-
-        let configuration: ModelConfiguration = if testing {
-            ModelConfiguration(isStoredInMemoryOnly: true)
+        if Self.isTesting {
+            configuration = ModelConfiguration(isStoredInMemoryOnly: true)
         } else {
-            ModelConfiguration(url: URL.documentsDirectory.appending(path: "edu.stanford.spezi.scheduler.storage.sqlite"))
+            configuration = ModelConfiguration(url: URL.documentsDirectory.appending(path: "edu.stanford.spezi.scheduler.storage.sqlite"))
         }
+#else
+        configuration = ModelConfiguration(url: URL.documentsDirectory.appending(path: "edu.stanford.spezi.scheduler.storage.sqlite"))
+#endif
 
         do {
             _container = .success(try ModelContainer(for: Task.self, Outcome.self, configurations: configuration))

Sources/SpeziScheduler/Utils/Measure.swift

@@ -0,0 +1,47 @@
+//
+// This source file is part of the Stanford Spezi open-source project
+//
+// SPDX-FileCopyrightText: 2024 Stanford University and the project authors (see CONTRIBUTORS.md)
+//
+// SPDX-License-Identifier: MIT
+//
+
+import OSLog
+
+
+private let logger = Logger(subsystem: "edu.stanford.spezi.scheduler", category: "EventQuery")
+
+
+func measure<T, C: Clock>(
+    clock: C = ContinuousClock(),
+    name: @autoclosure @escaping () -> StaticString,
+    _ action: () throws -> T
+) rethrows -> T where C.Instant.Duration == Duration {
+    #if DEBUG || TEST
+    let start = clock.now
+    let result = try action()
+    let end = clock.now
+    logger.debug("Performing \(name()) took \(start.duration(to: end))")
+    return result
+    #else
+    try action()
+    #endif
+}
+
+
+func measure<T, C: Clock>(
+    isolation: isolated (any Actor)? = #isolation,
+    clock: C = ContinuousClock(),
+    name: @autoclosure @escaping () -> StaticString,
+    _ action: () async throws -> sending T
+) async rethrows -> sending T where C.Instant.Duration == Duration {
+#if DEBUG || TEST
+    let start = clock.now
+    let result = try await action()
+    let end = clock.now
+    logger.debug("Performing \(name()) took \(start.duration(to: end))")
+    return result
+#else
+    try await action()
+#endif
+}