From 820390e4967797cdbb7df8d25ad3a4ee63a46e54 Mon Sep 17 00:00:00 2001 From: Garrett Moon Date: Tue, 9 Feb 2016 10:31:10 -0800 Subject: [PATCH] Fix build and podfile --- AsyncDisplayKit.podspec | 2 +- AsyncDisplayKit/Details/ASImageProtocols.h | 2 +- AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit.podspec b/AsyncDisplayKit.podspec index 9b47f55c84..263aee5aa6 100644 --- a/AsyncDisplayKit.podspec +++ b/AsyncDisplayKit.podspec @@ -51,7 +51,7 @@ Pod::Spec.new do |spec| spec.subspec 'PINRemoteImage' do |pin| pin.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) PIN_REMOTE_IMAGE=1' } - pin.dependency 'PINRemoteImage' + pin.dependency 'PINRemoteImage', '>= 2' pin.dependency 'AsyncDisplayKit/ASDealloc2MainObject' end diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h index 405fdeb378..4f1abd65e6 100644 --- a/AsyncDisplayKit/Details/ASImageProtocols.h +++ b/AsyncDisplayKit/Details/ASImageProtocols.h @@ -15,7 +15,7 @@ typedef void(^ASImageCacherCompletion)(UIImage * _Nullable imageFromCache); @protocol ASImageCacheProtocol -@required +@optional /** @deprecated This method is deprecated @see cachedImageWithURL:callbackQueue:completion: instead */ diff --git a/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m b/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m index e74baa16b6..d88bbea19f 100644 --- a/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m +++ b/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m @@ -53,12 +53,12 @@ */ - (nullable id)downloadImageWithURL:(NSURL *)URL callbackQueue:(dispatch_queue_t)callbackQueue - downloadProgressBlock:(void (^)(CGFloat progress))downloadProgressBlock - completion:(void (^)(CGImageRef image, NSError * error, id downloadIdentifier))completion + downloadProgress:(void (^)(CGFloat progress))downloadProgressBlock + completion:(void (^)(UIImage *image, NSError * error, id downloadIdentifier))completion { return [[PINRemoteImageManager sharedImageManager] downloadImageWithURL:URL completion:^(PINRemoteImageManagerResult *result) { dispatch_async(callbackQueue, ^{ - completion([result.image CGImage], result.error, result.UUID); + completion(result.image, result.error, result.UUID); }); }]; }