Nuke 13 – Swift 6

Documentation/Nuke.docc/Extensions/ImageRequest-Extension.md

@@ -17,7 +17,6 @@ request.processors = [.resize(width: 320)]
 - ``init(url:processors:priority:options:userInfo:)``
 - ``init(urlRequest:processors:priority:options:userInfo:)``
 - ``init(id:data:processors:priority:options:userInfo:)``
-- ``init(id:dataPublisher:processors:priority:options:userInfo:)``
 - ``init(stringLiteral:)``
 
 ### Options

Sources/Nuke/Caching/DataCache.swift

@@ -48,14 +48,6 @@ public final class DataCache: DataCaching, @unchecked Sendable {
     /// The time interval between cache sweeps. The default value is 1 hour.
     public var sweepInterval: TimeInterval = 3600
 
-    // Deprecated in Nuke 12.2
-    @available(*, deprecated, message: "It's not recommended to use compression with the popular image formats that already compress the data")
-    public var isCompressionEnabled: Bool {
-        get { _isCompressionEnabled }
-        set { _isCompressionEnabled = newValue }
-    }
-    var _isCompressionEnabled = false
-
     // Staging
 
     private let lock = NSLock()
@@ -143,7 +135,7 @@ public final class DataCache: DataCaching, @unchecked Sendable {
         guard let url = url(for: key) else {
             return nil
         }
-        return try? decompressed(Data(contentsOf: url))
+        return try? Data(contentsOf: url)
     }
 
     /// Returns `true` if the cache contains the data for the given key.
@@ -322,33 +314,17 @@ public final class DataCache: DataCaching, @unchecked Sendable {
         switch change.type {
         case let .add(data):
             do {
-                try compressed(data).write(to: url)
+                try data.write(to: url)
             } catch let error as NSError {
                 guard error.code == CocoaError.fileNoSuchFile.rawValue && error.domain == CocoaError.errorDomain else { return }
                 try? FileManager.default.createDirectory(at: self.path, withIntermediateDirectories: true, attributes: nil)
-                try? compressed(data).write(to: url) // re-create a directory and try again
+                try? data.write(to: url) // re-create a directory and try again
             }
         case .remove:
             try? FileManager.default.removeItem(at: url)
         }
     }
 
-    // MARK: Compression
-
-    private func compressed(_ data: Data) throws -> Data {
-        guard _isCompressionEnabled else {
-            return data
-        }
-        return try (data as NSData).compressed(using: .lzfse) as Data
-    }
-
-    private func decompressed(_ data: Data) throws -> Data {
-        guard _isCompressionEnabled else {
-            return data
-        }
-        return try (data as NSData).decompressed(using: .lzfse) as Data
-    }
-
     // MARK: Sweep
 
     /// Synchronously performs a cache sweep and removes the least recently items

Sources/Nuke/Decoding/ImageDecoderRegistry.swift

@@ -54,7 +54,7 @@ public final class ImageDecoderRegistry: @unchecked Sendable {
 }
 
 /// Image decoding context used when selecting which decoder to use.
-public struct ImageDecodingContext: @unchecked Sendable {
+public struct ImageDecodingContext: Sendable {
     public var request: ImageRequest
     public var data: Data
     /// Returns `true` if the download was completed.

Sources/Nuke/Encoding/ImageEncoders+ImageIO.swift

@@ -30,7 +30,7 @@ extension ImageEncoders {
             self.compressionRatio = compressionRatio
         }
 
-        private static let availability = Atomic<[AssetType: Bool]>(value: [:])
+        private static let availability = Mutex<[AssetType: Bool]>([:])
 
         /// Returns `true` if the encoding is available for the given format on
         /// the current hardware. Some of the most recent formats might not be

Sources/Nuke/Encoding/ImageEncoding.swift

@@ -33,7 +33,7 @@ extension ImageEncoding {
 }
 
 /// Image encoding context used when selecting which encoder to use.
-public struct ImageEncodingContext: @unchecked Sendable {
+public struct ImageEncodingContext: Sendable {
     public let request: ImageRequest
     public let image: PlatformImage
     public let urlResponse: URLResponse?

Sources/Nuke/ImageContainer.swift

@@ -19,7 +19,7 @@ public typealias PlatformImage = NSImage
 #endif
 
 /// An image container with an image and associated metadata.
-public struct ImageContainer: @unchecked Sendable {
+public struct ImageContainer: Sendable {
 #if os(macOS)
     /// A fetched image.
     public var image: NSImage {

Sources/Nuke/ImageRequest.swift

@@ -69,7 +69,7 @@ public struct ImageRequest: CustomStringConvertible, Sendable, ExpressibleByStri
         switch ref.resource {
         case .url(let url): return url.map { URLRequest(url: $0) } // create lazily
         case .urlRequest(let urlRequest): return urlRequest
-        case .publisher: return nil
+        case .closure: return nil
         }
     }
 
@@ -80,7 +80,7 @@ public struct ImageRequest: CustomStringConvertible, Sendable, ExpressibleByStri
         switch ref.resource {
         case .url(let url): return url
         case .urlRequest(let request): return request.url
-        case .publisher: return nil
+        case .closure: return nil
         }
     }
 
@@ -202,51 +202,7 @@ public struct ImageRequest: CustomStringConvertible, Sendable, ExpressibleByStri
         // pipeline by using a custom DataLoader and passing an async function in
         // the request userInfo. g
         self.ref = Container(
-            resource: .publisher(DataPublisher(id: id, data)),
-            processors: processors,
-            priority: priority,
-            options: options,
-            userInfo: userInfo
-        )
-    }
-
-    /// Initializes a request with the given data publisher.
-    ///
-    /// For example, here is how you can use it with the Photos framework (the
-    /// `imageDataPublisher` API is a custom convenience extension not included
-    /// in the framework).
-    ///
-    /// ```swift
-    /// let request = ImageRequest(
-    ///     id: asset.localIdentifier,
-    ///     dataPublisher: PHAssetManager.imageDataPublisher(for: asset)
-    /// )
-    /// ```
-    ///
-    /// - important: If you are using a pipeline with a custom configuration that
-    /// enables aggressive disk cache, fetched data will be stored in this cache.
-    /// You can use ``Options-swift.struct/disableDiskCache`` to disable it.
-    ///
-    /// - parameters:
-    ///   - id: Uniquely identifies the fetched image.
-    ///   - data: A data publisher to be used for fetching image data.
-    ///   - processors: Processors to be apply to the image. See <doc:image-processing> to learn more.
-    ///   - priority: The priority of the request, ``Priority-swift.enum/normal`` by default.
-    ///   - options: Image loading options.
-    ///   - userInfo: Custom info passed alongside the request.
-    public init<P>(
-        id: String,
-        dataPublisher: P,
-        processors: [any ImageProcessing] = [],
-        priority: Priority = .normal,
-        options: Options = [],
-        userInfo: [UserInfoKey: Any]? = nil
-    ) where P: Publisher, P.Output == Data {
-        // It could technically be implemented without any special change to the
-        // pipeline by using a custom DataLoader and passing a publisher in the
-        // request userInfo.
-        self.ref = Container(
-            resource: .publisher(DataPublisher(id: id, dataPublisher)),
+            resource: .closure(data, id: id),
             processors: processors,
             priority: priority,
             options: options,
@@ -470,8 +426,8 @@ public struct ImageRequest: CustomStringConvertible, Sendable, ExpressibleByStri
         (ref.userInfo?[.scaleKey] as? NSNumber)?.floatValue
     }
 
-    var publisher: DataPublisher? {
-        if case .publisher(let publisher) = ref.resource { return publisher }
+    var closure: (@Sendable () async throws -> Data)? {
+        if case .closure(let closure, _) = ref.resource { return closure }
         return nil
     }
 }
@@ -519,21 +475,21 @@ extension ImageRequest {
     enum Resource: CustomStringConvertible {
         case url(URL?)
         case urlRequest(URLRequest)
-        case publisher(DataPublisher)
+        case closure(@Sendable () async throws -> Data, id: String)
 
         var description: String {
             switch self {
             case .url(let url): return "\(url?.absoluteString ?? "nil")"
             case .urlRequest(let urlRequest): return "\(urlRequest)"
-            case .publisher(let data): return "\(data)"
+            case .closure(_, let id): return id
             }
         }
 
         var imageId: String? {
             switch self {
             case .url(let url): return url?.absoluteString
             case .urlRequest(let urlRequest): return urlRequest.url?.absoluteString
-            case .publisher(let publisher): return publisher.id
+            case .closure(_, let id): return id
             }
         }
     }

Sources/Nuke/ImageResponse.swift

@@ -13,7 +13,7 @@ import AppKit
 #endif
 
 /// An image response that contains a fetched image and some metadata.
-public struct ImageResponse: @unchecked Sendable {
+public struct ImageResponse: Sendable {
     /// An image container with an image and associated metadata.
     public var container: ImageContainer