Merge pull request #26 from entdark/master

Updated Nuke to 12.8

Author: Cheesebaron

Cartfile

@@ -1 +1 @@
-github "kean/Nuke" == 10.11.2
+github "kean/Nuke" == 12.8.0

NukeProxy.xcodeproj/project.pbxproj

@@ -3,28 +3,46 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		7D013CDE265D5A2100454172 /* Nuke.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D013CDD265D5A2100454172 /* Nuke.xcframework */; };
 		B08309D5241256530090FB75 /* NukeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = B08309D3241256530090FB75 /* NukeProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B08309E7241259650090FB75 /* NukeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B08309E6241259650090FB75 /* NukeProxy.swift */; };
+		CEBEC60F2DB66ACB00FA295C /* NukeExtensions.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */; };
+		CEBEC6102DB66ACB00FA295C /* NukeExtensions.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		CEBEC6112DB66ACB00FA295C /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				CEBEC6102DB66ACB00FA295C /* NukeExtensions.xcframework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		7D013CDD265D5A2100454172 /* Nuke.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Nuke.xcframework; path = Carthage/Build/Nuke.xcframework; sourceTree = "<group>"; };
 		B08309D0241256530090FB75 /* NukeProxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NukeProxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B08309D3241256530090FB75 /* NukeProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NukeProxy.h; sourceTree = "<group>"; };
 		B08309D4241256530090FB75 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B08309E6241259650090FB75 /* NukeProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NukeProxy.swift; sourceTree = "<group>"; };
+		CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NukeExtensions.xcframework; path = Carthage/Build/NukeExtensions.xcframework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		B08309CD241256530090FB75 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CEBEC60F2DB66ACB00FA295C /* NukeExtensions.xcframework in Frameworks */,
 				7D013CDE265D5A2100454172 /* Nuke.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -62,6 +80,7 @@
 		B08309DB241256A70090FB75 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */,
 				7D013CDD265D5A2100454172 /* Nuke.xcframework */,
 			);
 			name = Frameworks;
@@ -89,6 +108,7 @@
 				B08309CC241256530090FB75 /* Sources */,
 				B08309CD241256530090FB75 /* Frameworks */,
 				B08309CE241256530090FB75 /* Resources */,
+				CEBEC6112DB66ACB00FA295C /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

NukeProxy/NukeProxy.swift

@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 import Nuke
-
+import NukeExtensions
 
 @objc(ImagePipeline)
 public class ImagePipeline : NSObject {
@@ -54,7 +54,6 @@ public class ImagePipeline : NSObject {
     public func loadImage(url: URL, onCompleted: @escaping (UIImage?, String) -> Void) -> Int64 {
         let task = Nuke.ImagePipeline.shared.loadImage(
             with: url,
-            progress: nil,
             completion: { [weak self] result in
                 switch result {
                 case let .success(response):
@@ -69,19 +68,19 @@ public class ImagePipeline : NSObject {
         return addTask(task)
     }
 
-    @objc
+    @MainActor @objc
     public func loadImage(url: URL, placeholder: UIImage?, errorImage: UIImage?, into: UIImageView) -> Int64 {
         return loadImage(url: url, placeholder: placeholder, errorImage: errorImage, into: into, reloadIgnoringCachedData: false)
     }
 
-    @objc
+    @MainActor @objc
     public func loadImage(url: URL, placeholder: UIImage?, errorImage: UIImage?, into: UIImageView, reloadIgnoringCachedData: Bool) -> Int64 {
         let options = ImageLoadingOptions(placeholder: placeholder, failureImage: errorImage)
         let cachePolicy = reloadIgnoringCachedData ? URLRequest.CachePolicy.reloadIgnoringLocalAndRemoteCacheData : URLRequest.CachePolicy.useProtocolCachePolicy
         let urlRequest = URLRequest(url: url, cachePolicy: cachePolicy)
         let request = ImageRequest(urlRequest: urlRequest)
 
-        let task = Nuke.loadImage(
+        let task = NukeExtensions.loadImage(
             with: request,
             options: options,
             into: into
@@ -90,19 +89,19 @@ public class ImagePipeline : NSObject {
         return addTask(task)
     }
 
-    @objc
+    @MainActor @objc
     public func loadImage(url: URL, imageIdKey: String, placeholder: UIImage?, errorImage: UIImage?, into: UIImageView) -> Int64 {
         return loadImage(url: url, imageIdKey: imageIdKey, placeholder: placeholder, errorImage: errorImage, into: into, reloadIgnoringCachedData: false)
     }
 
-    @objc
+    @MainActor @objc
     public func loadImage(url: URL, imageIdKey: String, placeholder: UIImage?, errorImage: UIImage?, into: UIImageView, reloadIgnoringCachedData: Bool) -> Int64 {
         let options = ImageLoadingOptions(placeholder: placeholder, failureImage: errorImage)
         let cachePolicy = reloadIgnoringCachedData ? URLRequest.CachePolicy.reloadIgnoringLocalAndRemoteCacheData : URLRequest.CachePolicy.useProtocolCachePolicy
         let urlRequest = URLRequest(url: url, cachePolicy: cachePolicy)
         let request = ImageRequest(urlRequest: urlRequest, userInfo: [.imageIdKey: imageIdKey])
 
-        let task = Nuke.loadImage(
+        let task = NukeExtensions.loadImage(
             with: request,
             options: options,
             into: into

src/ImageCaching.Nuke/ImageCaching.Nuke.csproj

@@ -74,6 +74,10 @@
       <Kind>Framework</Kind>
       <SmartLink>False</SmartLink>
     </NativeReference>
+    <NativeReference Include="..\..\Carthage\Build\NukeExtensions.xcframework">
+      <Kind>Framework</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
   </ItemGroup>
 
 </Project>