diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.swift b/Package.swift index b8f49233..2e867bc0 100644 --- a/Package.swift +++ b/Package.swift @@ -32,16 +32,16 @@ let package = Package( dependencies: [], path: "SDWebImage", sources: ["Core", "Private"], - publicHeadersPath: "Core", cSettings: [ + .headerSearchPath("Core"), .headerSearchPath("Private") ] ), .target( name: "SDWebImageMapKit", dependencies: ["SDWebImage"], - path: "SDWebImage/MapKit", - publicHeadersPath: "." + path: "SDWebImageMapKit", + sources: ["MapKit"] ) ] ) diff --git a/README.md b/README.md index e83aaba8..37fa9619 100644 --- a/README.md +++ b/README.md @@ -283,6 +283,12 @@ In the source files where you need to use the library, import the umbrella heade #import ``` +It's also recommend to use the module import syntax, available for CocoaPods(enable `modular_headers`)/Carthage/SwiftPM. + +```objecitivec +@import SDWebImage; +``` + ### Build Project At this point your workspace should build without error. If you are having problem, post to the Issue and the diff --git a/SDWebImage.podspec b/SDWebImage.podspec index 7464962c..f97409bc 100644 --- a/SDWebImage.podspec +++ b/SDWebImage.podspec @@ -33,7 +33,6 @@ Pod::Spec.new do |s| s.subspec 'Core' do |core| core.source_files = 'SDWebImage/Core/*.{h,m}', 'WebImage/SDWebImage.h', 'SDWebImage/Private/*.{h,m}' - core.exclude_files = 'SDWebImage/MapKit/*.{h,m}' core.private_header_files = 'SDWebImage/Private/*.h' end @@ -41,7 +40,7 @@ Pod::Spec.new do |s| mk.osx.deployment_target = '10.10' mk.ios.deployment_target = '8.0' mk.tvos.deployment_target = '9.2' - mk.source_files = 'SDWebImage/MapKit/*.{h,m}' + mk.source_files = 'SDWebImageMapKit/MapKit/*.{h,m}' mk.framework = 'MapKit' mk.dependency 'SDWebImage/Core' end diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index bbb554c1..43516df0 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -112,6 +112,8 @@ 327054D6206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 327054DA206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; 327054DC206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; + 3287E6D1244C0C1400007311 /* MKAnnotationView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 3287E6CD244C0C1400007311 /* MKAnnotationView+WebCache.m */; }; + 3287E6D2244C0C1400007311 /* MKAnnotationView+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3287E6CE244C0C1400007311 /* MKAnnotationView+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 328BB69E2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 328BB6A22081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; }; 328BB6A42081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; }; @@ -288,8 +290,6 @@ 80B6DF822142B44400BCB334 /* NSButton+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 321DB3602011D4D60015D2CB /* NSButton+WebCache.m */; }; 80B6DF832142B44500BCB334 /* NSButton+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 321DB3602011D4D60015D2CB /* NSButton+WebCache.m */; }; 80B6DF842142B44600BCB334 /* NSButton+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 321DB35F2011D4D60015D2CB /* NSButton+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 80B6DFA72142B71600BCB334 /* MKAnnotationView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE87A2088871B008D7530 /* MKAnnotationView+WebCache.m */; }; - 80B6DFCD2142B71600BCB334 /* MKAnnotationView+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE87B2088871B008D7530 /* MKAnnotationView+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; A18A6CC9172DC28500419892 /* UIImage+GIF.m in Sources */ = {isa = PBXBuildFile; fileRef = A18A6CC6172DC28500419892 /* UIImage+GIF.m */; }; AB615306192DA24600A2D8E9 /* UIView+WebCacheOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = AB615302192DA24600A2D8E9 /* UIView+WebCacheOperation.m */; }; ABBE71A818C43B4D00B75E91 /* UIImageView+HighlightedWebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = ABBE71A618C43B4D00B75E91 /* UIImageView+HighlightedWebCache.m */; }; @@ -437,6 +437,8 @@ 326E2F32236F1D58006F847F /* SDDeviceHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDDeviceHelper.m; sourceTree = ""; }; 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDImageAPNGCoder.h; path = Core/SDImageAPNGCoder.h; sourceTree = ""; }; 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDImageAPNGCoder.m; path = Core/SDImageAPNGCoder.m; sourceTree = ""; }; + 3287E6CD244C0C1400007311 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MKAnnotationView+WebCache.m"; sourceTree = ""; }; + 3287E6CE244C0C1400007311 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MKAnnotationView+WebCache.h"; sourceTree = ""; }; 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDWebImageCacheKeyFilter.h; path = Core/SDWebImageCacheKeyFilter.h; sourceTree = ""; }; 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDWebImageCacheKeyFilter.m; path = Core/SDWebImageCacheKeyFilter.m; sourceTree = ""; }; 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDWebImageCacheSerializer.h; path = Core/SDWebImageCacheSerializer.h; sourceTree = ""; }; @@ -480,8 +482,6 @@ 32F7C06E2030114C00873181 /* SDImageTransformer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDImageTransformer.m; path = Core/SDImageTransformer.m; sourceTree = ""; }; 32F7C07C2030719600873181 /* UIImage+Transform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Transform.m"; path = "Core/UIImage+Transform.m"; sourceTree = ""; }; 32F7C07D2030719600873181 /* UIImage+Transform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+Transform.h"; path = "Core/UIImage+Transform.h"; sourceTree = ""; }; - 32FDE87A2088871B008D7530 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MKAnnotationView+WebCache.m"; sourceTree = ""; }; - 32FDE87B2088871B008D7530 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MKAnnotationView+WebCache.h"; sourceTree = ""; }; 4369C2751D9807EC007E863A /* UIView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+WebCache.h"; path = "SDWebImage/Core/UIView+WebCache.h"; sourceTree = ""; }; 4369C2761D9807EC007E863A /* UIView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+WebCache.m"; path = "SDWebImage/Core/UIView+WebCache.m"; sourceTree = ""; }; 4397D2F41D0DE2DF00BB2784 /* NSImage+Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSImage+Compatibility.h"; path = "Core/NSImage+Compatibility.h"; sourceTree = ""; }; @@ -607,6 +607,23 @@ name = AnimatedImage; sourceTree = ""; }; + 3287E6C7244C0C1400007311 /* SDWebImageMapKit */ = { + isa = PBXGroup; + children = ( + 3287E6CC244C0C1400007311 /* MapKit */, + ); + path = SDWebImageMapKit; + sourceTree = ""; + }; + 3287E6CC244C0C1400007311 /* MapKit */ = { + isa = PBXGroup; + children = ( + 3287E6CE244C0C1400007311 /* MKAnnotationView+WebCache.h */, + 3287E6CD244C0C1400007311 /* MKAnnotationView+WebCache.m */, + ); + path = MapKit; + sourceTree = ""; + }; 328BB6972081FDAB00760D6C /* Manager */ = { isa = PBXGroup; children = ( @@ -672,15 +689,6 @@ path = Private; sourceTree = ""; }; - 32FDE8792088871B008D7530 /* MapKit */ = { - isa = PBXGroup; - children = ( - 32FDE87B2088871B008D7530 /* MKAnnotationView+WebCache.h */, - 32FDE87A2088871B008D7530 /* MKAnnotationView+WebCache.m */, - ); - path = MapKit; - sourceTree = ""; - }; 4369C2851D9811BB007E863A /* WebCache Categories */ = { isa = PBXGroup; children = ( @@ -722,6 +730,7 @@ children = ( EA9E0C6A2195936400AFB434 /* Configs */, 53922D74148C55820056699D /* SDWebImage */, + 3287E6C7244C0C1400007311 /* SDWebImageMapKit */, 4A2CAE001AB4BB5300B6BC39 /* WebImage */, 53922D71148C55820056699D /* Frameworks */, 53922D70148C55820056699D /* Products */, @@ -764,7 +773,6 @@ 53922DA9148C562D0056699D /* Categories */, 4369C2851D9811BB007E863A /* WebCache Categories */, 32B5CC5D222F89C2005EB74E /* Private */, - 32FDE8792088871B008D7530 /* MapKit */, ); path = SDWebImage; sourceTree = ""; @@ -952,8 +960,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 3287E6D2244C0C1400007311 /* MKAnnotationView+WebCache.h in Headers */, 806BE07E2142C65200E02143 /* SDWebImageMapKit.h in Headers */, - 80B6DFCD2142B71600BCB334 /* MKAnnotationView+WebCache.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1279,7 +1287,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 80B6DFA72142B71600BCB334 /* MKAnnotationView+WebCache.m in Sources */, + 3287E6D1244C0C1400007311 /* MKAnnotationView+WebCache.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SDWebImage/include/SDWebImage/NSButton+WebCache.h b/SDWebImage/include/SDWebImage/NSButton+WebCache.h new file mode 120000 index 00000000..c1f89924 --- /dev/null +++ b/SDWebImage/include/SDWebImage/NSButton+WebCache.h @@ -0,0 +1 @@ +../../Core/NSButton+WebCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/NSData+ImageContentType.h b/SDWebImage/include/SDWebImage/NSData+ImageContentType.h new file mode 120000 index 00000000..c0852b87 --- /dev/null +++ b/SDWebImage/include/SDWebImage/NSData+ImageContentType.h @@ -0,0 +1 @@ +../../Core/NSData+ImageContentType.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/NSImage+Compatibility.h b/SDWebImage/include/SDWebImage/NSImage+Compatibility.h new file mode 120000 index 00000000..cfad8619 --- /dev/null +++ b/SDWebImage/include/SDWebImage/NSImage+Compatibility.h @@ -0,0 +1 @@ +../../Core/NSImage+Compatibility.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDAnimatedImage.h b/SDWebImage/include/SDWebImage/SDAnimatedImage.h new file mode 120000 index 00000000..f26f5de1 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDAnimatedImage.h @@ -0,0 +1 @@ +../../Core/SDAnimatedImage.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDAnimatedImagePlayer.h b/SDWebImage/include/SDWebImage/SDAnimatedImagePlayer.h new file mode 120000 index 00000000..6f713485 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDAnimatedImagePlayer.h @@ -0,0 +1 @@ +../../Core/SDAnimatedImagePlayer.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDAnimatedImageRep.h b/SDWebImage/include/SDWebImage/SDAnimatedImageRep.h new file mode 120000 index 00000000..b19ae282 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDAnimatedImageRep.h @@ -0,0 +1 @@ +../../Core/SDAnimatedImageRep.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDAnimatedImageView+WebCache.h b/SDWebImage/include/SDWebImage/SDAnimatedImageView+WebCache.h new file mode 120000 index 00000000..6dbc5fa9 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDAnimatedImageView+WebCache.h @@ -0,0 +1 @@ +../../Core/SDAnimatedImageView+WebCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDAnimatedImageView.h b/SDWebImage/include/SDWebImage/SDAnimatedImageView.h new file mode 120000 index 00000000..0a49071c --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDAnimatedImageView.h @@ -0,0 +1 @@ +../../Core/SDAnimatedImageView.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDDiskCache.h b/SDWebImage/include/SDWebImage/SDDiskCache.h new file mode 120000 index 00000000..ba20df74 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDDiskCache.h @@ -0,0 +1 @@ +../../Core/SDDiskCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDGraphicsImageRenderer.h b/SDWebImage/include/SDWebImage/SDGraphicsImageRenderer.h new file mode 120000 index 00000000..a9605ccd --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDGraphicsImageRenderer.h @@ -0,0 +1 @@ +../../Core/SDGraphicsImageRenderer.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageAPNGCoder.h b/SDWebImage/include/SDWebImage/SDImageAPNGCoder.h new file mode 120000 index 00000000..20cba727 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageAPNGCoder.h @@ -0,0 +1 @@ +../../Core/SDImageAPNGCoder.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCache.h b/SDWebImage/include/SDWebImage/SDImageCache.h new file mode 120000 index 00000000..0783c1ce --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCache.h @@ -0,0 +1 @@ +../../Core/SDImageCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCacheConfig.h b/SDWebImage/include/SDWebImage/SDImageCacheConfig.h new file mode 120000 index 00000000..0a58b4f8 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCacheConfig.h @@ -0,0 +1 @@ +../../Core/SDImageCacheConfig.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCacheDefine.h b/SDWebImage/include/SDWebImage/SDImageCacheDefine.h new file mode 120000 index 00000000..0a469880 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCacheDefine.h @@ -0,0 +1 @@ +../../Core/SDImageCacheDefine.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCachesManager.h b/SDWebImage/include/SDWebImage/SDImageCachesManager.h new file mode 120000 index 00000000..d01f76f4 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCachesManager.h @@ -0,0 +1 @@ +../../Core/SDImageCachesManager.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCoder.h b/SDWebImage/include/SDWebImage/SDImageCoder.h new file mode 120000 index 00000000..75472fb1 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCoder.h @@ -0,0 +1 @@ +../../Core/SDImageCoder.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCoderHelper.h b/SDWebImage/include/SDWebImage/SDImageCoderHelper.h new file mode 120000 index 00000000..3e68b945 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCoderHelper.h @@ -0,0 +1 @@ +../../Core/SDImageCoderHelper.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageCodersManager.h b/SDWebImage/include/SDWebImage/SDImageCodersManager.h new file mode 120000 index 00000000..48b8b531 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageCodersManager.h @@ -0,0 +1 @@ +../../Core/SDImageCodersManager.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageFrame.h b/SDWebImage/include/SDWebImage/SDImageFrame.h new file mode 120000 index 00000000..ab05e26e --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageFrame.h @@ -0,0 +1 @@ +../../Core/SDImageFrame.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageGIFCoder.h b/SDWebImage/include/SDWebImage/SDImageGIFCoder.h new file mode 120000 index 00000000..04191623 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageGIFCoder.h @@ -0,0 +1 @@ +../../Core/SDImageGIFCoder.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageGraphics.h b/SDWebImage/include/SDWebImage/SDImageGraphics.h new file mode 120000 index 00000000..823dbd70 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageGraphics.h @@ -0,0 +1 @@ +../../Core/SDImageGraphics.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageHEICCoder.h b/SDWebImage/include/SDWebImage/SDImageHEICCoder.h new file mode 120000 index 00000000..9352871d --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageHEICCoder.h @@ -0,0 +1 @@ +../../Core/SDImageHEICCoder.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageIOAnimatedCoder.h b/SDWebImage/include/SDWebImage/SDImageIOAnimatedCoder.h new file mode 120000 index 00000000..3053de3b --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageIOAnimatedCoder.h @@ -0,0 +1 @@ +../../Core/SDImageIOAnimatedCoder.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageIOCoder.h b/SDWebImage/include/SDWebImage/SDImageIOCoder.h new file mode 120000 index 00000000..9cd1e482 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageIOCoder.h @@ -0,0 +1 @@ +../../Core/SDImageIOCoder.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageLoader.h b/SDWebImage/include/SDWebImage/SDImageLoader.h new file mode 120000 index 00000000..ba476e52 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageLoader.h @@ -0,0 +1 @@ +../../Core/SDImageLoader.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageLoadersManager.h b/SDWebImage/include/SDWebImage/SDImageLoadersManager.h new file mode 120000 index 00000000..442dd4c7 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageLoadersManager.h @@ -0,0 +1 @@ +../../Core/SDImageLoadersManager.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDImageTransformer.h b/SDWebImage/include/SDWebImage/SDImageTransformer.h new file mode 120000 index 00000000..184361bd --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDImageTransformer.h @@ -0,0 +1 @@ +../../Core/SDImageTransformer.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDMemoryCache.h b/SDWebImage/include/SDWebImage/SDMemoryCache.h new file mode 120000 index 00000000..47abcc12 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDMemoryCache.h @@ -0,0 +1 @@ +../../Core/SDMemoryCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImage.h b/SDWebImage/include/SDWebImage/SDWebImage.h new file mode 120000 index 00000000..12cbb09a --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImage.h @@ -0,0 +1 @@ +../../../WebImage/SDWebImage.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageCacheKeyFilter.h b/SDWebImage/include/SDWebImage/SDWebImageCacheKeyFilter.h new file mode 120000 index 00000000..7481d7d3 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageCacheKeyFilter.h @@ -0,0 +1 @@ +../../Core/SDWebImageCacheKeyFilter.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageCacheSerializer.h b/SDWebImage/include/SDWebImage/SDWebImageCacheSerializer.h new file mode 120000 index 00000000..b7d69b29 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageCacheSerializer.h @@ -0,0 +1 @@ +../../Core/SDWebImageCacheSerializer.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageCompat.h b/SDWebImage/include/SDWebImage/SDWebImageCompat.h new file mode 120000 index 00000000..c3c301d0 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageCompat.h @@ -0,0 +1 @@ +../../Core/SDWebImageCompat.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDefine.h b/SDWebImage/include/SDWebImage/SDWebImageDefine.h new file mode 120000 index 00000000..6112007b --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDefine.h @@ -0,0 +1 @@ +../../Core/SDWebImageDefine.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDownloader.h b/SDWebImage/include/SDWebImage/SDWebImageDownloader.h new file mode 120000 index 00000000..ffb6248e --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDownloader.h @@ -0,0 +1 @@ +../../Core/SDWebImageDownloader.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDownloaderConfig.h b/SDWebImage/include/SDWebImage/SDWebImageDownloaderConfig.h new file mode 120000 index 00000000..8959bbbc --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDownloaderConfig.h @@ -0,0 +1 @@ +../../Core/SDWebImageDownloaderConfig.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDownloaderDecryptor.h b/SDWebImage/include/SDWebImage/SDWebImageDownloaderDecryptor.h new file mode 120000 index 00000000..fd6de4d8 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDownloaderDecryptor.h @@ -0,0 +1 @@ +../../Core/SDWebImageDownloaderDecryptor.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDownloaderOperation.h b/SDWebImage/include/SDWebImage/SDWebImageDownloaderOperation.h new file mode 120000 index 00000000..ef18b7c2 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDownloaderOperation.h @@ -0,0 +1 @@ +../../Core/SDWebImageDownloaderOperation.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDownloaderRequestModifier.h b/SDWebImage/include/SDWebImage/SDWebImageDownloaderRequestModifier.h new file mode 120000 index 00000000..f7aa82b9 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDownloaderRequestModifier.h @@ -0,0 +1 @@ +../../Core/SDWebImageDownloaderRequestModifier.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageDownloaderResponseModifier.h b/SDWebImage/include/SDWebImage/SDWebImageDownloaderResponseModifier.h new file mode 120000 index 00000000..be391197 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageDownloaderResponseModifier.h @@ -0,0 +1 @@ +../../Core/SDWebImageDownloaderResponseModifier.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageError.h b/SDWebImage/include/SDWebImage/SDWebImageError.h new file mode 120000 index 00000000..b088fc03 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageError.h @@ -0,0 +1 @@ +../../Core/SDWebImageError.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageIndicator.h b/SDWebImage/include/SDWebImage/SDWebImageIndicator.h new file mode 120000 index 00000000..60f464f2 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageIndicator.h @@ -0,0 +1 @@ +../../Core/SDWebImageIndicator.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageManager.h b/SDWebImage/include/SDWebImage/SDWebImageManager.h new file mode 120000 index 00000000..20ddf7c7 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageManager.h @@ -0,0 +1 @@ +../../Core/SDWebImageManager.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageOperation.h b/SDWebImage/include/SDWebImage/SDWebImageOperation.h new file mode 120000 index 00000000..e7bf5bad --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageOperation.h @@ -0,0 +1 @@ +../../Core/SDWebImageOperation.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageOptionsProcessor.h b/SDWebImage/include/SDWebImage/SDWebImageOptionsProcessor.h new file mode 120000 index 00000000..b1e48c72 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageOptionsProcessor.h @@ -0,0 +1 @@ +../../Core/SDWebImageOptionsProcessor.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImagePrefetcher.h b/SDWebImage/include/SDWebImage/SDWebImagePrefetcher.h new file mode 120000 index 00000000..1346c8d2 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImagePrefetcher.h @@ -0,0 +1 @@ +../../Core/SDWebImagePrefetcher.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/SDWebImageTransition.h b/SDWebImage/include/SDWebImage/SDWebImageTransition.h new file mode 120000 index 00000000..19b24b09 --- /dev/null +++ b/SDWebImage/include/SDWebImage/SDWebImageTransition.h @@ -0,0 +1 @@ +../../Core/SDWebImageTransition.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIButton+WebCache.h b/SDWebImage/include/SDWebImage/UIButton+WebCache.h new file mode 120000 index 00000000..2a9820d8 --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIButton+WebCache.h @@ -0,0 +1 @@ +../../Core/UIButton+WebCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+ExtendedCacheData.h b/SDWebImage/include/SDWebImage/UIImage+ExtendedCacheData.h new file mode 120000 index 00000000..fab25a7e --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+ExtendedCacheData.h @@ -0,0 +1 @@ +../../Core/UIImage+ExtendedCacheData.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+ForceDecode.h b/SDWebImage/include/SDWebImage/UIImage+ForceDecode.h new file mode 120000 index 00000000..0ef28712 --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+ForceDecode.h @@ -0,0 +1 @@ +../../Core/UIImage+ForceDecode.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+GIF.h b/SDWebImage/include/SDWebImage/UIImage+GIF.h new file mode 120000 index 00000000..30e9dd4a --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+GIF.h @@ -0,0 +1 @@ +../../Core/UIImage+GIF.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+MemoryCacheCost.h b/SDWebImage/include/SDWebImage/UIImage+MemoryCacheCost.h new file mode 120000 index 00000000..81d6161d --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+MemoryCacheCost.h @@ -0,0 +1 @@ +../../Core/UIImage+MemoryCacheCost.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+Metadata.h b/SDWebImage/include/SDWebImage/UIImage+Metadata.h new file mode 120000 index 00000000..65eb11f4 --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+Metadata.h @@ -0,0 +1 @@ +../../Core/UIImage+Metadata.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+MultiFormat.h b/SDWebImage/include/SDWebImage/UIImage+MultiFormat.h new file mode 120000 index 00000000..5366a33a --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+MultiFormat.h @@ -0,0 +1 @@ +../../Core/UIImage+MultiFormat.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImage+Transform.h b/SDWebImage/include/SDWebImage/UIImage+Transform.h new file mode 120000 index 00000000..73bdf3fd --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImage+Transform.h @@ -0,0 +1 @@ +../../Core/UIImage+Transform.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImageView+HighlightedWebCache.h b/SDWebImage/include/SDWebImage/UIImageView+HighlightedWebCache.h new file mode 120000 index 00000000..a9898113 --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImageView+HighlightedWebCache.h @@ -0,0 +1 @@ +../../Core/UIImageView+HighlightedWebCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIImageView+WebCache.h b/SDWebImage/include/SDWebImage/UIImageView+WebCache.h new file mode 120000 index 00000000..8e732df7 --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIImageView+WebCache.h @@ -0,0 +1 @@ +../../Core/UIImageView+WebCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIView+WebCache.h b/SDWebImage/include/SDWebImage/UIView+WebCache.h new file mode 120000 index 00000000..6a1b138c --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIView+WebCache.h @@ -0,0 +1 @@ +../../Core/UIView+WebCache.h \ No newline at end of file diff --git a/SDWebImage/include/SDWebImage/UIView+WebCacheOperation.h b/SDWebImage/include/SDWebImage/UIView+WebCacheOperation.h new file mode 120000 index 00000000..5631d02a --- /dev/null +++ b/SDWebImage/include/SDWebImage/UIView+WebCacheOperation.h @@ -0,0 +1 @@ +../../Core/UIView+WebCacheOperation.h \ No newline at end of file diff --git a/SDWebImage/MapKit/MKAnnotationView+WebCache.h b/SDWebImageMapKit/MapKit/MKAnnotationView+WebCache.h similarity index 99% rename from SDWebImage/MapKit/MKAnnotationView+WebCache.h rename to SDWebImageMapKit/MapKit/MKAnnotationView+WebCache.h index 59346041..30f5aed1 100644 --- a/SDWebImage/MapKit/MKAnnotationView+WebCache.h +++ b/SDWebImageMapKit/MapKit/MKAnnotationView+WebCache.h @@ -6,12 +6,11 @@ * file that was distributed with this source code. */ -#import "SDWebImageCompat.h" +#import #if SD_UIKIT || SD_MAC #import -#import "SDWebImageManager.h" /** * Integrates SDWebImage async downloading and caching of remote images with MKAnnotationView. diff --git a/SDWebImage/MapKit/MKAnnotationView+WebCache.m b/SDWebImageMapKit/MapKit/MKAnnotationView+WebCache.m similarity index 99% rename from SDWebImage/MapKit/MKAnnotationView+WebCache.m rename to SDWebImageMapKit/MapKit/MKAnnotationView+WebCache.m index 11b91b19..4969c0ba 100644 --- a/SDWebImage/MapKit/MKAnnotationView+WebCache.m +++ b/SDWebImageMapKit/MapKit/MKAnnotationView+WebCache.m @@ -10,8 +10,6 @@ #if SD_UIKIT || SD_MAC -#import "UIView+WebCache.h" - @implementation MKAnnotationView (WebCache) - (void)sd_setImageWithURL:(nullable NSURL *)url { diff --git a/SDWebImageMapKit/include/SDWebImageMapKit/MKAnnotationView+WebCache.h b/SDWebImageMapKit/include/SDWebImageMapKit/MKAnnotationView+WebCache.h new file mode 120000 index 00000000..28a11933 --- /dev/null +++ b/SDWebImageMapKit/include/SDWebImageMapKit/MKAnnotationView+WebCache.h @@ -0,0 +1 @@ +../../MapKit/MKAnnotationView+WebCache.h \ No newline at end of file diff --git a/SDWebImageMapKit/include/SDWebImageMapKit/SDWebImageMapKit.h b/SDWebImageMapKit/include/SDWebImageMapKit/SDWebImageMapKit.h new file mode 120000 index 00000000..8d192441 --- /dev/null +++ b/SDWebImageMapKit/include/SDWebImageMapKit/SDWebImageMapKit.h @@ -0,0 +1 @@ +../../../WebImage/SDWebImageMapKit.h \ No newline at end of file diff --git a/WebImage/SDWebImage.h b/WebImage/SDWebImage.h index eeadf43f..929f1b96 100644 --- a/WebImage/SDWebImage.h +++ b/WebImage/SDWebImage.h @@ -15,7 +15,7 @@ FOUNDATION_EXPORT double SDWebImageVersionNumber; //! Project version string for SDWebImage. FOUNDATION_EXPORT const unsigned char SDWebImageVersionString[]; -// In this header, you should import all the public headers of your framework using statements like #import +// In this header, you should import all the public headers of your framework using statements like #import #import #import diff --git a/WebImage/SDWebImageMapKit.h b/WebImage/SDWebImageMapKit.h index 99c14cd9..84e43156 100644 --- a/WebImage/SDWebImageMapKit.h +++ b/WebImage/SDWebImageMapKit.h @@ -9,11 +9,11 @@ #import -//! Project version number for WebImage. -FOUNDATION_EXPORT double WebImageMapKitVersionNumber; +//! Project version number for SDWebImageMapKit. +FOUNDATION_EXPORT double SDWebImageMapKitVersionNumber; -//! Project version string for WebImage. -FOUNDATION_EXPORT const unsigned char WebImageMapKitVersionString[]; +//! Project version string for SDWebImageMapKit. +FOUNDATION_EXPORT const unsigned char SDWebImageMapKitVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import