Enable strict concurrency

Author: mihai8804858

.swiftlint.yml

@@ -3,6 +3,7 @@ included:
   - Tests
   - Example
   - Package.swift
+  - [email protected]
 excluded:
   - .build
   - .docarchives

Makefile

@@ -13,9 +13,9 @@ GENERIC_PLATFORM_VISIONOS = generic/platform=visionOS
 GENERIC_PLATFORM_MACOS = platform=macOS
 GENERIC_PLATFORM_MAC_CATALYST = platform=macOS,variant=Mac Catalyst
 
-SIM_PLATFORM_IOS = platform=iOS Simulator,id=$(call udid_for,iOS 18.0,iPhone \d\+ Pro [^M])
-SIM_PLATFORM_TVOS = platform=tvOS Simulator,id=$(call udid_for,tvOS 18.0,TV)
-SIM_PLATFORM_VISIONOS = platform=visionOS Simulator,id=$(call udid_for,visionOS 2.0,Vision)
+SIM_PLATFORM_IOS = platform=iOS Simulator,id=$(call udid_for,iOS 18.2,iPhone \d\+ Pro [^M])
+SIM_PLATFORM_TVOS = platform=tvOS Simulator,id=$(call udid_for,tvOS 18.2,TV)
+SIM_PLATFORM_VISIONOS = platform=visionOS Simulator,id=$(call udid_for,visionOS 2.2,Vision)
 SIM_PLATFORM_MACOS = platform=macOS
 SIM_PLATFORM_MAC_CATALYST = platform=macOS,variant=Mac Catalyst
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:5.8
 import PackageDescription
 import Foundation
 
@@ -52,5 +52,6 @@ let package = Package(
                 .copy("Resources/Subs")
             ]
         )
-    ]
+    ],
+    swiftLanguageVersions: [.v5]
 )

[email protected]

@@ -0,0 +1,59 @@
+// swift-tools-version:6.0
+import PackageDescription
+import Foundation
+
+let package = Package(
+    name: "swift-ass-renderer",
+    platforms: [
+        .iOS(.v15),
+        .tvOS(.v15),
+        .visionOS(.v1),
+        .macOS(.v12),
+        .macCatalyst(.v15)
+    ],
+    products: [
+        .library(name: "SwiftAssRenderer", targets: ["SwiftAssRenderer"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/mihai8804858/swift-snapshot-testing", branch: "main"),
+        .package(url: "https://github.com/mihai8804858/swift-libass", .upToNextMajor(from: "1.0.0")),
+        .package(url: "https://github.com/pointfreeco/combine-schedulers", .upToNextMajor(from: "1.0.0"))
+    ],
+    targets: [
+        .target(
+            name: "SwiftAssRenderer",
+            dependencies: [
+                .target(name: "SwiftAssBlend"),
+                .product(name: "SwiftLibass", package: "swift-libass"),
+                .product(name: "CombineSchedulers", package: "combine-schedulers")
+            ],
+            path: "Sources/SwiftAssRenderer",
+            resources: [
+                .copy("Resources/PrivacyInfo.xcprivacy")
+            ],
+            swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]
+        ),
+        .target(
+            name: "SwiftAssBlend",
+            dependencies: [
+                .product(name: "SwiftLibass", package: "swift-libass")
+            ],
+            path: "Sources/SwiftAssBlend",
+            swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]
+        ),
+        .testTarget(
+            name: "SwiftAssRendererTests",
+            dependencies: [
+                .target(name: "SwiftAssRenderer"),
+                .product(name: "SnapshotTesting", package: "swift-snapshot-testing")
+            ],
+            path: "Tests",
+            exclude: ["Pipeline/__Snapshots__"],
+            resources: [
+                .copy("Resources/Fonts"),
+                .copy("Resources/Subs")
+            ]
+        )
+    ],
+    swiftLanguageModes: [.v6]
+)

Sources/SwiftAssRenderer/Composition/AssSubtitlesRenderer+Composition.swift

@@ -3,7 +3,7 @@ import UIKit
 #elseif canImport(AppKit)
 import AppKit
 #endif
-import AVFoundation
+@preconcurrency import AVFoundation
 
 @available(iOS 16.0, tvOS 16.0, visionOS 1.0, macCatalyst 16.0, macOS 13.0, *)
 public extension AssSubtitlesRenderer {

Sources/SwiftAssRenderer/Composition/AssVideoComposition.swift

@@ -4,7 +4,7 @@ import UIKit
 import AppKit
 #endif
 @preconcurrency import AVFoundation
-import CoreImage
+@preconcurrency import CoreImage
 
 @available(iOS 16.0, tvOS 16.0, visionOS 1.0, macCatalyst 16.0, macOS 13.0, *)
 final class AssVideoComposition: Sendable {

Sources/SwiftAssRenderer/Extensions/AVPlayer.swift

@@ -1,5 +1,5 @@
 import AVFoundation
-import Combine
+@preconcurrency import Combine
 
 extension AVPlayer {
     func periodicTimeObserver(interval: CMTime, queue: DispatchQueue = .main) -> AnyPublisher<CMTime, Never> {

Sources/SwiftAssRenderer/Extensions/DispatchQueue.swift

@@ -2,16 +2,11 @@ import Dispatch
 import Foundation
 
 protocol DispatchQueueType: Sendable {
-    func executeAsync(_ work: @escaping () -> Void)
+    func executeAsync(_ work: @escaping @Sendable () -> Void)
 }
 
 extension DispatchQueue: DispatchQueueType {
-    func executeAsync(_ work: @escaping () -> Void) {
+    func executeAsync(_ work: @escaping @Sendable () -> Void) {
         async(execute: work)
     }
 }
-
-func UI(_ perform: @escaping () -> Void) {
-    if Thread.isMainThread { return perform() }
-    DispatchQueue.main.async(execute: perform)
-}

Sources/SwiftAssRenderer/Extensions/FileManager.swift

@@ -10,7 +10,11 @@ protocol FileManagerType: Sendable {
     func createItem(at path: URL, contents: String, override: Bool) throws
 }
 
-extension FileManager: FileManagerType, @retroactive @unchecked Sendable {
+#if hasAttribute(retroactive)
+extension FileManager: @unchecked @retroactive Sendable {}
+#endif
+
+extension FileManager: FileManagerType {
     var cachesDirectory: URL {
         if #available(iOS 16.0, tvOS 16.0, visionOS 1.0, macOS 13.0, *) {
             URL.cachesDirectory

Sources/SwiftAssRenderer/Overlay/AssSubtitlesView.swift

@@ -62,6 +62,7 @@ public final class AssSubtitlesView: PlatformView {
     }
     #endif
 
+    @MainActor
     private func resizeCanvas() {
         resizeImageAtLayout()
         renderer.setCanvasSize(bounds.size, scale: canvasScale)
@@ -75,6 +76,7 @@ public extension AssSubtitlesView {
     ///   - callback: Callback to call.
     ///
     /// Calling this multiple times will override previous callbacks.
+    @MainActor
     @discardableResult
     func onImageChanged(_ callback: AssSubtitlesImageCallback?) -> Self {
         imageCallback = callback
@@ -83,11 +85,13 @@ public extension AssSubtitlesView {
 }
 
 private extension AssSubtitlesView {
+    @MainActor
     func configure() {
         setupView()
         subscribeToEvents()
     }
 
+    @MainActor
     func setupView() {
         addSubview(imageView)
         #if canImport(UIKit)
@@ -99,6 +103,7 @@ private extension AssSubtitlesView {
         #endif
     }
 
+    @MainActor
     func subscribeToEvents() {
         renderer
             .framesPublisher()
@@ -107,51 +112,46 @@ private extension AssSubtitlesView {
             .store(in: &cancellables)
     }
 
+    @MainActor
     func handleFrameChanged(_ image: ProcessedImage?) {
-        UI { [weak self] in
-            guard let self else { return }
-            if let image {
-                resizeImageView(for: image)
-                #if canImport(UIKit)
-                imageView.image = PlatformImage(cgImage: image.image)
-                #elseif canImport(AppKit)
-                imageView.image = PlatformImage(cgImage: image.image, size: image.imageRect.size)
-                #endif
-                imageView.isHidden = false
-            } else {
-                imageView.isHidden = true
-                imageView.image = nil
-            }
-            if let imageCallback {
-                let dialogues = renderer.dialogues(at: renderer.currentOffset)
-                imageCallback(self, imageView, image, dialogues)
-            }
+        if let image {
+            resizeImageView(for: image)
+            #if canImport(UIKit)
+            imageView.image = PlatformImage(cgImage: image.image)
+            #elseif canImport(AppKit)
+            imageView.image = PlatformImage(cgImage: image.image, size: image.imageRect.size)
+            #endif
+            imageView.isHidden = false
+        } else {
+            imageView.isHidden = true
+            imageView.image = nil
+        }
+        if let imageCallback {
+            let dialogues = renderer.dialogues(at: renderer.currentOffset)
+            imageCallback(self, imageView, image, dialogues)
         }
     }
 
+    @MainActor
     func resizeImageView(for image: ProcessedImage) {
-        UI { [weak self] in
-            guard let self else { return }
-            lastRenderBounds = bounds
-            imageView.frame = imageFrame(for: image.imageRect)
-        }
+        lastRenderBounds = bounds
+        imageView.frame = imageFrame(for: image.imageRect)
     }
 
+    @MainActor
     func resizeImageAtLayout() {
-        UI { [weak self] in
-            guard let self else { return }
-            if lastRenderBounds.isEmpty || bounds.isEmpty || imageView.image == nil { return }
-            let ratioX = 1 / (lastRenderBounds.width / bounds.width)
-            let ratioY = 1 / (lastRenderBounds.height / bounds.height)
-            let newOrigin = CGPoint(x: imageView.frame.origin.x * ratioX, y: imageView.frame.origin.y * ratioY)
-            let newSize = CGSize(width: imageView.frame.width * ratioX, height: imageView.frame.height * ratioY)
-            let newFrame = CGRect(origin: newOrigin, size: newSize).integral
-            CATransaction.begin()
-            imageView.frame = newFrame
-            CATransaction.commit()
-        }
+        if lastRenderBounds.isEmpty || bounds.isEmpty || imageView.image == nil { return }
+        let ratioX = 1 / (lastRenderBounds.width / bounds.width)
+        let ratioY = 1 / (lastRenderBounds.height / bounds.height)
+        let newOrigin = CGPoint(x: imageView.frame.origin.x * ratioX, y: imageView.frame.origin.y * ratioY)
+        let newSize = CGSize(width: imageView.frame.width * ratioX, height: imageView.frame.height * ratioY)
+        let newFrame = CGRect(origin: newOrigin, size: newSize).integral
+        CATransaction.begin()
+        imageView.frame = newFrame
+        CATransaction.commit()
     }
 
+    @MainActor
     func imageFrame(for rect: CGRect) -> CGRect {
         #if canImport(UIKit)
         rect

Sources/SwiftAssRenderer/Renderer/AssSubtitlesRenderer.swift

@@ -220,7 +220,7 @@ public final class AssSubtitlesRenderer: Sendable {
     /// - Parameters:
     ///   - offset: Time interval (in seconds) where to load the subtitle frame.
     ///   - completion: Completion handler.
-    public func loadFrame(offset: TimeInterval, completion: @escaping (ProcessedImage?) -> Void = { _ in }) {
+    public func loadFrame(offset: TimeInterval, completion: @escaping @Sendable (ProcessedImage?) -> Void = { _ in }) {
         workQueue.executeAsync { [weak self] in
             defer { completion(self?.currentFrame.value) }
             guard let self, var currentTrack else { return }

Sources/SwiftAssRenderer/Wrapper/LibraryWrapper.swift

@@ -47,7 +47,7 @@ protocol LibraryWrapperType: Sendable {
 enum LibraryWrapper: LibraryWrapperType {
     private static let lock = NSLock()
 
-    static var libraryLogger: (Int, String) -> Void = { _, message in
+    nonisolated(unsafe) static var libraryLogger: (Int, String) -> Void = { _, message in
         print("[swift-ass] \(message)")
     }
 

Tests/Helpers/Snapshots.swift

@@ -15,7 +15,7 @@ func platformName() -> String {
     #endif
 }
 
-func snapshotsDirectory(file: StaticString = #file, pathComponents: String...) -> URL {
+func snapshotsDirectory(file: StaticString = #filePath, pathComponents: String...) -> URL {
     let fileURL = URL(fileURLWithPath: "\(file)", isDirectory: false)
     let fileName = fileURL.deletingPathExtension().lastPathComponent
     let snapshotsDirectory = fileURL
@@ -33,6 +33,7 @@ func assertSnapshot<Value, Format>(
     snapshotDirectory: URL? = nil,
     record recording: Bool = false,
     file: StaticString = #file,
+    filePath: StaticString = #filePath,
     testName: String = #function,
     line: UInt = #line
 ) {
@@ -47,5 +48,5 @@ func assertSnapshot<Value, Format>(
         line: line
     )
     guard let message = failure else { return }
-    XCTFail(message, file: file, line: line)
+    XCTFail(message, file: filePath, line: line)
 }

Tests/Mocks/MockLibraryWrapper.swift

@@ -3,15 +3,15 @@ import SwiftLibass
 @testable import SwiftAssRenderer
 
 final class MockLibraryWrapper: LibraryWrapperType {
-    static var libraryLogger: (Int, String) -> Void = { _, _ in }
+    nonisolated(unsafe) static var libraryLogger: (Int, String) -> Void = { _, _ in }
 
     static let setLogCallbackFunc = FuncCheck<OpaquePointer>()
     static func setLogCallback(_ library: OpaquePointer) {
         setLogCallbackFunc.call(library)
     }
 
     static let libraryInitFunc = FuncCheck<Void>()
-    static var libraryInitStub: OpaquePointer?
+    nonisolated(unsafe) static var libraryInitStub: OpaquePointer?
     static func libraryInit() -> OpaquePointer? {
         libraryInitFunc.call()
         return libraryInitStub
@@ -23,7 +23,7 @@ final class MockLibraryWrapper: LibraryWrapperType {
     }
 
     static let rendererInitFunc = FuncCheck<OpaquePointer>()
-    static var rendererInitStub: OpaquePointer?
+    nonisolated(unsafe) static var rendererInitStub: OpaquePointer?
     static func rendererInit(_ library: OpaquePointer) -> OpaquePointer? {
         rendererInitFunc.call(library)
         return rendererInitStub
@@ -56,14 +56,14 @@ final class MockLibraryWrapper: LibraryWrapperType {
     }
 
     static let readTrackFunc = FuncCheck<(OpaquePointer, String)>()
-    static var readTrackStub: ASS_Track?
+    nonisolated(unsafe) static var readTrackStub: ASS_Track?
     static func readTrack(_ library: OpaquePointer, content: String) -> ASS_Track? {
         readTrackFunc.call((library, content))
         return readTrackStub
     }
 
     static let renderImageFunc = FuncCheck<(OpaquePointer, ASS_Track, TimeInterval)>()
-    static var renderImageStub: LibraryRenderResult?
+    nonisolated(unsafe) static var renderImageStub: LibraryRenderResult?
     static func renderImage(
         _ renderer: OpaquePointer,
         track: inout ASS_Track,