Swift6 (#6)

.github/workflows/Build.yml

@@ -4,12 +4,12 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
-      - uses: maxim-lobanov/setup-xcode@v1.1
+      - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "14.3"
+          xcode-version: "16.0"
       - uses: actions/checkout@v2
       - name: Run Test
-        run: xcodebuild -scheme swift-concurrency-task-manager test -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.4' | xcpretty
+        run: xcodebuild -scheme swift-concurrency-task-manager test -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=18.0' | xcpretty

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -34,5 +34,6 @@ let package = Package(
       name: "ConcurrencyTaskManagerTests",
       dependencies: ["ConcurrencyTaskManager"]
     ),
-  ]
+  ],
+  swiftLanguageModes: [.v5, .v6]
 )

Sources/ConcurrencyTaskManager/TaskManagerActor.swift

@@ -233,11 +233,11 @@ public actor TaskManagerActor {
     task(label: label, key: key, mode: mode, priority: priority, action)
   }
 
-  public func batch(_ closure: (isolated TaskManagerActor) -> Void) {
+  public func batch(_ closure: sending @Sendable (isolated TaskManagerActor) -> Void) {
     closure(self)
   }
 
-  public func batch(_ closure: (isolated TaskManagerActor) async -> Void) async {
+  public func batch(_ closure: sending @Sendable (isolated TaskManagerActor) async -> Void) async {
     await closure(self)
   }
 

Sources/ConcurrencyTaskManager/TaskQueueActor.swift

@@ -1,16 +1,17 @@
 import Foundation
+@preconcurrency import Combine
 
 /**
  structure of linked-list
  it has a node for the next task after this node.
  */
-final class TaskNode: CustomStringConvertible {
+final class TaskNode: CustomStringConvertible, @unchecked Sendable {
 
   struct WeakBox<T: AnyObject> {
     weak var value: T?
   }
 
-  private struct State {
+  private struct State: Sendable {
 
     var isActivated: Bool = false
     var isFinished: Bool = false
@@ -20,7 +21,7 @@ final class TaskNode: CustomStringConvertible {
 
   private var anyTask: _Verge_TaskType?
 
-  let taskFactory: (WeakBox<TaskNode>) async -> Void
+  let taskFactory: (sending WeakBox<TaskNode>) async -> Void
 
   private(set) var next: TaskNode?
   let label: String
@@ -29,7 +30,7 @@ final class TaskNode: CustomStringConvertible {
 
   init(
     label: String = "",
-    @_inheritActorContext taskFactory: @escaping @Sendable (WeakBox<TaskNode>) async -> Void
+    @_inheritActorContext taskFactory: @escaping @Sendable (sending WeakBox<TaskNode>) async -> Void
   ) {
     self.label = label
     self.taskFactory = taskFactory
@@ -179,18 +180,8 @@ public actor TaskQueueActor {
       }
 
       // connecting to the next if presents
-
-      await self?.batch {
-        guard let node = box.value else { return }
-        if let next = node.next {
-          $0.head = next
-          next.activate()
-        } else {
-          if $0.head === node {
-            $0.head = nil
-          }
-        }
-      }
+
+      await self?.advance(box: box)
 
     }
 
@@ -240,13 +231,17 @@ public actor TaskQueueActor {
     }
 
   }
-
-  /**
-   Performs given closure in a critical session
-   */
-  @discardableResult
-  public func batch<Return>(_ perform: (isolated TaskQueueActor) -> Return) -> Return {
-    return perform(self)
+
+  func advance(box: sending TaskNode.WeakBox<TaskNode>) {
+    guard let node = box.value else { return }
+    if let next = node.next {
+      self.head = next
+      next.activate()
+    } else {
+      if self.head === node {
+        self.head = nil
+      }
+    }
   }
 
 }
@@ -275,7 +270,7 @@ final class AutoReleaseContinuationBox<T>: @unchecked Sendable {
     self.continuation = continuation
   }
 
-  func resume(throwing error: Error) {
+  func resume(throwing error: sending Error) {
     lock.lock()
     defer {
       lock.unlock()
@@ -287,7 +282,7 @@ final class AutoReleaseContinuationBox<T>: @unchecked Sendable {
     continuation?.resume(throwing: error)
   }
 
-  func resume(returning value: T) {
+  func resume(returning value: sending T) {
     lock.lock()
     defer {
       lock.unlock()

Sources/ConcurrencyTaskManager/TaskStackActor.swift

@@ -1,5 +1,6 @@
 import DequeModule
 import Foundation
+@preconcurrency import Combine
 
 public actor TaskStackActor {
 
@@ -105,7 +106,7 @@ public actor TaskStackActor {
         continuation.yield(state)
       }
 
-      continuation.onTermination = { _ in
+      continuation.onTermination = { _ in        
         cancellable.cancel()
       }
 
@@ -129,7 +130,9 @@ public actor TaskStackActor {
     state.update(waitingCount: stack.count, executingCount: currentExecutingTaskCount)
   }
 
-  private func processForCompletion(taskNode: TaskNode) {
+  private func processForCompletion(
+    taskNode: sending TaskNode
+  ) {
     executings.removeAll { $0 === taskNode }
   }
 

Tests/ConcurrencyTaskManagerTests/UnfairLockAtomic.swift

@@ -1,6 +1,6 @@
 import os.atomic
 
-public final class UnfairLock: Sendable {
+public final class UnfairLock: @unchecked Sendable {
   private let _lock: os_unfair_lock_t
 
   public init() {