From 57afcfc77ea5c6b15f29a1b82404eebb83070457 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Thu, 5 Mar 2020 19:57:39 +0800 Subject: [PATCH] Fix the compatible with SDWebImage 5.6.0 --- Cartfile | 2 +- Cartfile.resolved | 4 ++-- Example/Podfile.lock | 18 +++++++++--------- .../ViewController.m | 2 +- SDWebImageSVGKitPlugin.podspec | 2 +- .../Classes/SDImageSVGKCoder.h | 5 +++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cartfile b/Cartfile index 8b5b24f..37b0575 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "SDWebImage/SDWebImage" ~> 5.5 +github "SDWebImage/SDWebImage" ~> 5.6 github "SVGKit/SVGKit" >= 2.1 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 83f5229..051559b 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "CocoaLumberjack/CocoaLumberjack" "3.6.0" -github "SDWebImage/SDWebImage" "5.3.1" +github "CocoaLumberjack/CocoaLumberjack" "3.6.1" +github "SDWebImage/SDWebImage" "5.6.0" github "SVGKit/SVGKit" "2.1.0" diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 866a93e..939ac35 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,10 +1,10 @@ PODS: - - CocoaLumberjack (3.6.0): - - CocoaLumberjack/Core (= 3.6.0) - - CocoaLumberjack/Core (3.6.0) - - SDWebImage/Core (5.5.2) - - SDWebImageSVGKitPlugin (1.0.0): - - SDWebImage/Core (~> 5.5) + - CocoaLumberjack (3.6.1): + - CocoaLumberjack/Core (= 3.6.1) + - CocoaLumberjack/Core (3.6.1) + - SDWebImage/Core (5.6.0) + - SDWebImageSVGKitPlugin (1.1.0): + - SDWebImage/Core (~> 5.6) - SVGKit (>= 2.1) - SVGKit (2.1.0): - CocoaLumberjack (~> 3.0) @@ -31,9 +31,9 @@ CHECKOUT OPTIONS: :git: https://github.com/SVGKit/SVGKit.git SPEC CHECKSUMS: - CocoaLumberjack: 78b0c238666f4f58db069738ec176f4519557516 - SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca - SDWebImageSVGKitPlugin: 02e1f98cf9ed0814788bba781fad59ac4185dfc4 + CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9 + SDWebImage: 21b19f56b4226cdfe3aefe4e6848dc43ed129a86 + SDWebImageSVGKitPlugin: b6407acff9177a97ed654794e63e3a93fedbcacc SVGKit: 8a2fc74258bdb2abb54d3b65f3dd68b0277a9c4d PODFILE CHECKSUM: 91804dc9be5d336ef696711e8704688dfe2f0a2a diff --git a/Example/SDWebImageSVGKitPlugin_Example macOS/ViewController.m b/Example/SDWebImageSVGKitPlugin_Example macOS/ViewController.m index c7cb750..390aef0 100644 --- a/Example/SDWebImageSVGKitPlugin_Example macOS/ViewController.m +++ b/Example/SDWebImageSVGKitPlugin_Example macOS/ViewController.m @@ -39,7 +39,7 @@ - (void)viewDidLoad { NSAssert(svgData.length > 0, @"SVG Data should exist"); } }]; - [imageView2 sd_setImageWithURL:SVGURL2 placeholderImage:nil options:SDWebImageRetryFailed context:@{SDWebImageContextSVGKImageSize : @(imageView2.bounds.size)} progress:nil completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) { + [imageView2 sd_setImageWithURL:SVGURL2 placeholderImage:nil options:SDWebImageRetryFailed context:@{SDWebImageContextImageThumbnailPixelSize : @(imageView2.bounds.size)} progress:nil completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) { if (image) { NSLog(@"SVG load animation success"); [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) { diff --git a/SDWebImageSVGKitPlugin.podspec b/SDWebImageSVGKitPlugin.podspec index 45bb564..4515348 100644 --- a/SDWebImageSVGKitPlugin.podspec +++ b/SDWebImageSVGKitPlugin.podspec @@ -33,6 +33,6 @@ TODO: Add long description of the pod here. s.source_files = 'SDWebImageSVGKitPlugin/Classes/**/*', 'SDWebImageSVGKitPlugin/Module/SDWebImageSVGKitPlugin.h' s.module_map = 'SDWebImageSVGKitPlugin/Module/SDWebImageSVGKitPlugin.modulemap' - s.dependency 'SDWebImage/Core', '~> 5.5' + s.dependency 'SDWebImage/Core', '~> 5.6' s.dependency 'SVGKit', '>= 2.1' end diff --git a/SDWebImageSVGKitPlugin/Classes/SDImageSVGKCoder.h b/SDWebImageSVGKitPlugin/Classes/SDImageSVGKCoder.h index 2765c7f..01ff304 100644 --- a/SDWebImageSVGKitPlugin/Classes/SDImageSVGKCoder.h +++ b/SDWebImageSVGKitPlugin/Classes/SDImageSVGKCoder.h @@ -9,8 +9,9 @@ NS_ASSUME_NONNULL_BEGIN -static const SDImageFormat SDImageFormatSVG = 12; - +/** + SDImageSVGKCoder is a SVG image coder, which use the SVGKit for SVG rendering. It support a subset of SVG 1.1 spec. For anything related to SVG rendering, please report issue to https://github.com/SVGKit/SVGKit/. + */ @interface SDImageSVGKCoder : NSObject @property (nonatomic, class, readonly) SDImageSVGKCoder *sharedCoder;