Add Carthage support (with some limit)

dreampiggy · dreampiggy · commit 0c2356d01dd6 · 2018-09-03T12:18:59.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -23,8 +23,7 @@ DerivedData
 .bundle
 
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+Carthage/Checkouts
 Carthage/Build
 
 # We recommend against adding the Pods directory to your .gitignore. However
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,3 @@
+github "rs/SDWebImage" >= 5.0.0-beta3
 github "ibireme/YYCache" ~> 1.0
-github "ibireme/YYImage" ~> 1.0
+github "ibireme/YYImage" ~> 1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,3 @@
+github "ibireme/YYCache" "1.0.4"
+github "ibireme/YYImage" "1.0.4"
+github "rs/SDWebImage" "5.0.0-beta3"
diff --git a/SDWebImageYYPlugin.xcodeproj/project.pbxproj b/SDWebImageYYPlugin.xcodeproj/project.pbxproj
diff --git a/SDWebImageYYPlugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SDWebImageYYPlugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYDiskCache+SDAddtions.h b/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYDiskCache+SDAddtions.h
@@ -6,7 +6,7 @@
  */
 
 #import <YYCache/YYDiskCache.h>
-#import <SDWebImage/SDDiskCache.h>
+#import <SDWebImage/SDWebImage.h>
 
 @interface YYDiskCache (SDAddtions) <SDDiskCache>
 
diff --git a/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYDiskCache+SDAddtions.m b/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYDiskCache+SDAddtions.m
@@ -6,7 +6,6 @@
  */
 
 #import "YYDiskCache+SDAddtions.h"
-#import <SDWebImage/SDImageCacheConfig.h>
 #import <objc/runtime.h>
 
 @interface YYDiskCache ()
diff --git a/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYMemoryCache+SDAddtions.h b/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYMemoryCache+SDAddtions.h
@@ -6,7 +6,7 @@
  */
 
 #import <YYCache/YYMemoryCache.h>
-#import <SDWebImage/SDMemoryCache.h>
+#import <SDWebImage/SDWebImage.h>
 
 @interface YYMemoryCache (SDAddtions) <SDMemoryCache>
 
diff --git a/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYMemoryCache+SDAddtions.m b/SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYMemoryCache+SDAddtions.m
@@ -6,7 +6,6 @@
  */
 
 #import "YYMemoryCache+SDAddtions.h"
-#import <SDWebImage/SDImageCacheConfig.h>
 #import <objc/runtime.h>
 
 @interface YYMemoryCache ()
diff --git a/SDWebImageYYPlugin/Classes/YYImage/SDWebImageBridge/SDAnimatedImage+YYAddtions.h b/SDWebImageYYPlugin/Classes/YYImage/SDWebImageBridge/SDAnimatedImage+YYAddtions.h
@@ -5,7 +5,7 @@
  * file that was distributed with this source code.
  */
 
-#import <SDWebImage/SDAnimatedImage.h>
+#import <SDWebImage/SDWebImage.h>
 #import <YYImage/YYAnimatedImageView.h>
 
 @interface SDAnimatedImage (YYAddtions) <YYAnimatedImage>
diff --git a/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/SDImageYYCoder.h b/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/SDImageYYCoder.h
@@ -6,7 +6,7 @@
  */
 
 #import <YYImage/YYImage.h>
-#import <SDWebImage/SDImageCoder.h>
+#import <SDWebImage/SDWebImage.h>
 
 /**
  YYImageEncoder && YYImageDecoder bridge to supports SDWebImage coder protocol. This class use YYImage's decoding && encoding system. It supports any image format listed in `YYImageType`.
diff --git a/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYAnimatedImageView+WebCache.h b/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYAnimatedImageView+WebCache.h
@@ -6,7 +6,7 @@
  */
 
 #import <YYImage/YYAnimatedImageView.h>
-#import <SDWebImage/SDWebImageManager.h>
+#import <SDWebImage/SDWebImage.h>
 
 @interface YYAnimatedImageView (WebCache)
 
diff --git a/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYAnimatedImageView+WebCache.m b/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYAnimatedImageView+WebCache.m
@@ -6,7 +6,6 @@
  */
 
 #import "YYAnimatedImageView+WebCache.h"
-#import "UIView+WebCache.h"
 #import "YYImage+SDAddtions.h"
 
 @implementation YYAnimatedImageView (WebCache)
diff --git a/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYImage+SDAddtions.h b/SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYImage+SDAddtions.h
@@ -6,7 +6,7 @@
  */
 
 #import <YYImage/YYImage.h>
-#import <SDWebImage/SDAnimatedImage.h>
+#import <SDWebImage/SDWebImage.h>
 
 @interface YYImage (SDAddtions) <SDAnimatedImage>
 
diff --git a/SDWebImageYYPlugin/Module/Info.plist b/SDWebImageYYPlugin/Module/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/_Pods.xcodeproj b/_Pods.xcodeproj

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+github "ibireme/YYCache" "1.0.4"`
	`2`	`+github "ibireme/YYImage" "1.0.4"`
	`3`	`+github "rs/SDWebImage" "5.0.0-beta3"`