From 7dbf15bb0d18d604122dc0773d4b94d48b1aab51 Mon Sep 17 00:00:00 2001 From: skyline75489 Date: Tue, 11 Oct 2016 20:53:16 +0800 Subject: [PATCH 1/2] Fix FLAnimatedImage import when using CocoaPods --- SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h b/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h index d5f08c34..e109b5a9 100644 --- a/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h +++ b/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h @@ -10,7 +10,7 @@ #if SD_UIKIT -#if COCOAPODS +#if !COCOAPODS @import FLAnimatedImage; #else #import "FLAnimatedImageView.h" From 8c3c06c342cee23be7b16a1851bd4abf70931532 Mon Sep 17 00:00:00 2001 From: Chester Liu Date: Thu, 13 Oct 2016 21:25:47 +0800 Subject: [PATCH 2/2] Utilize __has_include to fix framework import --- SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h b/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h index e109b5a9..f77c0edd 100644 --- a/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h +++ b/SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h @@ -10,8 +10,8 @@ #if SD_UIKIT -#if !COCOAPODS -@import FLAnimatedImage; +#if __has_include() +#import #else #import "FLAnimatedImageView.h" #endif