Xcode 14 compatibility (#39)

* Xcode 14 compatibility * Fix tests * Apply suggestions from code review Co-authored-by: Daniil Subbotin <[email protected]> Co-authored-by: Anna Kocheshkova <[email protected]> Co-authored-by: Daniil Subbotin <[email protected]>
RedMadRobot · Jul 23, 2022 · 51967db · 51967db
1 parent 6b89272
commit 51967db
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/Sources/ApexyLoader/ContentLoader.swift b/Sources/ApexyLoader/ContentLoader.swift
@@ -38,14 +38,32 @@ open class ContentLoader<Content>: ObservableLoader {
         }
     }
 
+    // Can not use `@available` with lazy properties in Xcode 14. This is a workaround.
+    // https://stackoverflow.com/a/55534141/7453375
+    private var storedStateSubject: Any?
     @available(iOS 13.0, macOS 10.15, watchOS 6.0, tvOS 13.0, *)
-    private lazy var stateSubject = CurrentValueSubject<LoadingState<Content>, Never>(.initial)
+    private var stateSubject: CurrentValueSubject<LoadingState<Content>, Never> {
+        if let subject = storedStateSubject as? CurrentValueSubject<LoadingState<Content>, Never> {
+            return subject
+        }
+        let subject = CurrentValueSubject<LoadingState<Content>, Never>(.initial)
+        storedStateSubject = subject
+        return subject
+    }
 
     /// Content loading status. The default value is `.initial`.
     ///
     /// - Remark: To change state use `update(_:)`.
+    private var storedStatePublisher: Any?
     @available(iOS 13.0, macOS 10.15, watchOS 6.0, tvOS 13.0, *)
-    public lazy var statePublisher: AnyPublisher<LoadingState<Content>, Never> = stateSubject.eraseToAnyPublisher()
+    public var statePublisher: AnyPublisher<LoadingState<Content>, Never>  {
+        if let publisher = storedStatePublisher as? AnyPublisher<LoadingState<Content>, Never>  {
+            return publisher
+        }
+        let publisher = stateSubject.eraseToAnyPublisher()
+        storedStatePublisher = publisher
+        return publisher
+    }
 
     public init() {}