From 46ecde48e956b6db2d26cce762f79776013cd8a8 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Thu, 13 Jun 2019 11:59:57 +0800 Subject: [PATCH] For simple solution, remove the custom modulemap, let CocoaPods generate one instead --- SDWebImage.podspec | 1 - SDWebImage.xcodeproj/project.pbxproj | 2 -- WebImage/SDWebImage.modulemap | 19 ------------------- 3 files changed, 22 deletions(-) delete mode 100644 WebImage/SDWebImage.modulemap diff --git a/SDWebImage.podspec b/SDWebImage.podspec index 97892918..92d9af0e 100644 --- a/SDWebImage.podspec +++ b/SDWebImage.podspec @@ -23,7 +23,6 @@ Pod::Spec.new do |s| s.requires_arc = true s.framework = 'ImageIO' - s.module_map = 'WebImage/SDWebImage.modulemap' s.default_subspec = 'Core' diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index 3819c37b..f037ce09 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -391,7 +391,6 @@ 32F7C07D2030719600873181 /* UIImage+Transform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "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 = ""; }; - 32FDE8A4208887A6008D7530 /* SDWebImage.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = SDWebImage.modulemap; sourceTree = ""; }; 4369C2751D9807EC007E863A /* UIView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+WebCache.h"; path = "SDWebImage/UIView+WebCache.h"; sourceTree = ""; }; 4369C2761D9807EC007E863A /* UIView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+WebCache.m"; path = "SDWebImage/UIView+WebCache.m"; sourceTree = ""; }; 4397D2F41D0DE2DF00BB2784 /* NSImage+Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage+Compatibility.h"; sourceTree = ""; }; @@ -605,7 +604,6 @@ isa = PBXGroup; children = ( 4A2CAE021AB4BB5400B6BC39 /* Info.plist */, - 32FDE8A4208887A6008D7530 /* SDWebImage.modulemap */, ); name = "Supporting Files"; sourceTree = ""; diff --git a/WebImage/SDWebImage.modulemap b/WebImage/SDWebImage.modulemap deleted file mode 100644 index 8b01eaa0..00000000 --- a/WebImage/SDWebImage.modulemap +++ /dev/null @@ -1,19 +0,0 @@ -framework module SDWebImage { - umbrella header "SDWebImage.h" - - // until CocoaPods fix the bug when using modular headers in #8879 - // we have to exclude Private Headers manually even we use Podspec `private_header_files` syntax - exclude header "SDWeakProxy.h" - exclude header "SDInternalMacros.h" - exclude header "SDmetamacros.h" - exclude header "NSBezierPath+RoundedCorners.h" - exclude header "UIColor+HexString.h" - exclude header "SDAsyncBlockOperation.h" - exclude header "SDImageAPNGCoderInternal.h" - exclude header "SDImageGIFCoderInternal.h" - exclude header "SDImageCachesManagerOperation.h" - exclude header "SDImageAssetManager.h" - - export * - module * { export * } -}