From c7c4c9e8dc3edd1c06bb32ac6f469e08875e347f Mon Sep 17 00:00:00 2001 From: John Estropia Date: Tue, 25 Feb 2025 10:34:39 +0900 Subject: [PATCH 1/2] WIP --- Package.resolved | 4 ++-- Package.swift | 2 +- Sources/Components/Compositions/AnyDisplayNode.swift | 2 +- Sources/Components/Compositions/HighlightCellNode.swift | 2 +- Sources/Components/Compositions/InteractiveNode.swift | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Package.resolved b/Package.resolved index 9ac2b34..66efa55 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/FluidGroup/Texture.git", "state" : { - "revision" : "68df47f0d26522da76b06f22e9a97e4d4ab58dad", - "version" : "3.0.2" + "branch" : "john/mainActor", + "revision" : "593b584aaaecc9b26818eed73be10fad902006db" } } ], diff --git a/Package.swift b/Package.swift index 846c451..df175ca 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( .library(name: "TextureSwiftSupport", targets: ["TextureSwiftSupport"]), ], dependencies: [ - .package(url: "https://github.com/FluidGroup/Texture.git", from: "3.0.2"), + .package(url: "https://github.com/FluidGroup/Texture.git", branch: "john/mainActor"), .package(url: "https://github.com/FluidGroup/Descriptors", from: "0.2.0"), ], targets: [ diff --git a/Sources/Components/Compositions/AnyDisplayNode.swift b/Sources/Components/Compositions/AnyDisplayNode.swift index 1b1864c..930567b 100644 --- a/Sources/Components/Compositions/AnyDisplayNode.swift +++ b/Sources/Components/Compositions/AnyDisplayNode.swift @@ -106,7 +106,7 @@ open class AnyDisplayNode: SafeAreaDisplayNode { } @available(*, unavailable) - open override func onDidLoad(_ body: @escaping ASDisplayNodeDidLoadBlock) { + open override func onDidLoad(_ body: @escaping @MainActor (ASDisplayNode) -> Void) { super.onDidLoad(body) } diff --git a/Sources/Components/Compositions/HighlightCellNode.swift b/Sources/Components/Compositions/HighlightCellNode.swift index f9bbbcc..a18a536 100644 --- a/Sources/Components/Compositions/HighlightCellNode.swift +++ b/Sources/Components/Compositions/HighlightCellNode.swift @@ -40,7 +40,7 @@ open class HighlightCellNode: NamedDisplayCellNodeBase { If body uses layer-backing, it can't take a view to animate by UIView based animation. With wrapping another node, it enables body-node can be animatable. */ - self.animationTargetNode = AnyWrapperNode { body } + self.animationTargetNode = AnyWrapperNode(content: body) } else { self.animationTargetNode = body } diff --git a/Sources/Components/Compositions/InteractiveNode.swift b/Sources/Components/Compositions/InteractiveNode.swift index 4c84a7d..88635e7 100644 --- a/Sources/Components/Compositions/InteractiveNode.swift +++ b/Sources/Components/Compositions/InteractiveNode.swift @@ -72,7 +72,7 @@ open class InteractiveNode: NamedDisplayControlNodeBase { If body uses layer-backing, it can't take a view to animate by UIView based animation. With wrapping another node, it enables body-node can be animatable. */ - animationTargetNode = AnyWrapperNode { body } + animationTargetNode = AnyWrapperNode(content: body) } else { animationTargetNode = body } From ce669fe874eb49f5c7c6e0e7dd441951f03afe9b Mon Sep 17 00:00:00 2001 From: John Estropia Date: Tue, 25 Feb 2025 14:43:15 +0900 Subject: [PATCH 2/2] update texture --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 66efa55..315f9ac 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/FluidGroup/Texture.git", "state" : { - "branch" : "john/mainActor", - "revision" : "593b584aaaecc9b26818eed73be10fad902006db" + "revision" : "f6aba697c93e955b822e1bed148e83eee2db70e4", + "version" : "3.0.3" } } ], diff --git a/Package.swift b/Package.swift index df175ca..c6b49df 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( .library(name: "TextureSwiftSupport", targets: ["TextureSwiftSupport"]), ], dependencies: [ - .package(url: "https://github.com/FluidGroup/Texture.git", branch: "john/mainActor"), + .package(url: "https://github.com/FluidGroup/Texture.git", from: "3.0.3"), .package(url: "https://github.com/FluidGroup/Descriptors", from: "0.2.0"), ], targets: [