Merge pull request #2273 from NachoSoto/nacho/compiler

Change `swift(>=6)` to use `compiler`
onevcat · Jul 14, 2024 · e26db2a · e26db2a
2 parents 9fd9a60 + a4f5a41
commit e26db2a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/Sources/Cache/ImageCache.swift b/Sources/Cache/ImageCache.swift
@@ -835,7 +835,7 @@ open class ImageCache: @unchecked Sendable {
         cleanExpiredDiskCache {
             Task {
                 guard let bgTask = await taskActor.value, bgTask != .invalid else { return }
-                #if swift(>=6)
+                #if compiler(>=6)
                 sharedApplication.endBackgroundTask(bgTask)
                 #else
                 await sharedApplication.endBackgroundTask(bgTask)

diff --git a/Sources/General/ImageSource/AVAssetImageDataProvider.swift b/Sources/General/ImageSource/AVAssetImageDataProvider.swift
@@ -35,7 +35,7 @@ import MobileCoreServices
 import CoreServices
 #endif
 
-#if swift(>=6)
+#if compiler(>=6)
 extension AVAssetImageGenerator: @unchecked @retroactive Sendable { }
 #else
 extension AVAssetImageGenerator: @unchecked Sendable { }

diff --git a/Sources/General/ImageSource/PHPickerResultImageDataProvider.swift b/Sources/General/ImageSource/PHPickerResultImageDataProvider.swift
@@ -30,7 +30,7 @@ import Foundation
 
 import PhotosUI
 
-#if swift(>=6)
+#if compiler(>=6)
 @available(iOS 14.0, macOS 13.0, *)
 extension PHPickerResult: @unchecked @retroactive Sendable { }
 #else

diff --git a/Sources/General/Kingfisher.swift b/Sources/General/Kingfisher.swift
@@ -36,11 +36,11 @@ public typealias KFCrossPlatformImageView   = NSImageView
 public typealias KFCrossPlatformButton      = NSButton
 
 // `NSImage` is not yet Sendable. We have to assume it sendable to resolve warnings in Kingfisher.
-#if swift(>=6)
+#if compiler(>=6)
 extension KFCrossPlatformImage: @retroactive @unchecked Sendable { }
 #else
 extension KFCrossPlatformImage: @unchecked Sendable { }
-#endif // swift(>=6)
+#endif // compiler(>=6)
 #else // os(macOS)
 import UIKit
 public typealias KFCrossPlatformImage       = UIImage

diff --git a/Sources/Utility/DisplayLink.swift b/Sources/Utility/DisplayLink.swift
@@ -52,7 +52,7 @@ extension UIView {
     }
 }
 
-#if swift(>=6)
+#if compiler(>=6)
 extension CADisplayLink: DisplayLinkCompatible, @retroactive @unchecked Sendable {}
 #else
 extension CADisplayLink: DisplayLinkCompatible, @unchecked Sendable {}
@@ -78,13 +78,13 @@ extension NSView {
 extension CADisplayLink: DisplayLinkCompatible {
     var preferredFramesPerSecond: NSInteger { return 0 }
 }
-#if swift(>=6)
+#if compiler(>=6)
 @available(macOS 14.0, *)
 extension CADisplayLink: @retroactive @unchecked Sendable { }
-#else // swift(>=6)
+#else // compiler(>=6)
 @available(macOS 14.0, *)
 extension CADisplayLink: @unchecked Sendable { }
-#endif // swift(>=6)
+#endif // compiler(>=6)
 #endif // swift(>=5.9)
 
 final class DisplayLink: DisplayLinkCompatible, @unchecked Sendable {

diff --git a/Tests/KingfisherTests/DiskStorageTests.swift b/Tests/KingfisherTests/DiskStorageTests.swift
@@ -27,7 +27,7 @@
 import XCTest
 @testable import Kingfisher
 
-#if swift(>=6)
+#if compiler(>=6)
 extension String: @retroactive DataTransformable { }
 #else
 extension String: DataTransformable { }

diff --git a/Tests/KingfisherTests/ImageViewExtensionTests.swift b/Tests/KingfisherTests/ImageViewExtensionTests.swift
@@ -922,7 +922,7 @@ class ImageViewExtensionTests: XCTestCase {
 
 }
 
-#if swift(>=6)
+#if compiler(>=6)
 extension KFCrossPlatformView: @retroactive Placeholder {}
 #else
 extension KFCrossPlatformView: Placeholder {}

diff --git a/Tests/KingfisherTests/MemoryStorageTests.swift b/Tests/KingfisherTests/MemoryStorageTests.swift
@@ -33,7 +33,7 @@ extension Int {
     }
 }
 
-#if swift(>=6)
+#if compiler(>=6)
 extension Int: @retroactive CacheCostCalculable { }
 #else
 extension Int: CacheCostCalculable { }