diff --git a/Configs/Module-Shared.xcconfig b/Configs/Module-Shared.xcconfig index 1d6d3084..2f31af0b 100644 --- a/Configs/Module-Shared.xcconfig +++ b/Configs/Module-Shared.xcconfig @@ -223,6 +223,3 @@ VERSIONING_SYSTEM = apple-generic // Code will load on this and later versions of watchOS. Framework APIs that are unavailable in earlier versions will be weak-linked; your code should check for null function pointers or specific system versions before calling newer APIs. WATCHOS_DEPLOYMENT_TARGET = 2.0 - -// Implicitly include the named header. The path given should either be a project relative path or an absolute path. -GCC_PREFIX_HEADER = WebImage/SDWebImage-Prefix.pch diff --git a/SDWebImage.podspec b/SDWebImage.podspec index c8b4c806..b62560d5 100644 --- a/SDWebImage.podspec +++ b/SDWebImage.podspec @@ -31,7 +31,6 @@ Pod::Spec.new do |s| 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' - core.prefix_header_contents = '#import "SDInternalMacros.h"' end s.subspec 'MapKit' do |mk| diff --git a/SDWebImage/MapKit/MKAnnotationView+WebCache.m b/SDWebImage/MapKit/MKAnnotationView+WebCache.m index fed23675..adc02a92 100644 --- a/SDWebImage/MapKit/MKAnnotationView+WebCache.m +++ b/SDWebImage/MapKit/MKAnnotationView+WebCache.m @@ -13,6 +13,7 @@ #import "objc/runtime.h" #import "UIView+WebCacheOperation.h" #import "UIView+WebCache.h" +#import "SDInternalMacros.h" @implementation MKAnnotationView (WebCache) diff --git a/SDWebImage/NSButton+WebCache.m b/SDWebImage/NSButton+WebCache.m index 8800cea5..300e5a36 100644 --- a/SDWebImage/NSButton+WebCache.m +++ b/SDWebImage/NSButton+WebCache.m @@ -13,6 +13,7 @@ #import "objc/runtime.h" #import "UIView+WebCacheOperation.h" #import "UIView+WebCache.h" +#import "SDInternalMacros.h" static NSString * const SDAlternateImageOperationKey = @"NSButtonAlternateImageOperation"; diff --git a/SDWebImage/Private/SDImageAssetManager.m b/SDWebImage/Private/SDImageAssetManager.m index 1dc5503c..fa92e74f 100644 --- a/SDWebImage/Private/SDImageAssetManager.m +++ b/SDWebImage/Private/SDImageAssetManager.m @@ -7,6 +7,7 @@ */ #import "SDImageAssetManager.h" +#import "SDInternalMacros.h" static NSArray *SDBundlePreferredScales() { static NSArray *scales; diff --git a/SDWebImage/Private/SDImageCachesManagerOperation.m b/SDWebImage/Private/SDImageCachesManagerOperation.m index 131a18fe..1a1ae696 100644 --- a/SDWebImage/Private/SDImageCachesManagerOperation.m +++ b/SDWebImage/Private/SDImageCachesManagerOperation.m @@ -7,6 +7,7 @@ */ #import "SDImageCachesManagerOperation.h" +#import "SDInternalMacros.h" @implementation SDImageCachesManagerOperation { diff --git a/SDWebImage/SDAnimatedImageView.m b/SDWebImage/SDAnimatedImageView.m index 5c863e74..7e940828 100644 --- a/SDWebImage/SDAnimatedImageView.m +++ b/SDWebImage/SDAnimatedImageView.m @@ -13,6 +13,7 @@ #import "UIImage+Metadata.h" #import "NSImage+Compatibility.h" #import "SDWeakProxy.h" +#import "SDInternalMacros.h" #import #import diff --git a/SDWebImage/SDImageCachesManager.m b/SDWebImage/SDImageCachesManager.m index e8d8d319..6b6f7d8a 100644 --- a/SDWebImage/SDImageCachesManager.m +++ b/SDWebImage/SDImageCachesManager.m @@ -9,6 +9,7 @@ #import "SDImageCachesManager.h" #import "SDImageCachesManagerOperation.h" #import "SDImageCache.h" +#import "SDInternalMacros.h" @interface SDImageCachesManager () diff --git a/SDWebImage/SDImageCodersManager.m b/SDWebImage/SDImageCodersManager.m index 2a25fdb2..e9364646 100644 --- a/SDWebImage/SDImageCodersManager.m +++ b/SDWebImage/SDImageCodersManager.m @@ -10,6 +10,7 @@ #import "SDImageIOCoder.h" #import "SDImageGIFCoder.h" #import "SDImageAPNGCoder.h" +#import "SDInternalMacros.h" @interface SDImageCodersManager () diff --git a/SDWebImage/SDImageLoadersManager.m b/SDWebImage/SDImageLoadersManager.m index 002ef95a..0c48e210 100644 --- a/SDWebImage/SDImageLoadersManager.m +++ b/SDWebImage/SDImageLoadersManager.m @@ -8,6 +8,7 @@ #import "SDImageLoadersManager.h" #import "SDWebImageDownloader.h" +#import "SDInternalMacros.h" @interface SDImageLoadersManager () diff --git a/SDWebImage/SDMemoryCache.m b/SDWebImage/SDMemoryCache.m index 8a03f117..c331fce3 100644 --- a/SDWebImage/SDMemoryCache.m +++ b/SDWebImage/SDMemoryCache.m @@ -9,6 +9,7 @@ #import "SDMemoryCache.h" #import "SDImageCacheConfig.h" #import "UIImage+MemoryCacheCost.h" +#import "SDInternalMacros.h" static void * SDMemoryCacheContext = &SDMemoryCacheContext; diff --git a/SDWebImage/SDWebImageDownloader.m b/SDWebImage/SDWebImageDownloader.m index da244659..3ee0e710 100644 --- a/SDWebImage/SDWebImageDownloader.m +++ b/SDWebImage/SDWebImageDownloader.m @@ -10,6 +10,7 @@ #import "SDWebImageDownloaderConfig.h" #import "SDWebImageDownloaderOperation.h" #import "SDWebImageError.h" +#import "SDInternalMacros.h" NSNotificationName const SDWebImageDownloadStartNotification = @"SDWebImageDownloadStartNotification"; NSNotificationName const SDWebImageDownloadReceiveResponseNotification = @"SDWebImageDownloadReceiveResponseNotification"; diff --git a/SDWebImage/SDWebImageDownloaderOperation.m b/SDWebImage/SDWebImageDownloaderOperation.m index c3dc3693..c9275ea0 100644 --- a/SDWebImage/SDWebImageDownloaderOperation.m +++ b/SDWebImage/SDWebImageDownloaderOperation.m @@ -8,6 +8,7 @@ #import "SDWebImageDownloaderOperation.h" #import "SDWebImageError.h" +#import "SDInternalMacros.h" // iOS 8 Foundation.framework extern these symbol but the define is in CFNetwork.framework. We just fix this without import CFNetwork.framework #if (__IPHONE_OS_VERSION_MIN_REQUIRED && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0) diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m index 666148dd..622eef1c 100644 --- a/SDWebImage/SDWebImageManager.m +++ b/SDWebImage/SDWebImageManager.m @@ -11,6 +11,7 @@ #import "SDWebImageDownloader.h" #import "UIImage+Metadata.h" #import "SDWebImageError.h" +#import "SDInternalMacros.h" static id _defaultImageCache; static id _defaultImageLoader; diff --git a/SDWebImage/SDWebImagePrefetcher.m b/SDWebImage/SDWebImagePrefetcher.m index e141e24e..df9c800e 100644 --- a/SDWebImage/SDWebImagePrefetcher.m +++ b/SDWebImage/SDWebImagePrefetcher.m @@ -8,6 +8,7 @@ #import "SDWebImagePrefetcher.h" #import "SDAsyncBlockOperation.h" +#import "SDInternalMacros.h" #import @interface SDWebImagePrefetchToken () { diff --git a/SDWebImage/UIButton+WebCache.m b/SDWebImage/UIButton+WebCache.m index e31ba9b5..caf3a401 100644 --- a/SDWebImage/UIButton+WebCache.m +++ b/SDWebImage/UIButton+WebCache.m @@ -13,6 +13,7 @@ #import "objc/runtime.h" #import "UIView+WebCacheOperation.h" #import "UIView+WebCache.h" +#import "SDInternalMacros.h" static char imageURLStorageKey; diff --git a/SDWebImage/UIImageView+HighlightedWebCache.m b/SDWebImage/UIImageView+HighlightedWebCache.m index c2b4dcaa..96c09c1c 100644 --- a/SDWebImage/UIImageView+HighlightedWebCache.m +++ b/SDWebImage/UIImageView+HighlightedWebCache.m @@ -12,6 +12,7 @@ #import "UIView+WebCacheOperation.h" #import "UIView+WebCache.h" +#import "SDInternalMacros.h" static NSString * const SDHighlightedImageOperationKey = @"UIImageViewImageOperationHighlighted"; diff --git a/SDWebImage/UIView+WebCache.m b/SDWebImage/UIView+WebCache.m index cb470c6c..6ac9b29d 100644 --- a/SDWebImage/UIView+WebCache.m +++ b/SDWebImage/UIView+WebCache.m @@ -10,6 +10,7 @@ #import "objc/runtime.h" #import "UIView+WebCacheOperation.h" #import "SDWebImageError.h" +#import "SDInternalMacros.h" const int64_t SDWebImageProgressUnitCountUnknown = 1LL;