7.1.0

.github/workflows/ci.yml

@@ -19,9 +19,9 @@ concurrency:
 jobs:
   info:
     name: Show macOS and Xcode versions
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     steps:
       - name: stats
         run: |
@@ -33,21 +33,21 @@ jobs:
           brew info swiftlint
   macOS:
     name: Test macOS
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     steps:
       - uses: actions/checkout@v4
       - name: macOS
         run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "AdvancedOperation.xcodeproj" -scheme "AdvancedOperation" -destination "platform=macOS" clean test -quiet -resultBundlePath '~/Downloads/Report/report.xcresult'
   iOS:
     name: Test iOS
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=17.0,name=iPhone 15 Pro"]
+        destination: ["OS=18.0,name=iPhone 16 Pro"]
     steps:
       - uses: actions/checkout@v4
       - name: iOS - ${{ matrix.destination }}
@@ -61,12 +61,12 @@ jobs:
           path: ~/Downloads/Report 
   visionOS:
     name: Test visionOS
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=1.0,name=Apple Vision Pro"]
+        destination: ["OS=2.0,name=Apple Vision Pro"]
     steps:
       - uses: actions/checkout@v4
       - name: visionOS - ${{ matrix.destination }}
@@ -80,12 +80,12 @@ jobs:
           path: ~/Downloads/Report
   tvOS:
     name: Test tvOS
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=17.0,name=Apple TV"]
+        destination: ["OS=18.0,name=Apple TV"]
     steps:
       - uses: actions/checkout@v4
       - name: tvOS - ${{ matrix.destination }}
@@ -99,12 +99,12 @@ jobs:
           path: ~/Downloads/Report       
   watchOS:
     name: Test watchOS
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=10.0,name=Apple Watch Series 9 (45mm)"]
+        destination: ["OS=11.0,name=Apple Watch Series 10 (46mm)"]
     steps:
       - uses: actions/checkout@v4
       - name: watchOS - ${{ matrix.destination }}
@@ -118,9 +118,9 @@ jobs:
           path: ~/Downloads/Report
   SPM:
     name: Test SPM Integration
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
     steps:
       - uses: actions/checkout@v4
       - name: SPM Test
@@ -129,7 +129,7 @@ jobs:
           swift test
 #  lint:
 #    name: Swift Lint
-#    runs-on: macos-14
+#    runs-on: macos-15
 #    steps:
 #      - uses: actions/checkout@v4
 #      - name: Run SwiftLint

AdvancedOperation.xcodeproj/xcshareddata/xcschemes/AdvancedOperation.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,7 +29,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:Tests/TestPlans/AdvancedOperation.xctestplan"
+            reference = "container:Support/AdvancedOperation.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 7.1.0
+
+- Added `AsyncCancellableBlockOperation`.
+- Swift 6 support
+- Xcode 16 support
+
 ### 7.0.0
 
 - SPM only

Package.swift

@@ -1,13 +1,11 @@
-// swift-tools-version:5.10
+// swift-tools-version: 6.0
 
 import PackageDescription
 import Foundation
 
 let buildingDocumentation = getenv("BUILDING_FOR_DOCUMENTATION_GENERATION") != nil
 
-let swiftSettings: [SwiftSetting] = [
-  .enableExperimentalFeature("StrictConcurrency")
-]
+let swiftSettings: [SwiftSetting] = []
 
 let package = Package(
   name: "AdvancedOperation",
@@ -19,7 +17,7 @@ let package = Package(
     .target(name: "AdvancedOperation", path: "Sources", swiftSettings: swiftSettings),
     .testTarget(name: "AdvancedOperationTests", dependencies: ["AdvancedOperation"], swiftSettings: swiftSettings)
   ],
-  swiftLanguageVersions: [.v5]
+  swiftLanguageModes: [.v6]
 )
 
 // Only require the docc plugin when building documentation

Sources/Core/AsynchronousOperation.swift

@@ -8,7 +8,7 @@ public typealias AsyncOperation = AsynchronousOperation
 /// An abstract thread safe subclass of `Operation` to support asynchronous operations.
 ///
 /// Subclasses must override `main` to perform any work and, if they are asynchronous, call the `finish()` method to complete the execution.
-open class AsynchronousOperation: Operation, ProgressReporting {
+open class AsynchronousOperation: Operation, ProgressReporting, @unchecked Sendable {
   // MARK: - Public Properties
 
   /// The `progress` property represents a total progress of the operation during its execution.

Sources/Operations/AsynchronousBlockOperation.swift

@@ -1,17 +1,23 @@
 // AdvancedOperation
 
 import Foundation
+import os.lock
 
 public typealias AsyncBlockOperation = AsynchronousBlockOperation
 
 /// A  sublcass of `AsynchronousOperation` to execute a closure.
-public final class AsynchronousBlockOperation: AsynchronousOperation {
-  /// A closure type that takes a closure as its parameter.
-  public typealias Block = (@Sendable @escaping () -> Void) -> Void
-
+///  - Note: If the operation gets cancelled before being executed, the block won't be called.
+ ///
+ /// This operation let you run a block until *complete* is called.
+ ///   ```
+ ///   let operation = AsyncCancellableBlockOperation { complete in
+ ///    // work ...
+ ///    complete()
+ ///   }
+public final class AsynchronousBlockOperation: AsynchronousOperation, @unchecked Sendable {
   // MARK: - Private Properties
 
-  private var block: Block
+  private let block: (@Sendable @escaping () -> Void) -> Void
 
   // MARK: - Initializers
 
@@ -20,7 +26,8 @@ public final class AsynchronousBlockOperation: AsynchronousOperation {
   /// - Parameters:
   ///   - block: The closure to run when the operation executes; the parameter passed to the block **MUST** be invoked by your code,
   ///   or else the `AsynchronousBlockOperation` will never finish executing.
-  public init(block: @escaping Block) {
+  public init(block: @Sendable @escaping (@Sendable @escaping () -> Void) -> Void) {
+    // block is @Sendable because of https://github.com/swiftlang/swift/issues/75453#issuecomment-2374682664
     self.block = block
     super.init()
     self.name = "\(type(of: self))"

Sources/Operations/AsynchronousCancellableBlockOperation.swift

@@ -0,0 +1,51 @@
+// AdvancedOperation
+
+public typealias AsyncCancellableBlockOperation = AsynchronousCancellableBlockOperation
+
+/// A  sublcass of `AsynchronousOperation` to execute a cancellable closure.
+///  - Note: If the operation gets cancelled before being executed, the block won't be called.
+///
+/// This operation let you run a block until *complete* is called; its cancelled state is exposed during the whole execution.
+///   ```
+///   let operation = AsyncCancellableBlockOperation { isCancelled, complete in
+///    // work ...
+///    if isCancelled() {
+///      complete()
+///      return
+///    }
+///    // work ...
+///    complete()
+///   }
+public final class AsynchronousCancellableBlockOperation: AsynchronousOperation, @unchecked Sendable {
+  // MARK: - Private Properties
+
+  private var block: (@escaping @Sendable () -> Bool, @escaping @Sendable () -> Void) -> Void
+
+  // MARK: - Initializers
+
+  /// The designated initializer.
+  ///
+  /// - Parameters:
+  ///   - block: The closure to run when the operation executes; the parameter passed to the block **MUST** be invoked by your code,
+  ///   or else the `AsynchronousBlockOperation` will never finish executing.
+  public init(block: @Sendable @escaping (@escaping @Sendable () -> Bool, @escaping @Sendable () -> Void) -> Void) {
+    self.block = block
+    super.init()
+    self.name = "\(type(of: self))"
+  }
+
+  // MARK: - Overrides
+
+  public final override func main() {
+    guard !isCancelled else {
+      self.finish()
+      return
+    }
+
+    block ({
+      self.isCancelled
+    }) {
+      self.finish()
+    }
+  }
+}

Sources/Operations/FailableAsyncOperation.swift

@@ -6,7 +6,7 @@ import os.lock
 public typealias FailableAsyncOperation = FailableAsynchronousOperation
 
 /// An `AsynchronousOperation` that can finish with an error conforming to `OperationError`.
-open class FailableAsynchronousOperation<Failure: Error>: AsynchronousOperation {
+open class FailableAsynchronousOperation<Failure: Error>: AsynchronousOperation, @unchecked Sendable {
   private var _error = OSAllocatedUnfairLock<Failure?>(initialState: nil)
 
   /// Failure error.

Sources/Operations/GroupOperation.swift

@@ -4,7 +4,7 @@ import Foundation
 
 /// An `AsynchronousOperation` subclass which enables a finite grouping of other operations.
 /// Use a `GroupOperation` to associate related operations together, thereby creating higher levels of abstractions.
-open class GroupOperation: AsynchronousOperation {
+open class GroupOperation: AsynchronousOperation, @unchecked Sendable {
   // MARK: - Public Properties
 
   /// The maximum number of queued operations that can execute at the same time inside the `GroupOperation`.
@@ -57,8 +57,7 @@ open class GroupOperation: AsynchronousOperation {
   }
 
   deinit {
-    // An observation token may cause crashes during its deinit phase if its observed object (an Operation)
-    // has been already deallocated
+    // An observation token may cause crashes during its deinit phase if its observed object (an Operation) has been already deallocated.
     // To fix this issue:
     // 1. we store all the operations in a private array (the internal OperationQueue will release them once finished,
     //    that's why we need to do so)

Sources/Operations/ResultOperation.swift

@@ -6,7 +6,7 @@ import os.lock
 /// An `AsynchronousOperation` that produces a `result` once finished.
 ///
 /// If a `ResultOperation` gets cancelled before being executed, no result will be produced by default.
-open class ResultOperation<Success, Failure>: AsynchronousOperation where Success: Sendable, Failure: Error {
+open class ResultOperation<Success, Failure>: AsynchronousOperation, @unchecked Sendable where Success: Sendable, Failure: Error {
   /// Block executed after the operation is finished providing the final result (if any).
   /// - Note: `onFinish` and `completionBlock` call order is not guaranteed in any way.
   public var onFinish: ((Result<Success, Failure>?) -> Void)?