Merge branch 'master' into feature/uibutton-support

Kingfisher.xcodeproj/project.pbxproj

@@ -567,6 +567,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = "Kingfisher-Demo/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -577,6 +578,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = "Kingfisher-Demo/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -597,6 +599,7 @@
 				);
 				INFOPLIST_FILE = Kingfisher/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -617,6 +620,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Kingfisher/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Kingfisher/ImageDownloader.swift

@@ -92,14 +92,14 @@ public extension ImageDownloader {
         completionHandler: ImageDownloaderCompletionHandler?)
     {
         downloadImageWithURL(URL,
-            retrieveImagetask: nil,
+            retrieveImageTask: nil,
                       options: options,
                 progressBlock: progressBlock,
             completionHandler: completionHandler)
     }
     
     internal func downloadImageWithURL(URL: NSURL,
-                       retrieveImagetask: RetrieveImageTask?,
+                       retrieveImageTask: RetrieveImageTask?,
                                  options: KingfisherManager.Options,
                            progressBlock: ImageDownloaderProgressBlock?,
                        completionHandler: ImageDownloaderCompletionHandler?)
@@ -115,7 +115,7 @@ public extension ImageDownloader {
             
             fetchLoad.shouldDecode = options.shouldDecode
             
-            retrieveImagetask?.downloadTask = task
+            retrieveImageTask?.downloadTask = task
         }
     }
     

Kingfisher/KingfisherManager.swift

@@ -153,7 +153,7 @@ public class KingfisherManager {
                         completionHandler: CompletionHandler?,
                                   options: Options)
     {
-        downloader.downloadImageWithURL(URL, retrieveImagetask: retrieveImageTask, options: options, progressBlock: { (receivedSize, totalSize) -> () in
+        downloader.downloadImageWithURL(URL, retrieveImageTask: retrieveImageTask, options: options, progressBlock: { (receivedSize, totalSize) -> () in
             progressBlock?(receivedSize: receivedSize, totalSize: totalSize)
             return
         }) { (image, error, imageURL) -> () in