Add the macOS Catalyst support, fix test cases

dreampiggy · dreampiggy · commit 95c932301118 · 2019-11-23T16:30:18.000+08:00
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -20,7 +20,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
   SDWebImage: fb387001955223213dde14bc08c8b73f371f8d8f
-  SDWebImagePhotosPlugin: 7577bd9f01f16c2f3b35fd81109b0612c739c81a
+  SDWebImagePhotosPlugin: 0055105db4af4a89fb2c977b8b0e15291be4ee3f
 
 PODFILE CHECKSUM: 60756e45d1da564a14e0e1964ffd639deadc2855
 
diff --git a/Example/SDWebImagePhotosPlugin.xcodeproj/project.pbxproj b/Example/SDWebImagePhotosPlugin.xcodeproj/project.pbxproj
@@ -85,6 +85,7 @@
 		32893E66213EB679007FCEC7 /* TestImageStatic.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImageStatic.webp; sourceTree = "<group>"; };
 		32893E67213EB679007FCEC7 /* TestImageAnimated.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImageAnimated.webp; sourceTree = "<group>"; };
 		32893E68213EB679007FCEC7 /* TestImage.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = TestImage.gif; sourceTree = "<group>"; };
+		32C044142389252D00FEE55E /* SDWebImagePhotosPlugin_Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SDWebImagePhotosPlugin_Example.entitlements; sourceTree = "<group>"; };
 		32DE261920AAE1D200DF5574 /* DetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetailViewController.xib; sourceTree = "<group>"; };
 		32DE261A20AAE1D200DF5574 /* MasterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MasterViewController.xib; sourceTree = "<group>"; };
 		5D78672539E09912614EBC63 /* Pods_SDWebImagePhotosPlugin_Example_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDWebImagePhotosPlugin_Example_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -187,6 +188,7 @@
 		6003F581195388D10070C39A = {
 			isa = PBXGroup;
 			children = (
+				32C044142389252D00FEE55E /* SDWebImagePhotosPlugin_Example.entitlements */,
 				60FF7A9C1954A5C5007DD14C /* Podspec Metadata */,
 				6003F593195388D20070C39A /* Example for SDWebImagePhotosPlugin */,
 				6003F5B5195388D20070C39A /* Tests */,
@@ -798,13 +800,16 @@
 			baseConfigurationReference = E572DC592529A86343DC9C10 /* Pods-SDWebImagePhotosPlugin_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = SDWebImagePhotosPlugin_Example.entitlements;
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = H7W77QXGX2;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SDWebImagePhotosPlugin/SDWebImagePhotosPlugin-Prefix.pch";
 				INFOPLIST_FILE = "SDWebImagePhotosPlugin/SDWebImagePhotosPlugin-Info.plist";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTS_MACCATALYST = YES;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -814,13 +819,16 @@
 			baseConfigurationReference = 879A5B78D1F240E180B5A79A /* Pods-SDWebImagePhotosPlugin_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = SDWebImagePhotosPlugin_Example.entitlements;
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = H7W77QXGX2;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SDWebImagePhotosPlugin/SDWebImagePhotosPlugin-Prefix.pch";
 				INFOPLIST_FILE = "SDWebImagePhotosPlugin/SDWebImagePhotosPlugin-Info.plist";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTS_MACCATALYST = YES;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
diff --git a/Example/SDWebImagePhotosPlugin/MasterViewController.m b/Example/SDWebImagePhotosPlugin/MasterViewController.m
@@ -55,12 +55,12 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibB
                                                                                action:@selector(reloadData)];
         self.objects = [NSMutableArray array];
         // Setup Photos Loader
-        SDWebImageManager.defaultImageLoader = [SDWebImagePhotosLoader sharedLoader];
+        SDWebImageManager.defaultImageLoader = [SDImagePhotosLoader sharedLoader];
         PHImageRequestOptions *options = [PHImageRequestOptions new];
         options.sd_targetSize = CGSizeMake(500, 500); // The original image size may be 4K, we only query the max view size :)
-        SDWebImagePhotosLoader.sharedLoader.imageRequestOptions = options;
+        SDImagePhotosLoader.sharedLoader.imageRequestOptions = options;
         // Request Video Asset Poster as well
-        SDWebImagePhotosLoader.sharedLoader.requestImageAssetOnly = NO;
+        SDImagePhotosLoader.sharedLoader.requestImageAssetOnly = NO;
     }
     return self;
 }
diff --git a/Example/SDWebImagePhotosPlugin_Example macOS/ViewController.m b/Example/SDWebImagePhotosPlugin_Example macOS/ViewController.m
@@ -27,10 +27,10 @@ - (instancetype)initWithCoder:(NSCoder *)coder {
     if (self) {
         self.objects = [NSMutableArray array];
         // Setup Photos Loader
-        SDWebImageManager.defaultImageLoader = [SDWebImagePhotosLoader sharedLoader];
+        SDWebImageManager.defaultImageLoader = [SDImagePhotosLoader sharedLoader];
         PHImageRequestOptions *options = [PHImageRequestOptions new];
         options.sd_targetSize = CGSizeMake(500, 500); // The original image size may be 4K, we only query the max view size :)
-        SDWebImagePhotosLoader.sharedLoader.imageRequestOptions = options;
+        SDImagePhotosLoader.sharedLoader.imageRequestOptions = options;
         
         // Reload
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(menuItemDidTap:) name:NSMenuDidSendActionNotification object:nil];
diff --git a/Example/SDWebImagePhotosPlugin_Example.entitlements b/Example/SDWebImagePhotosPlugin_Example.entitlements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.personal-information.photos-library</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Example/Tests/SDPhotosPluginTests.m b/Example/Tests/SDPhotosPluginTests.m
@@ -28,7 +28,7 @@ + (void)setUp {
 
 - (void)testUIImageViewSetImageWithAsset {
     XCTestExpectation *expectation = [self expectationWithDescription:@"UIImageView setImageWithAsset"];
-    SDWebImageManager *manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImagePhotosLoader.sharedLoader];
+    SDWebImageManager *manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDImagePhotosLoader.sharedLoader];
     PHAsset *asset = [self smartAlbumAssets].firstObject;
     expect(asset).notTo.beNil();
     NSURL *originalImageURL = [NSURL sd_URLWithAsset:asset];
@@ -51,7 +51,7 @@ - (void)testUIImageViewSetImageWithAsset {
 
 - (void)testUIImageViewSetImageWithAssetLocalIdentifier {
     XCTestExpectation *expectation = [self expectationWithDescription:@"UIImageView setImageWithAssetLocalIdentifier"];
-    SDWebImageManager *manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImagePhotosLoader.sharedLoader];
+    SDWebImageManager *manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDImagePhotosLoader.sharedLoader];
     NSString *localIdentifier = [self smartAlbumAssets].firstObject.localIdentifier;
     expect(localIdentifier).notTo.beNil();
     NSURL *originalImageURL = [NSURL sd_URLWithAssetLocalIdentifier:localIdentifier];
@@ -87,7 +87,7 @@ - (void)testUIImageViewSetImageWithGIFAsset {
         
         dispatch_async(dispatch_get_main_queue(), ^{
             // Query the GIF image with localIdentifier
-            SDWebImageManager *manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImagePhotosLoader.sharedLoader];
+            SDWebImageManager *manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDImagePhotosLoader.sharedLoader];
             NSURL *originalImageURL = [NSURL sd_URLWithAssetLocalIdentifier:localIdentifier];
             
             UIImageView *imageView = [[UIImageView alloc] init];
diff --git a/README.md b/README.md
@@ -192,7 +192,7 @@ imageView.sd_setImage(with: photosURL, placeholderImage: nil, context:[.photosIm
 
 The Photos taken by iPhone's Camera, its pixel size may be really large (4K+). So if you want to load large Photos Library assets for rendering, you'd better specify target size with a limited size (like you render imageView's size).
 
-By default, we query the target size matching the original image pixel size (See: `SDWebImagePhotosLoaderPixelSize`), which may consume much memory on iOS device.
+By default, we query the target size matching the original image pixel size (See: `SDWebImagePhotosPixelSize`), which may consume much memory on iOS device.
 
 ## Demo
 
diff --git a/SDWebImagePhotosPlugin.podspec b/SDWebImagePhotosPlugin.podspec
@@ -28,6 +28,11 @@ This is a SDWebImage loader plugin to support Apple's Photos framework image ass
 
   s.source_files = 'SDWebImagePhotosPlugin/Classes/**/*', 'SDWebImagePhotosPlugin/Module/SDWebImagePhotosPlugin.h'
   s.module_map = 'SDWebImagePhotosPlugin/Module/SDWebImagePhotosPlugin.modulemap'
+
+  s.pod_target_xcconfig = {
+    'SUPPORTS_MACCATALYST' => 'YES',
+    'DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER' => 'NO'
+  }
   
   s.frameworks = 'Photos'
   s.dependency 'SDWebImage/Core', '~> 5.0'
