Merge pull request #780 from kean/async-image-task-events

Nuke 12.7
kean · May 5, 2024 · 97f5323 · 97f5323
2 parents 8e43125 + dbb37e4
commit 97f5323
Show file tree

Hide file tree

Showing 41 changed files with 786 additions and 743 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,18 +91,18 @@ jobs:
 #        run: Scripts/test.sh -s "Nuke Memory Management Tests" -d "OS=14.4,name=iPhone 12 Pro"
   ios-performance-tests:
     name: Performance Tests
-    runs-on: macOS-13
-    env: 
-      DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+    runs-on: macOS-14
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
     steps:
       - uses: actions/checkout@v2
       - name: Run Tests
-        run: Scripts/test.sh -s "Nuke Performance Tests" -d "OS=16.4,name=iPhone 14 Pro"
+        run: Scripts/test.sh -s "Nuke Performance Tests" -d "OS=17.4,name=iPhone 15 Pro"
   swift-build:
     name: Swift Build (SPM)
-    runs-on: macOS-13
-    env: 
-      DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+    runs-on: macOS-14
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
     steps:
       - uses: actions/checkout@v2
       - name: Build

diff --git a/Nuke.xcodeproj/project.pbxproj b/Nuke.xcodeproj/project.pbxproj
diff --git a/Sources/Nuke/AsyncImageTask.swift b/Sources/Nuke/AsyncImageTask.swift
diff --git a/Sources/Nuke/Caching/Cache.swift b/Sources/Nuke/Caching/Cache.swift
@@ -56,7 +56,9 @@ final class Cache<Key: Hashable, Value>: @unchecked Sendable {
         self.memoryPressure.resume()
 
 #if os(iOS) || os(tvOS) || os(visionOS)
-        registerForEnterBackground()
+        Task {
+            await registerForEnterBackground()
+        }
 #endif
     }
 
@@ -68,7 +70,7 @@ final class Cache<Key: Hashable, Value>: @unchecked Sendable {
     }
 
 #if os(iOS) || os(tvOS) || os(visionOS)
-    private func registerForEnterBackground() {
+    @MainActor private func registerForEnterBackground() {
         notificationObserver = NotificationCenter.default.addObserver(forName: UIApplication.didEnterBackgroundNotification, object: nil, queue: nil) { [weak self] _ in
             self?.clearCacheOnEnterBackground()
         }

diff --git a/Sources/Nuke/Encoding/ImageEncoders+ImageIO.swift b/Sources/Nuke/Encoding/ImageEncoders+ImageIO.swift
@@ -30,19 +30,19 @@ extension ImageEncoders {
             self.compressionRatio = compressionRatio
         }
 
-        @Atomic private static var availability = [AssetType: Bool]()
+        private static let availability = Atomic<[AssetType: Bool]>(value: [:])
 
         /// Returns `true` if the encoding is available for the given format on
         /// the current hardware. Some of the most recent formats might not be
         /// available so its best to check before using them.
         public static func isSupported(type: AssetType) -> Bool {
-            if let isAvailable = availability[type] {
+            if let isAvailable = availability.value[type] {
                 return isAvailable
             }
             let isAvailable = CGImageDestinationCreateWithData(
                 NSMutableData() as CFMutableData, type.rawValue as CFString, 1, nil
             ) != nil
-            availability[type] = isAvailable
+            availability.withLock { $0[type] = isAvailable }
             return isAvailable
         }
 

diff --git a/Sources/Nuke/ImageResponse.swift b/Sources/Nuke/ImageResponse.swift
@@ -4,10 +4,12 @@
 
 import Foundation
 
-#if !os(macOS)
-import UIKit.UIImage
-#else
-import AppKit.NSImage
+#if canImport(UIKit)
+import UIKit
+#endif
+
+#if canImport(AppKit)
+import AppKit
 #endif
 
 /// An image response that contains a fetched image and some metadata.