From cf0738abd98714c1062dfc7d04771f51a5a50918 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Wed, 6 Mar 2019 13:05:22 +0800 Subject: [PATCH] Move the SDAsyncBlockOperation into the private header folder, this class is only used inside framework --- SDWebImage.podspec | 3 +- SDWebImage.xcodeproj/project.pbxproj | 32 ++++++++++++------- .../{ => Private}/SDAsyncBlockOperation.h | 0 .../{ => Private}/SDAsyncBlockOperation.m | 0 4 files changed, 22 insertions(+), 13 deletions(-) rename SDWebImage/{ => Private}/SDAsyncBlockOperation.h (100%) rename SDWebImage/{ => Private}/SDAsyncBlockOperation.m (100%) diff --git a/SDWebImage.podspec b/SDWebImage.podspec index 265a4b9b..4ed29a05 100644 --- a/SDWebImage.podspec +++ b/SDWebImage.podspec @@ -28,8 +28,9 @@ Pod::Spec.new do |s| s.default_subspec = 'Core' s.subspec 'Core' do |core| - core.source_files = 'SDWebImage/*.{h,m}', 'WebImage/SDWebImage.h' + core.source_files = 'SDWebImage/*.{h,m}', 'WebImage/SDWebImage.h', 'SDWebImage/Private/*.{h,m}' core.exclude_files = 'SDWebImage/MapKit/*.{h,m}' + core.private_header_files = 'SDWebImage/Private/*.h' end s.subspec 'MapKit' do |mk| diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index 2cb8cf80..52d8a6cb 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -87,14 +87,14 @@ 3290FA061FA478AF0047D20C /* SDImageFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 3290FA021FA478AF0047D20C /* SDImageFrame.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3290FA0A1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; }; 3290FA0C1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; }; - 3299C4EE222BC3FD00DABA0F /* SDAsyncBlockOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3299C4EC222BC3FD00DABA0F /* SDAsyncBlockOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3299C4EF222BC3FD00DABA0F /* SDAsyncBlockOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3299C4EC222BC3FD00DABA0F /* SDAsyncBlockOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3299C4F0222BC3FD00DABA0F /* SDAsyncBlockOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3299C4ED222BC3FD00DABA0F /* SDAsyncBlockOperation.m */; }; - 3299C4F1222BC3FD00DABA0F /* SDAsyncBlockOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3299C4ED222BC3FD00DABA0F /* SDAsyncBlockOperation.m */; }; 329A18591FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185B1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185F1FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; }; 329A18611FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; }; + 32B5CC60222F89C2005EB74E /* SDAsyncBlockOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B5CC5E222F89C2005EB74E /* SDAsyncBlockOperation.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 32B5CC61222F89C2005EB74E /* SDAsyncBlockOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B5CC5F222F89C2005EB74E /* SDAsyncBlockOperation.m */; }; + 32B5CC62222F89F6005EB74E /* SDAsyncBlockOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B5CC5E222F89C2005EB74E /* SDAsyncBlockOperation.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 32B5CC63222F8B70005EB74E /* SDAsyncBlockOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B5CC5F222F89C2005EB74E /* SDAsyncBlockOperation.m */; }; 32B9B537206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32B9B539206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32B9B53D206ED4230026769D /* SDWebImageDownloaderConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B9B536206ED4230026769D /* SDWebImageDownloaderConfig.m */; }; @@ -271,10 +271,10 @@ 328BB6C02082581100760D6C /* SDMemoryCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDMemoryCache.m; sourceTree = ""; }; 3290FA021FA478AF0047D20C /* SDImageFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDImageFrame.h; sourceTree = ""; }; 3290FA031FA478AF0047D20C /* SDImageFrame.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDImageFrame.m; sourceTree = ""; }; - 3299C4EC222BC3FD00DABA0F /* SDAsyncBlockOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDAsyncBlockOperation.h; sourceTree = ""; }; - 3299C4ED222BC3FD00DABA0F /* SDAsyncBlockOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDAsyncBlockOperation.m; sourceTree = ""; }; 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Metadata.h"; sourceTree = ""; }; 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Metadata.m"; sourceTree = ""; }; + 32B5CC5E222F89C2005EB74E /* SDAsyncBlockOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDAsyncBlockOperation.h; sourceTree = ""; }; + 32B5CC5F222F89C2005EB74E /* SDAsyncBlockOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDAsyncBlockOperation.m; sourceTree = ""; }; 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageDownloaderConfig.h; sourceTree = ""; }; 32B9B536206ED4230026769D /* SDWebImageDownloaderConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDownloaderConfig.m; sourceTree = ""; }; 32C0FDDF2013426C001B8F2D /* SDWebImageIndicator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageIndicator.h; sourceTree = ""; }; @@ -431,8 +431,6 @@ children = ( 53922D91148C56230056699D /* SDWebImagePrefetcher.h */, 53922D92148C56230056699D /* SDWebImagePrefetcher.m */, - 3299C4EC222BC3FD00DABA0F /* SDAsyncBlockOperation.h */, - 3299C4ED222BC3FD00DABA0F /* SDAsyncBlockOperation.m */, ); name = Prefetcher; sourceTree = ""; @@ -446,6 +444,15 @@ name = Transformer; sourceTree = ""; }; + 32B5CC5D222F89C2005EB74E /* Private */ = { + isa = PBXGroup; + children = ( + 32B5CC5E222F89C2005EB74E /* SDAsyncBlockOperation.h */, + 32B5CC5F222F89C2005EB74E /* SDAsyncBlockOperation.m */, + ); + path = Private; + sourceTree = ""; + }; 32FDE8792088871B008D7530 /* MapKit */ = { isa = PBXGroup; children = ( @@ -538,6 +545,7 @@ 53922DAC148C56DD0056699D /* Utils */, 53922DA9148C562D0056699D /* Categories */, 4369C2851D9811BB007E863A /* WebCache Categories */, + 32B5CC5D222F89C2005EB74E /* Private */, 32FDE8792088871B008D7530 /* MapKit */, ); path = SDWebImage; @@ -641,7 +649,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3299C4EF222BC3FD00DABA0F /* SDAsyncBlockOperation.h in Headers */, + 32B5CC60222F89C2005EB74E /* SDAsyncBlockOperation.h in Headers */, 32D122202080B2EB003685A3 /* SDImageCacheDefine.h in Headers */, 32B9B539206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */, 3257EAFA21898AED0097B271 /* SDImageGraphics.h in Headers */, @@ -699,7 +707,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3299C4EE222BC3FD00DABA0F /* SDAsyncBlockOperation.h in Headers */, + 32B5CC62222F89F6005EB74E /* SDAsyncBlockOperation.h in Headers */, 32CF1C071FA496B000004BD1 /* SDImageCoderHelper.h in Headers */, 32F7C0842030719600873181 /* UIImage+Transform.h in Headers */, 3257EAF921898AED0097B271 /* SDImageGraphics.h in Headers */, @@ -906,7 +914,7 @@ 32F7C0772030114C00873181 /* SDImageTransformer.m in Sources */, 3237F9E820161AE000A88143 /* NSImage+Compatibility.m in Sources */, 32C0FDE92013426C001B8F2D /* SDWebImageIndicator.m in Sources */, - 3299C4F1222BC3FD00DABA0F /* SDAsyncBlockOperation.m in Sources */, + 32B5CC61222F89C2005EB74E /* SDAsyncBlockOperation.m in Sources */, 32F21B5920788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.m in Sources */, 321B37952083290E00C0EA77 /* SDImageLoadersManager.m in Sources */, 4A2CAE361AB4BB7500B6BC39 /* UIImageView+WebCache.m in Sources */, @@ -962,7 +970,7 @@ 32F7C0752030114C00873181 /* SDImageTransformer.m in Sources */, 3237F9EB20161AE000A88143 /* NSImage+Compatibility.m in Sources */, 32C0FDE72013426C001B8F2D /* SDWebImageIndicator.m in Sources */, - 3299C4F0222BC3FD00DABA0F /* SDAsyncBlockOperation.m in Sources */, + 32B5CC63222F8B70005EB74E /* SDAsyncBlockOperation.m in Sources */, 32F21B5720788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.m in Sources */, 5376130B155AD0D5005750A4 /* SDWebImageDownloader.m in Sources */, 321B37932083290E00C0EA77 /* SDImageLoadersManager.m in Sources */, diff --git a/SDWebImage/SDAsyncBlockOperation.h b/SDWebImage/Private/SDAsyncBlockOperation.h similarity index 100% rename from SDWebImage/SDAsyncBlockOperation.h rename to SDWebImage/Private/SDAsyncBlockOperation.h diff --git a/SDWebImage/SDAsyncBlockOperation.m b/SDWebImage/Private/SDAsyncBlockOperation.m similarity index 100% rename from SDWebImage/SDAsyncBlockOperation.m rename to SDWebImage/Private/SDAsyncBlockOperation.m