Browse Source

Support the SwiftPM Objective-C user to use #improt <SDWebImage/SDWebImage.h>, by using the link to the public header files and construct the same folder layout

DreamPiggy 6 years ago
parent
commit
1708ec67c1
63 changed files with 73 additions and 5 deletions
  1. 7 0
      .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
  2. 1 1
      Package.swift
  3. 6 0
      README.md
  4. 1 2
      SDWebImage/MapKit/MKAnnotationView+WebCache.h
  5. 0 2
      SDWebImage/MapKit/MKAnnotationView+WebCache.m
  6. 1 0
      SDWebImage/include/SDWebImage/NSButton+WebCache.h
  7. 1 0
      SDWebImage/include/SDWebImage/NSData+ImageContentType.h
  8. 1 0
      SDWebImage/include/SDWebImage/NSImage+Compatibility.h
  9. 1 0
      SDWebImage/include/SDWebImage/SDAnimatedImage.h
  10. 1 0
      SDWebImage/include/SDWebImage/SDAnimatedImagePlayer.h
  11. 1 0
      SDWebImage/include/SDWebImage/SDAnimatedImageRep.h
  12. 1 0
      SDWebImage/include/SDWebImage/SDAnimatedImageView+WebCache.h
  13. 1 0
      SDWebImage/include/SDWebImage/SDAnimatedImageView.h
  14. 1 0
      SDWebImage/include/SDWebImage/SDDiskCache.h
  15. 1 0
      SDWebImage/include/SDWebImage/SDGraphicsImageRenderer.h
  16. 1 0
      SDWebImage/include/SDWebImage/SDImageAPNGCoder.h
  17. 1 0
      SDWebImage/include/SDWebImage/SDImageCache.h
  18. 1 0
      SDWebImage/include/SDWebImage/SDImageCacheConfig.h
  19. 1 0
      SDWebImage/include/SDWebImage/SDImageCacheDefine.h
  20. 1 0
      SDWebImage/include/SDWebImage/SDImageCachesManager.h
  21. 1 0
      SDWebImage/include/SDWebImage/SDImageCoder.h
  22. 1 0
      SDWebImage/include/SDWebImage/SDImageCoderHelper.h
  23. 1 0
      SDWebImage/include/SDWebImage/SDImageCodersManager.h
  24. 1 0
      SDWebImage/include/SDWebImage/SDImageFrame.h
  25. 1 0
      SDWebImage/include/SDWebImage/SDImageGIFCoder.h
  26. 1 0
      SDWebImage/include/SDWebImage/SDImageGraphics.h
  27. 1 0
      SDWebImage/include/SDWebImage/SDImageHEICCoder.h
  28. 1 0
      SDWebImage/include/SDWebImage/SDImageIOAnimatedCoder.h
  29. 1 0
      SDWebImage/include/SDWebImage/SDImageIOCoder.h
  30. 1 0
      SDWebImage/include/SDWebImage/SDImageLoader.h
  31. 1 0
      SDWebImage/include/SDWebImage/SDImageLoadersManager.h
  32. 1 0
      SDWebImage/include/SDWebImage/SDImageTransformer.h
  33. 1 0
      SDWebImage/include/SDWebImage/SDMemoryCache.h
  34. 1 0
      SDWebImage/include/SDWebImage/SDWebImage.h
  35. 1 0
      SDWebImage/include/SDWebImage/SDWebImageCacheKeyFilter.h
  36. 1 0
      SDWebImage/include/SDWebImage/SDWebImageCacheSerializer.h
  37. 1 0
      SDWebImage/include/SDWebImage/SDWebImageCompat.h
  38. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDefine.h
  39. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDownloader.h
  40. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDownloaderConfig.h
  41. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDownloaderDecryptor.h
  42. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDownloaderOperation.h
  43. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDownloaderRequestModifier.h
  44. 1 0
      SDWebImage/include/SDWebImage/SDWebImageDownloaderResponseModifier.h
  45. 1 0
      SDWebImage/include/SDWebImage/SDWebImageError.h
  46. 1 0
      SDWebImage/include/SDWebImage/SDWebImageIndicator.h
  47. 1 0
      SDWebImage/include/SDWebImage/SDWebImageManager.h
  48. 1 0
      SDWebImage/include/SDWebImage/SDWebImageOperation.h
  49. 1 0
      SDWebImage/include/SDWebImage/SDWebImageOptionsProcessor.h
  50. 1 0
      SDWebImage/include/SDWebImage/SDWebImagePrefetcher.h
  51. 1 0
      SDWebImage/include/SDWebImage/SDWebImageTransition.h
  52. 1 0
      SDWebImage/include/SDWebImage/UIButton+WebCache.h
  53. 1 0
      SDWebImage/include/SDWebImage/UIImage+ExtendedCacheData.h
  54. 1 0
      SDWebImage/include/SDWebImage/UIImage+ForceDecode.h
  55. 1 0
      SDWebImage/include/SDWebImage/UIImage+GIF.h
  56. 1 0
      SDWebImage/include/SDWebImage/UIImage+MemoryCacheCost.h
  57. 1 0
      SDWebImage/include/SDWebImage/UIImage+Metadata.h
  58. 1 0
      SDWebImage/include/SDWebImage/UIImage+MultiFormat.h
  59. 1 0
      SDWebImage/include/SDWebImage/UIImage+Transform.h
  60. 1 0
      SDWebImage/include/SDWebImage/UIImageView+HighlightedWebCache.h
  61. 1 0
      SDWebImage/include/SDWebImage/UIImageView+WebCache.h
  62. 1 0
      SDWebImage/include/SDWebImage/UIView+WebCache.h
  63. 1 0
      SDWebImage/include/SDWebImage/UIView+WebCacheOperation.h

+ 7 - 0
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

+ 1 - 1
Package.swift

@@ -32,8 +32,8 @@ let package = Package(
             dependencies: [],
             path: "SDWebImage",
             sources: ["Core", "Private"],
-            publicHeadersPath: "Core",
             cSettings: [
+                .headerSearchPath("Core"),
                 .headerSearchPath("Private")
             ]
         ),

+ 6 - 0
README.md

@@ -283,6 +283,12 @@ In the source files where you need to use the library, import the umbrella heade
 #import <SDWebImage/SDWebImage.h>
 ```
 
+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

+ 1 - 2
SDWebImage/MapKit/MKAnnotationView+WebCache.h

@@ -6,12 +6,11 @@
  * file that was distributed with this source code.
  */
 
-#import "SDWebImageCompat.h"
+#import <SDWebImage/SDWebImage.h>
 
 #if SD_UIKIT || SD_MAC
 
 #import <MapKit/MapKit.h>
-#import "SDWebImageManager.h"
 
 /**
  * Integrates SDWebImage async downloading and caching of remote images with MKAnnotationView.

+ 0 - 2
SDWebImage/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 {

+ 1 - 0
SDWebImage/include/SDWebImage/NSButton+WebCache.h

@@ -0,0 +1 @@
+../../Core/NSButton+WebCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/NSData+ImageContentType.h

@@ -0,0 +1 @@
+../../Core/NSData+ImageContentType.h

+ 1 - 0
SDWebImage/include/SDWebImage/NSImage+Compatibility.h

@@ -0,0 +1 @@
+../../Core/NSImage+Compatibility.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDAnimatedImage.h

@@ -0,0 +1 @@
+../../Core/SDAnimatedImage.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDAnimatedImagePlayer.h

@@ -0,0 +1 @@
+../../Core/SDAnimatedImagePlayer.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDAnimatedImageRep.h

@@ -0,0 +1 @@
+../../Core/SDAnimatedImageRep.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDAnimatedImageView+WebCache.h

@@ -0,0 +1 @@
+../../Core/SDAnimatedImageView+WebCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDAnimatedImageView.h

@@ -0,0 +1 @@
+../../Core/SDAnimatedImageView.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDDiskCache.h

@@ -0,0 +1 @@
+../../Core/SDDiskCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDGraphicsImageRenderer.h

@@ -0,0 +1 @@
+../../Core/SDGraphicsImageRenderer.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageAPNGCoder.h

@@ -0,0 +1 @@
+../../Core/SDImageAPNGCoder.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCache.h

@@ -0,0 +1 @@
+../../Core/SDImageCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCacheConfig.h

@@ -0,0 +1 @@
+../../Core/SDImageCacheConfig.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCacheDefine.h

@@ -0,0 +1 @@
+../../Core/SDImageCacheDefine.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCachesManager.h

@@ -0,0 +1 @@
+../../Core/SDImageCachesManager.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCoder.h

@@ -0,0 +1 @@
+../../Core/SDImageCoder.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCoderHelper.h

@@ -0,0 +1 @@
+../../Core/SDImageCoderHelper.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageCodersManager.h

@@ -0,0 +1 @@
+../../Core/SDImageCodersManager.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageFrame.h

@@ -0,0 +1 @@
+../../Core/SDImageFrame.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageGIFCoder.h

@@ -0,0 +1 @@
+../../Core/SDImageGIFCoder.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageGraphics.h

@@ -0,0 +1 @@
+../../Core/SDImageGraphics.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageHEICCoder.h

@@ -0,0 +1 @@
+../../Core/SDImageHEICCoder.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageIOAnimatedCoder.h

@@ -0,0 +1 @@
+../../Core/SDImageIOAnimatedCoder.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageIOCoder.h

@@ -0,0 +1 @@
+../../Core/SDImageIOCoder.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageLoader.h

@@ -0,0 +1 @@
+../../Core/SDImageLoader.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageLoadersManager.h

@@ -0,0 +1 @@
+../../Core/SDImageLoadersManager.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDImageTransformer.h

@@ -0,0 +1 @@
+../../Core/SDImageTransformer.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDMemoryCache.h

@@ -0,0 +1 @@
+../../Core/SDMemoryCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImage.h

@@ -0,0 +1 @@
+../../../WebImage/SDWebImage.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageCacheKeyFilter.h

@@ -0,0 +1 @@
+../../Core/SDWebImageCacheKeyFilter.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageCacheSerializer.h

@@ -0,0 +1 @@
+../../Core/SDWebImageCacheSerializer.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageCompat.h

@@ -0,0 +1 @@
+../../Core/SDWebImageCompat.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDefine.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDefine.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDownloader.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDownloader.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDownloaderConfig.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDownloaderConfig.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDownloaderDecryptor.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDownloaderDecryptor.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDownloaderOperation.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDownloaderOperation.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDownloaderRequestModifier.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDownloaderRequestModifier.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageDownloaderResponseModifier.h

@@ -0,0 +1 @@
+../../Core/SDWebImageDownloaderResponseModifier.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageError.h

@@ -0,0 +1 @@
+../../Core/SDWebImageError.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageIndicator.h

@@ -0,0 +1 @@
+../../Core/SDWebImageIndicator.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageManager.h

@@ -0,0 +1 @@
+../../Core/SDWebImageManager.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageOperation.h

@@ -0,0 +1 @@
+../../Core/SDWebImageOperation.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageOptionsProcessor.h

@@ -0,0 +1 @@
+../../Core/SDWebImageOptionsProcessor.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImagePrefetcher.h

@@ -0,0 +1 @@
+../../Core/SDWebImagePrefetcher.h

+ 1 - 0
SDWebImage/include/SDWebImage/SDWebImageTransition.h

@@ -0,0 +1 @@
+../../Core/SDWebImageTransition.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIButton+WebCache.h

@@ -0,0 +1 @@
+../../Core/UIButton+WebCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+ExtendedCacheData.h

@@ -0,0 +1 @@
+../../Core/UIImage+ExtendedCacheData.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+ForceDecode.h

@@ -0,0 +1 @@
+../../Core/UIImage+ForceDecode.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+GIF.h

@@ -0,0 +1 @@
+../../Core/UIImage+GIF.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+MemoryCacheCost.h

@@ -0,0 +1 @@
+../../Core/UIImage+MemoryCacheCost.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+Metadata.h

@@ -0,0 +1 @@
+../../Core/UIImage+Metadata.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+MultiFormat.h

@@ -0,0 +1 @@
+../../Core/UIImage+MultiFormat.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImage+Transform.h

@@ -0,0 +1 @@
+../../Core/UIImage+Transform.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImageView+HighlightedWebCache.h

@@ -0,0 +1 @@
+../../Core/UIImageView+HighlightedWebCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIImageView+WebCache.h

@@ -0,0 +1 @@
+../../Core/UIImageView+WebCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIView+WebCache.h

@@ -0,0 +1 @@
+../../Core/UIView+WebCache.h

+ 1 - 0
SDWebImage/include/SDWebImage/UIView+WebCacheOperation.h

@@ -0,0 +1 @@
+../../Core/UIView+WebCacheOperation.h