fix EnvironmentLazyObject.Holder<Value> as @StateObject property

NikSativa · Jul 19, 2024 · 3ed0182 · 3ed0182
1 parent 44cea87
commit 3ed0182
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 41 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,12 +5,12 @@ import PackageDescription
 let package = Package(
     name: "DIKit",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v14),
         .macOS(.v11),
-        .macCatalyst(.v13),
+        .macCatalyst(.v14),
         .visionOS(.v1),
-        .tvOS(.v13),
-        .watchOS(.v6)
+        .tvOS(.v14),
+        .watchOS(.v7)
     ],
     products: [
         .library(name: "DIKit", targets: ["DIKit"]),

diff --git a/[email protected] b/[email protected]
@@ -5,11 +5,11 @@ import PackageDescription
 let package = Package(
     name: "DIKit",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v14),
         .macOS(.v11),
-        .macCatalyst(.v13),
-        .tvOS(.v13),
-        .watchOS(.v6)
+        .macCatalyst(.v14),
+        .tvOS(.v14),
+        .watchOS(.v7)
     ],
     products: [
         .library(name: "DIKit", targets: ["DIKit"]),

diff --git a/[email protected] b/[email protected]
@@ -5,11 +5,11 @@ import PackageDescription
 let package = Package(
     name: "DIKit",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v14),
         .macOS(.v11),
-        .macCatalyst(.v13),
-        .tvOS(.v13),
-        .watchOS(.v6)
+        .macCatalyst(.v14),
+        .tvOS(.v14),
+        .watchOS(.v7)
     ],
     products: [
         .library(name: "DIKit", targets: ["DIKit"]),

diff --git a/[email protected] b/[email protected]
@@ -5,11 +5,11 @@ import PackageDescription
 let package = Package(
     name: "DIKit",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v14),
         .macOS(.v11),
-        .macCatalyst(.v13),
-        .tvOS(.v13),
-        .watchOS(.v6)
+        .macCatalyst(.v14),
+        .tvOS(.v14),
+        .watchOS(.v7)
     ],
     products: [
         .library(name: "DIKit", targets: ["DIKit"]),

diff --git a/[email protected] b/[email protected]
@@ -5,11 +5,11 @@ import PackageDescription
 let package = Package(
     name: "DIKit",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v14),
         .macOS(.v11),
-        .macCatalyst(.v13),
-        .tvOS(.v13),
-        .watchOS(.v6)
+        .macCatalyst(.v14),
+        .tvOS(.v14),
+        .watchOS(.v7)
     ],
     products: [
         .library(name: "DIKit", targets: ["DIKit"]),

diff --git a/Source/PropertyWrapper/EnvironmentLazyObject.swift b/Source/PropertyWrapper/EnvironmentLazyObject.swift
@@ -5,7 +5,7 @@ import SwiftUI
 @propertyWrapper
 public struct EnvironmentLazyObject<Value: ObservableObject>: DynamicProperty {
     @EnvironmentObject private var container: ObservableResolver
-    @ObservedObject private var holder: Holder<Value> = .init()
+    @StateObject private var holder: Holder<Value> = .init()
 
     public var wrappedValue: Value {
         return resolveInstance()

diff --git a/Tests/EnvironmentLazyTests.swift b/Tests/EnvironmentLazyTests.swift
@@ -4,7 +4,7 @@ import SpryKit
 import SwiftUI
 import XCTest
 
-@available(iOS 16.0, *)
+@available(iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 final class EnvironmentLazyTests: XCTestCase {
     private var resolvingCounter: Int = 0
     private let container: Container = .init(assemblies: [])
@@ -29,18 +29,18 @@ final class EnvironmentLazyTests: XCTestCase {
         var appView: (some View)? = makeAppView()
         XCTAssertEqual(resolvingCounter, 0)
 
-        let capture = ImageRenderer(content: appView).uiImage
+        let capture = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture)
         XCTAssertEqual(resolvingCounter, 1)
 
-        let capture2 = ImageRenderer(content: appView).uiImage
+        let capture2 = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture2)
         XCTAssertEqual(resolvingCounter, 1)
 
         appView = nil
         let appView2 = makeAppView()
 
-        let capture3 = ImageRenderer(content: appView2).uiImage
+        let capture3 = ImageRenderer(content: appView2).actualImage
         XCTAssertNotNil(capture3)
         XCTAssertEqual(resolvingCounter, 2)
     }
@@ -52,18 +52,18 @@ final class EnvironmentLazyTests: XCTestCase {
         var appView: (some View)? = makeAppView()
         XCTAssertEqual(resolvingCounter, 0)
 
-        let capture = ImageRenderer(content: appView).uiImage
+        let capture = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture)
         XCTAssertEqual(resolvingCounter, 1)
 
-        let capture2 = ImageRenderer(content: appView).uiImage
+        let capture2 = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture2)
         XCTAssertEqual(resolvingCounter, 1)
 
         appView = nil
         let appView2 = makeAppView()
 
-        let capture3 = ImageRenderer(content: appView2).uiImage
+        let capture3 = ImageRenderer(content: appView2).actualImage
         XCTAssertNotNil(capture3)
         XCTAssertEqual(resolvingCounter, 2)
     }
@@ -75,18 +75,18 @@ final class EnvironmentLazyTests: XCTestCase {
         var appView: (some View)? = makeAppView()
         XCTAssertEqual(resolvingCounter, 0)
 
-        let capture = ImageRenderer(content: appView).uiImage
+        let capture = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture)
         XCTAssertEqual(resolvingCounter, 1)
 
-        let capture2 = ImageRenderer(content: appView).uiImage
+        let capture2 = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture2)
         XCTAssertEqual(resolvingCounter, 1)
 
         appView = nil
         let appView2 = makeAppView()
 
-        let capture3 = ImageRenderer(content: appView2).uiImage
+        let capture3 = ImageRenderer(content: appView2).actualImage
         XCTAssertNotNil(capture3)
         XCTAssertEqual(resolvingCounter, 1)
     }

diff --git a/Tests/EnvironmentProviderTests.swift b/Tests/EnvironmentProviderTests.swift
@@ -4,7 +4,7 @@ import SpryKit
 import SwiftUI
 import XCTest
 
-@available(iOS 16.0, *)
+@available(iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 final class EnvironmentProviderTests: XCTestCase {
     private var resolvingCounter: Int = 0
     private let container: Container = .init(assemblies: [])
@@ -29,18 +29,18 @@ final class EnvironmentProviderTests: XCTestCase {
         var appView: (some View)? = makeAppView()
         XCTAssertEqual(resolvingCounter, 0)
 
-        let capture = ImageRenderer(content: appView).uiImage
+        let capture = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture)
         XCTAssertEqual(resolvingCounter, 1)
 
-        let capture2 = ImageRenderer(content: appView).uiImage
+        let capture2 = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture2)
         XCTAssertEqual(resolvingCounter, 2)
 
         appView = nil
         let appView2 = makeAppView()
 
-        let capture3 = ImageRenderer(content: appView2).uiImage
+        let capture3 = ImageRenderer(content: appView2).actualImage
         XCTAssertNotNil(capture3)
         XCTAssertEqual(resolvingCounter, 3)
     }
@@ -52,18 +52,18 @@ final class EnvironmentProviderTests: XCTestCase {
         var appView: (some View)? = makeAppView()
         XCTAssertEqual(resolvingCounter, 0)
 
-        let capture = ImageRenderer(content: appView).uiImage
+        let capture = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture)
         XCTAssertEqual(resolvingCounter, 1)
 
-        let capture2 = ImageRenderer(content: appView).uiImage
+        let capture2 = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture2)
         XCTAssertEqual(resolvingCounter, 2)
 
         appView = nil
         let appView2 = makeAppView()
 
-        let capture3 = ImageRenderer(content: appView2).uiImage
+        let capture3 = ImageRenderer(content: appView2).actualImage
         XCTAssertNotNil(capture3)
         XCTAssertEqual(resolvingCounter, 3)
     }
@@ -75,18 +75,18 @@ final class EnvironmentProviderTests: XCTestCase {
         var appView: (some View)? = makeAppView()
         XCTAssertEqual(resolvingCounter, 0)
 
-        let capture = ImageRenderer(content: appView).uiImage
+        let capture = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture)
         XCTAssertEqual(resolvingCounter, 1)
 
-        let capture2 = ImageRenderer(content: appView).uiImage
+        let capture2 = ImageRenderer(content: appView).actualImage
         XCTAssertNotNil(capture2)
         XCTAssertEqual(resolvingCounter, 1)
 
         appView = nil
         let appView2 = makeAppView()
 
-        let capture3 = ImageRenderer(content: appView2).uiImage
+        let capture3 = ImageRenderer(content: appView2).actualImage
         XCTAssertNotNil(capture3)
         XCTAssertEqual(resolvingCounter, 1)
     }

diff --git a/Tests/ImageRenderer+TestHelper.swift b/Tests/ImageRenderer+TestHelper.swift
@@ -0,0 +1,14 @@
+import Foundation
+import SpryKit
+import SwiftUI
+
+@available(iOS 16.0, tvOS 16.0, watchOS 9.0, *)
+extension ImageRenderer {
+    @MainActor var actualImage: SpryKit.Image? {
+        #if os(macOS)
+        return nsImage
+        #elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
+        return uiImage
+        #endif
+    }
+}