Support for iOS 16

Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version:5.8
+// swift-tools-version: 5.8
 import PackageDescription
 
 let package = Package(
     name: "SwiftRepo",
     platforms: [
-        .iOS("18.0"),
+        .iOS("16.0"),
         .macOS("15.0"),
     ],
     products: [

Sources/SwiftRepo/Repository/ModelResponse.swift

@@ -11,6 +11,7 @@ import Foundation
 /// Partnered with a `QueryRepository` using an additional model store, `Value` will be
 /// propagated via an `ObservableStore` and the array of `Model`s will be placed in
 /// the `ModelStore`.
+@available(iOS 17, *)
 public protocol ModelResponse {
     /// Can be used to propagate additional metadata related to the response via an `ObservableStore`
     associatedtype Value

Sources/SwiftRepo/Repository/Protocols/Query/Query.swift

@@ -129,6 +129,7 @@ public extension Query {
     ///   - strategy: The query strategy
     ///   - willGet: A closure that will be called if and when the query is performed. This is typically the `LoadingController.loading` function.
     /// - Returns: The value if the query was performed. Otherwise, `nil`.
+    @available(iOS 17, *)
     func get<Store, Key, ModelStore>(
         id: QueryId,
         variables: Variables,

Sources/SwiftRepo/Repository/Repository/DefaultQueryRepository.swift

@@ -84,6 +84,7 @@ where QueryId: Hashable, Variables: Hashable, Key: Hashable {
     ///   - modelStore: The underlying `Store` implementation to use for `QueryValue.Model`.
     ///   - queryStrategy: The query strategy to use.
     ///   - queryOperation: The operation to use to perform the actual query.
+    @available(iOS 17, *)
     public init<Model, QueryValue>(
         observableStore: ObservableStoreType,
         modelStore: any Store<Model.Key, Model>,
@@ -148,6 +149,7 @@ where QueryId: Hashable, Variables: Hashable, Key: Hashable {
     ///   - modelStore: The underlying `Store` implementation to use for models.
     ///   - queryStrategy: The query strategy to use.
     ///   - queryOperation: The operation to use to perform the actual query.
+    @available(iOS 17, *)
     public convenience init<Model>(
         observableStore: ObservableStoreType,
         modelStore: any Store<Model.Key, Model>,

Sources/SwiftRepo/Repository/Store/PersistentStore.swift

@@ -9,6 +9,7 @@ import Foundation
 import SwiftData
 
 /// A persistent `Store` implementation implementation using `SwiftData`.
+@available(iOS 18, *)
 public class PersistentStore<Key: Codable & Hashable, Value: Codable>: Store {
 
     public var keys: [Key] {

Sources/SwiftRepo/Repository/Store/SwiftDataStore.swift

@@ -11,6 +11,7 @@ import SwiftData
 import SwiftRepoCore
 
 // An implementation of `Store` that uses `SwiftData` under the hood
+@available(iOS 18, *)
 public class SwiftDataStore<Model: StoreModel>: Store where Model: PersistentModel, Model.Key: Hashable & Codable {
     public typealias Key = Model.Key
     public typealias Value = Model

Sources/SwiftRepo/Repository/StoreModel.swift

@@ -11,6 +11,7 @@ import Foundation
 /// This interface is to be used with models that will be retrieved by the app
 /// through database queries, rather than published by a `QueryRepository`,
 /// such as when using SwiftData.
+@available(iOS 17, *)
 public protocol StoreModel {
     /// The type to use as the identifier for the model
     associatedtype Key = any Hashable
@@ -21,7 +22,7 @@ public protocol StoreModel {
     /// A predicate that can be used to query for the `StoreModel`
     static func predicate(key: Key) -> Predicate<Self>
 }
-
+@available(iOS 17, *)
 public extension StoreModel where Key == Data {
 
     static func predicate(key: Key) -> Predicate<Self> {
@@ -30,7 +31,7 @@ public extension StoreModel where Key == Data {
         }
     }
 }
-
+@available(iOS 17, *)
 public extension StoreModel where Key == UUID {
 
     static func predicate(key: Key) -> Predicate<Self> {
@@ -39,7 +40,7 @@ public extension StoreModel where Key == UUID {
         }
     }
 }
-
+@available(iOS 17, *)
 public extension StoreModel where Key == String {
 
     static func predicate(key: Key) -> Predicate<Self> {
@@ -48,7 +49,7 @@ public extension StoreModel where Key == String {
         }
     }
 }
-
+@available(iOS 17, *)
 public extension StoreModel where Key == Int {
 
     static func predicate(key: Key) -> Predicate<Self> {

Sources/SwiftRepo/SwiftUI/LoadingControllerView.swift

@@ -45,7 +45,8 @@ public struct LoadingControllerView<DataType, Content, LoadingContent, ErrorCont
 
     public var body: some View {
         loadingControllerView
-            .onChange(of: state) { loadedErrorData = state.loadedIndispensableUIError as? UIErrorType }
+            .onChange(of: state) { _ in
+                loadedErrorData = state.loadedIndispensableUIError as? UIErrorType }
     }
 
     private var loadingControllerView: some View {
@@ -65,8 +66,14 @@ public struct LoadingControllerView<DataType, Content, LoadingContent, ErrorCont
         }
         // Make this view greedy so that it occupies the same space across all loading states.
         .frame(maxWidth: .infinity, maxHeight: .infinity)
-        // This keeps animations together if new animations are created while other animations are in progress.
-        .geometryGroup()
+        .viewAsArgument { view in
+            if #available(iOS 17, *) {
+                // This keeps animations together if new animations are created while other animations are in progress.
+                view.geometryGroup()
+            } else {
+                view.transformEffect(.identity)
+            }
+        }
         .animation(.default, value: state)
         .refreshable { [weak refresh] in
             await refresh?.refresh(retryError: nil)

Sources/SwiftRepo/SwiftUI/View+Extensions.swift

@@ -0,0 +1,14 @@
+//
+//  View+Extensions.swift
+//  SwiftRepo
+//
+//  Created by Carlos De La Mora on 12/4/24.
+//
+
+import SwiftUI
+
+extension View {
+    func viewAsArgument(@ViewBuilder modifier:(Self) -> some View) -> some View {
+        modifier(self)
+    }
+}

Tests/SwiftRepoTests/DefaultQueryRepositoryTests.swift

@@ -32,6 +32,7 @@ class DefaultQueryRepositoryTests: XCTestCase {
         XCTAssertEqual(spy.publishedValues, [valueA1, valueA1, valueA1, valueA2])
     }
 
+    @available(iOS 17, *)
     @MainActor
     func test_GetSuccess_ModelResponse() async throws {
         let repo = makeModelResponseStoreRepository(
@@ -59,6 +60,7 @@ class DefaultQueryRepositoryTests: XCTestCase {
         XCTAssertEqual(try modelStore.get(key: Self.modelCId), responseB.models.last)
     }
 
+    @available(iOS 17, *)
     @MainActor
     func test_GetSuccess_ModelResponse_Trim() async throws {
         let repo = makeModelResponseStoreRepository(
@@ -98,6 +100,7 @@ class DefaultQueryRepositoryTests: XCTestCase {
         XCTAssertEqual(spy.publishedValues.compactMap { $0 as? TestError }, [TestError(category: .failure)])
     }
 
+    @available(iOS 17, *)
     func test_GetError_ModelResponse() async throws {
         let repo = makeModelResponseStoreRepository(
             delayedValues: DelayedValues<TestModelResponse>(values: [
@@ -234,6 +237,7 @@ class DefaultQueryRepositoryTests: XCTestCase {
             var id: UUID
             var updatedAt = Date()
 
+            @available(iOS 17, *)
             static func predicate(key: UUID) -> Predicate<DefaultQueryRepositoryTests.TestModelResponse.TestStoreModel> {
                 #Predicate { $0.id == key }
             }
@@ -294,6 +298,7 @@ class DefaultQueryRepositoryTests: XCTestCase {
 
     /// Makes a repository that stores a single value per unique query ID,
     /// and places ModelResponse values in a separate model store.
+    @available(iOS 17, *)
     private func makeModelResponseStoreRepository(
         mergeStrategy: ModelStoreMergeStrategy = .upsertAppend,
         queryStrategy: QueryStrategy = .ifOlderThan(0.1),

Tests/SwiftRepoTests/SwiftDataStoreTests.swift

@@ -9,6 +9,7 @@ import XCTest
 import SwiftData
 @testable import SwiftRepo
 
+@available(iOS 18, *)
 @MainActor
 class SwiftDataStoreTests: XCTestCase {