Merge pull request #8 from SDWebImage/project_swiftpm

Support Xcode 11 and Swift Package Manager

Author: dreampiggy

.gitignore

@@ -34,3 +34,7 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 Example/Pods
+
+# SwiftPM
+.swiftpm
+.build

Cartfile.resolved

@@ -1 +1 @@
-github "SDWebImage/SDWebImage" "5.0.0"
+github "SDWebImage/SDWebImage" "5.1.0"

Example/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Expecta (1.0.6)
-  - SDWebImage/Core (5.0.0)
+  - SDWebImage/Core (5.1.0)
   - SDWebImagePhotosPlugin (0.2.1):
     - SDWebImage/Core (~> 5.0)
 
@@ -19,9 +19,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
-  SDWebImage: 5de80a0302de9e377e62f47d2fa1304efff0e55f
+  SDWebImage: fb387001955223213dde14bc08c8b73f371f8d8f
   SDWebImagePhotosPlugin: 3a126667559b206b91d6ca6edacdc58dcaa9b2cd
 
 PODFILE CHECKSUM: 60756e45d1da564a14e0e1964ffd639deadc2855
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.5

Package.resolved

@@ -0,0 +1,33 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SDWebImagePhotosPlugin",
+    platforms: [
+       .macOS(.v10_13), .iOS(.v8), .tvOS(.v10)
+    ],
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "SDWebImagePhotosPlugin",
+            targets: ["SDWebImagePhotosPlugin"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+        .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0")
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "SDWebImagePhotosPlugin",
+            dependencies: ["SDWebImage"],
+            path: ".",
+            sources: ["SDWebImagePhotosPlugin/Classes"],
+            publicHeadersPath: "SDWebImagePhotosPlugin/Classes"
+        )
+    ]
+)

Package.swift

@@ -5,6 +5,7 @@
 [![License](https://img.shields.io/cocoapods/l/SDWebImagePhotosPlugin.svg?style=flat)](https://cocoapods.org/pods/SDWebImagePhotosPlugin)
 [![Platform](https://img.shields.io/cocoapods/p/SDWebImagePhotosPlugin.svg?style=flat)](https://cocoapods.org/pods/SDWebImagePhotosPlugin)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/SDWebImage/SDWebImagePhotosPlugin)
+[![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-Compatible-brightgreen.svg)](https://swift.org/package-manager/)
 [![codecov](https://codecov.io/gh/SDWebImage/SDWebImagePhotosPlugin/branch/master/graph/badge.svg)](https://codecov.io/gh/SDWebImage/SDWebImagePhotosPlugin)
 
 ## What's for
@@ -39,6 +40,18 @@ SDWebImagePhotosPlugin is available through [Carthage](https://github.com/Cartha
 github "SDWebImage/SDWebImagePhotosPlugin"
 ```
 
+#### Swift Package Manager
+
+SDWebImagePhotosPlugin is available through [Swift Package Manager](https://swift.org/package-manager).
+
+```swift
+let package = Package(
+    dependencies: [
+        .package(url: "https://github.com/SDWebImage/SDWebImagePhotosPlugin.git", from: "0.3")
+    ]
+)
+```
+
 ## Usage
 **Important!** To use Photos Library plugin. Firstly you need to register the photos loader to image manager.
 

README.md

@@ -8,7 +8,6 @@
 
 #import "PHImageRequestOptions+SDWebImagePhotosPlugin.h"
 #import "SDWebImagePhotosDefine.h"
-#import <SDWebImage/SDWebImage.h>
 #import <objc/runtime.h>
 
 @implementation PHImageRequestOptions (SDWebImagePhotosPlugin)

SDWebImagePhotosPlugin/Classes/PHImageRequestOptions+SDWebImagePhotosPlugin.m

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-#import <SDWebImage/SDWebImageDefine.h>
+@import SDWebImage;
 
 /**
  * The scheme when identifing the URL is Photos URL

SDWebImagePhotosPlugin/Classes/SDWebImagePhotosDefine.h

@@ -6,9 +6,8 @@
  * file that was distributed with this source code.
  */
 
-#import <SDWebImage/SDWebImage.h>
-#import <Photos/Photos.h>
-#import "SDWebImagePhotosDefine.h"
+@import SDWebImage;
+@import Photos;
 
 // The imgae loader to load image asset from Photos library. You need to register the loader into manager firstly. Use `@import SDWebImagePhotosPlugin` to import full framework instead of each header.
 // @note To control single image request options, use the context option in `SDWebImagePhotosDefine.h`.

SDWebImagePhotosPlugin/Classes/SDWebImagePhotosLoader.h

@@ -7,16 +7,25 @@
  */
 
 #import "SDWebImagePhotosLoader.h"
+#import "SDWebImagePhotosDefine.h"
 #import "NSURL+SDWebImagePhotosPlugin.h"
 #import "PHImageRequestOptions+SDWebImagePhotosPlugin.h"
 #import "SDWebImagePhotosError.h"
 #import <objc/runtime.h>
+
+// Compatible
 #if SD_UIKIT
 #import <MobileCoreServices/MobileCoreServices.h>
 typedef UIImageOrientation SDImageOrientation;
 #else
 typedef CGImagePropertyOrientation SDImageOrientation;
 #endif
+// This protocol is used to fix the Xcode 11's API declaration for macOS. Which should be available on macOS 10.13
+@protocol PHImageManager <NSObject>
+- (PHImageRequestID)requestImageDataForAsset:(PHAsset *)asset options:(nullable PHImageRequestOptions *)options resultHandler:(void(^)(NSData *__nullable imageData, NSString *__nullable dataUTI, SDImageOrientation orientation, NSDictionary *__nullable info))resultHandler;
+@end
+@interface PHImageManager () <PHImageManager>
+@end
 
 @interface SDWebImagePhotosLoaderOperation : NSObject <SDWebImageOperation>
 
@@ -286,7 +295,7 @@ - (void)fetchImageDataWithAsset:(PHAsset *)asset operation:(SDWebImagePhotosLoad
     }
 
     __weak typeof(operation) weakOperation = operation;
-    PHImageRequestID requestID = [[PHImageManager defaultManager] requestImageDataForAsset:asset options:requestOptions resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, SDImageOrientation orientation, NSDictionary * _Nullable info) {
+    PHImageRequestID requestID = [(id<PHImageManager>)[PHImageManager defaultManager] requestImageDataForAsset:asset options:requestOptions resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, SDImageOrientation orientation, NSDictionary * _Nullable info) {
         if (weakOperation.isCancelled) {
             // Cancelled
             NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorCancelled userInfo:nil];