Swift 6 support

Package.swift

@@ -1,16 +1,16 @@
-// swift-tools-version:5.6
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
   name: "TextureSwiftSupport",
   platforms: [
-    .iOS(.v13),
+    .iOS(.v15),
   ],
   products: [
     .library(name: "TextureSwiftSupport", targets: ["TextureSwiftSupport"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/FluidGroup/Texture.git", from: "3.0.2"),
+    .package(url: "https://github.com/ntnmrndn/Texture.git", branch: "antoine/swift6"),
     .package(url: "https://github.com/FluidGroup/Descriptors", from: "0.2.0"),
   ],
   targets: [
@@ -23,5 +23,5 @@ let package = Package(
       path: "Sources"
     ),
   ],
-  swiftLanguageVersions: [.v5]
+  swiftLanguageModes: [.v6]
 )

Sources/Components/Compositions/HighlightCellNode.swift

@@ -106,6 +106,7 @@ open class HighlightCellNode<D: ASDisplayNode>: NamedDisplayCellNodeBase {
     }
   }
 
+  @MainActor
   open override var isHighlighted: Bool {
     didSet {
       highlightHandler?(isHighlighted, self.view, animationTargetNode.view)

Sources/Components/Compositions/InteractiveNode.swift

@@ -151,6 +151,7 @@ open class InteractiveNode<D: ASDisplayNode>: NamedDisplayControlNodeBase {
     }
   }
 
+  @MainActor
   open override var isHighlighted: Bool {
     didSet {
       highlightHandler?(isHighlighted, self.view, animationTargetNode.view)

Sources/Components/Compositions/OnAppearNode.swift

@@ -73,9 +73,18 @@ public final class OnAppearNode<Content: ASDisplayNode>: NamedDisplayCellNodeBas
 
     state = .init()
 
-    bottomRightTiledLayerNode = .init(wrappedView: { .init() })
-    topLeftTiledLayerNode = .init(wrappedView: { .init() })
-
+    bottomRightTiledLayerNode = .init(wrappedView: {
+      MainActor.assumeIsolated {
+        .init()
+      }
+    })
+    topLeftTiledLayerNode = .init(wrappedView: {
+      MainActor.assumeIsolated {
+        // NB,
+        .init()
+      }
+    })
+
     setNeedsLayout()
 
     bottomRightTiledLayerNode!.wrappedView.setOnDraw { [weak self] in
@@ -214,24 +223,31 @@ private final class TiledLayerView: UIView {
     return view
   }
 
-  func setOnDraw(_ closure: @escaping @MainActor () -> Void) {
+  func setOnDraw(_ closure: @Sendable @escaping @MainActor () -> Void) {
     (layer as! TiledLayer).onDraw = closure
   }
 }
 
 private final class TiledLayer: CATiledLayer {
 
-  var onDraw: () -> Void = {}
+  var onDraw: @MainActor @Sendable () -> Void = {}
 
   override class func fadeDuration() -> CFTimeInterval {
     0
   }
 
   override func draw(in ctx: CGContext) {
+    let onDraw = self.onDraw
     if Thread.isMainThread {
-      onDraw()
+      MainActor.assumeIsolated {
+        onDraw()
+      }
     } else {
-      DispatchQueue.main.async(execute: onDraw)
+      DispatchQueue.main.async(execute: {
+        MainActor.assumeIsolated {
+          onDraw()
+        }
+      })
     }
   }
 }

Sources/Components/Compositions/ShapeLayerNode.swift

@@ -26,8 +26,8 @@ fileprivate final class BackingShapeLayerNode : ASDisplayNode {
 }
 
 /// A node that displays shape with CAShapeLayer
-public final class ShapeLayerNode : ASDisplayNode, ShapeDisplaying {
-  
+public final class ShapeLayerNode : ASDisplayNode, @preconcurrency  ShapeDisplaying, @unchecked Sendable {
+
   private let backingNode = BackingShapeLayerNode()
 
   private let updateClosure: Update
@@ -41,47 +41,61 @@ public final class ShapeLayerNode : ASDisplayNode, ShapeDisplaying {
   public override var supportsLayerBacking: Bool {
     return true
   }
-
+
+  @MainActor
   public var shapeLayer: CAShapeLayer {
     backingNode.layer
   }
 
   // To be thread-safe, using stored property
+  /// Should be set on mainThread, TODO: Discuss how to enforce the rule
   public var shapeLineWidth: CGFloat = 0 {
     didSet {
-      backingNode.layer.lineWidth = shapeLineWidth
-      setNeedsLayout()
+      MainActor.assumeIsolated {
+        backingNode.layer.lineWidth = shapeLineWidth
+        setNeedsLayout()
+      }
     }
   }
-
+
+  @MainActor
   public var shapeStrokeColor: UIColor? {
     get {
       return backingNode.layer.strokeColor.map { UIColor(cgColor: $0) }
     }
     set {
+      // Keep it for now since we might have non confirming implementation
       ASPerformBlockOnMainThread {
-        CATransaction.begin()
-        CATransaction.setDisableActions(true)
-        defer {
-          CATransaction.commit()
+        MainActor.assumeIsolated {
+
+          CATransaction.begin()
+          CATransaction.setDisableActions(true)
+          defer {
+            CATransaction.commit()
+          }
+          self.backingNode.layer.strokeColor = newValue?.cgColor
         }
-        self.backingNode.layer.strokeColor = newValue?.cgColor
       }
     }
   }
-
+
+  @MainActor
   public var shapeFillColor: UIColor? {
     get {
       return backingNode.layer.fillColor.map { UIColor(cgColor: $0) }
     }
     set {
+      // Keep it for now since we might have non confirming implementation
       ASPerformBlockOnMainThread {
-        CATransaction.begin()
-        CATransaction.setDisableActions(true)
-        defer {
-          CATransaction.commit()
+        MainActor.assumeIsolated {
+
+          CATransaction.begin()
+          CATransaction.setDisableActions(true)
+          defer {
+            CATransaction.commit()
+          }
+          self.backingNode.layer.fillColor = newValue?.cgColor
         }
-        self.backingNode.layer.fillColor = newValue?.cgColor
       }
     }
   }
@@ -95,16 +109,18 @@ public final class ShapeLayerNode : ASDisplayNode, ShapeDisplaying {
     }
     backingNode.layer.path = updateClosure(backingNode.bounds).cgPath
   }
-  
+
   public override var frame: CGRect {
     didSet {
       ASPerformBlockOnMainThread {
-        CATransaction.begin()
-        CATransaction.setDisableActions(true)
-        defer {
-          CATransaction.commit()
+        MainActor.assumeIsolated {
+          CATransaction.begin()
+          CATransaction.setDisableActions(true)
+          defer {
+            CATransaction.commit()
+          }
+          self.backingNode.layer.path = self.updateClosure(self.backingNode.bounds).cgPath
         }
-        self.backingNode.layer.path = self.updateClosure(self.backingNode.bounds).cgPath
       }
     }
   }

Sources/Components/Compositions/StyledEdgeNode.swift

@@ -205,51 +205,54 @@ public class StyledEdgeNode<ContentNode: ASDisplayNode>: NamedDisplayNodeBase {
   private func updateBorder() {
 
     ASPerformBlockOnMainThread {
-      CATransaction.begin()
-      CATransaction.setDisableActions(true)
-      defer {
-        CATransaction.commit()
+      MainActor.assumeIsolated {
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        defer {
+          CATransaction.commit()
+        }
+
+        if let border = self.border {
+          self.borderNode.shapeFillColor = .clear
+          self.borderNode.shapeStrokeColor = border.color
+          self.borderNode.shapeLineWidth = border.width * 2 // to get inner border
+          self.borderNode.isHidden = false
+        } else {
+          self.borderNode.isHidden = true
+        }
+
+        self.setNeedsLayout()
       }
-
-      if let border = self.border {
-        self.borderNode.shapeFillColor = .clear
-        self.borderNode.shapeStrokeColor = border.color
-        self.borderNode.shapeLineWidth = border.width * 2 // to get inner border
-        self.borderNode.isHidden = false
-      } else {
-        self.borderNode.isHidden = true
-      }
-
-      self.setNeedsLayout()
     }
   }
 
   private func updateStrategy() {
 
     ASPerformBlockOnMainThread {
+      MainActor.assumeIsolated {
 
-      CATransaction.begin()
-      CATransaction.setDisableActions(true)
-      defer {
-        CATransaction.commit()
-      }
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        defer {
+          CATransaction.commit()
+        }
 
-      switch self.cornerRoundingStrategy {
-      case .clip(let assimilationColor):
+        switch self.cornerRoundingStrategy {
+        case .clip(let assimilationColor):
 
-        self.clipNode.shapeFillColor = assimilationColor
+          self.clipNode.shapeFillColor = assimilationColor
 
-        self.isOpaque = true
+          self.isOpaque = true
 
-      case .mask:
+        case .mask:
 
-        self.isOpaque = false
+          self.isOpaque = false
 
-      }
+        }
 
-      self.setNeedsLayout()
+        self.setNeedsLayout()
+      }
     }
-
   }
 
   public override func layoutDidFinish() {

Sources/Components/Compositions/ViewNode.swift

@@ -26,17 +26,21 @@ import Foundation
  */
 open class ViewNode<V: UIView>: NamedDisplayNodeBase {
 
+  @MainActor
   open var wrappedView: V {
     assert(Thread.isMainThread)
     return view as! V
   }
 
   public init(
-    wrappedView: @escaping () -> V
+    wrappedView: @Sendable @MainActor @escaping () -> V
   ) {
     super.init()
     setViewBlock {
-      wrappedView()
+      // https://github.com/swiftlang/swift/issues/76099
+      MainActor.assumeIsolated {
+        wrappedView()
+      }
     }
   }
 }