From 77f602f94e7cd815c5c161b82e2227a5288967cc Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Sat, 2 Feb 2019 11:38:05 +0800 Subject: [PATCH] Fix the umbrella headers and modulemap for CocoaPods --- Example/SDWebImageWebPCoderExample/ViewController.m | 2 +- SDWebImageWebPCoder.podspec | 3 ++- SDWebImageWebPCoder.xcodeproj/project.pbxproj | 2 ++ SDWebImageWebPCoder/Module/SDWebImageWebPCoder.modulemap | 6 ++++++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 SDWebImageWebPCoder/Module/SDWebImageWebPCoder.modulemap diff --git a/Example/SDWebImageWebPCoderExample/ViewController.m b/Example/SDWebImageWebPCoderExample/ViewController.m index f2dbccb..e358dd0 100644 --- a/Example/SDWebImageWebPCoderExample/ViewController.m +++ b/Example/SDWebImageWebPCoderExample/ViewController.m @@ -7,7 +7,7 @@ */ #import "ViewController.h" -#import +#import #import @interface ViewController () diff --git a/SDWebImageWebPCoder.podspec b/SDWebImageWebPCoder.podspec index c354a74..057d544 100644 --- a/SDWebImageWebPCoder.podspec +++ b/SDWebImageWebPCoder.podspec @@ -16,8 +16,9 @@ This is a simple SDWebImage coder plugin to support WebP image. s.osx.deployment_target = '10.10' s.tvos.deployment_target = '9.0' s.watchos.deployment_target = '2.0' + s.module_map = 'SDWebImageWebPCoder/Module/SDWebImageWebPCoder.modulemap' - s.source_files = 'SDWebImageWebPCoder/Classes/**/*' + s.source_files = 'SDWebImageWebPCoder/Classes/**/*', 'SDWebImageWebPCoder/Module/SDWebImageWebPCoder.h' s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) SD_WEBP=1', 'USER_HEADER_SEARCH_PATHS' => '$(inherited) $(SRCROOT)/libwebp/src' diff --git a/SDWebImageWebPCoder.xcodeproj/project.pbxproj b/SDWebImageWebPCoder.xcodeproj/project.pbxproj index 125c01d..7153750 100644 --- a/SDWebImageWebPCoder.xcodeproj/project.pbxproj +++ b/SDWebImageWebPCoder.xcodeproj/project.pbxproj @@ -43,6 +43,7 @@ /* Begin PBXFileReference section */ 28D8AA3D3015E075692FD3E3 /* Pods-SDWebImageWebPCoderTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderTests.debug.xcconfig"; path = "SDWebImageWebPCoderTests/Pods/Target Support Files/Pods-SDWebImageWebPCoderTests/Pods-SDWebImageWebPCoderTests.debug.xcconfig"; sourceTree = ""; }; + 3217BE7B220547EB003D0310 /* SDWebImageWebPCoder.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = SDWebImageWebPCoder.modulemap; sourceTree = ""; }; 46F21AD7D1692EBAC4D0FF33 /* Pods_SDWebImageWebPCoderTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDWebImageWebPCoderTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 806E779D2136A1C000A316D2 /* SDWebImageWebPCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageWebPCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 806E77AA2136A2E900A316D2 /* UIImage+WebP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+WebP.m"; sourceTree = ""; }; @@ -176,6 +177,7 @@ isa = PBXGroup; children = ( 806E77B02136A2E900A316D2 /* Info.plist */, + 3217BE7B220547EB003D0310 /* SDWebImageWebPCoder.modulemap */, 806E77C62136A7AD00A316D2 /* SDWebImageWebPCoder.h */, ); path = Module; diff --git a/SDWebImageWebPCoder/Module/SDWebImageWebPCoder.modulemap b/SDWebImageWebPCoder/Module/SDWebImageWebPCoder.modulemap new file mode 100644 index 0000000..13d57d4 --- /dev/null +++ b/SDWebImageWebPCoder/Module/SDWebImageWebPCoder.modulemap @@ -0,0 +1,6 @@ +framework module SDWebImageWebPCoder { + umbrella header "SDWebImageWebPCoder.h" + + export * + module * { export * } +}