use SDWebImage 4.0 and CocoaPods 1.2.0

firebase · Feb 1, 2017 · 2224a49 · 2224a49
1 parent b1226e5
commit 2224a49
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 28 deletions.
diff --git a/FirebaseStorageUI/UIImageView+FirebaseStorage.m b/FirebaseStorageUI/UIImageView+FirebaseStorage.m
@@ -120,7 +120,7 @@ - (FIRStorageDownloadTask *)sd_setImageWithStorageReference:(FIRStorageReference
         self.image = image;
 
         // Cache downloaded image
-        [cache storeImage:image forKey:storageRef.fullPath];
+        [cache storeImage:image forKey:storageRef.fullPath completion:nil];
 
         if (completion != nil) {
           completion(image, nil, SDImageCacheTypeNone, storageRef);

diff --git a/FirebaseStorageUITests/FUIImageViewCategoryTests.m b/FirebaseStorageUITests/FUIImageViewCategoryTests.m
@@ -63,15 +63,15 @@ - (void)testItDoesNotCreateADownloadIfImageIsCached {
     .andReturn(OCMClassMock([FIRStorageDownloadTask class]));
   UIImage *image = [[UIImage alloc] init];
   self.cache = [[SDImageCache alloc] initWithNamespace:@"FirebaseStorageUITests"];
-  [self.cache storeImage:image forKey:self.ref.fullPath];
+  [self.cache storeImage:image forKey:self.ref.fullPath completion:nil];
   FIRStorageDownloadTask *download = [self.imageView sd_setImageWithStorageReference:self.ref
                                                                         maxImageSize:4096
                                                                     placeholderImage:nil
                                                                                cache:self.cache
                                                                           completion:nil];
   XCTAssertNil(download, @"expected image view to not create new download when fetching cached image");
   XCTAssertEqual(self.imageView.image, image, @"expected image view to use cached image");
-  [self.cache cleanDisk];
+  [self.cache clearDiskOnCompletion:nil];
   [self.cache clearMemory];
 }
 

diff --git a/FirebaseUI.xcodeproj/project.pbxproj b/FirebaseUI.xcodeproj/project.pbxproj
@@ -2436,7 +2436,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(BUILT_PRODUCTS_DIR)/SDWebImage";
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebaseui.FirebaseStorageUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2460,7 +2460,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(BUILT_PRODUCTS_DIR)";
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebaseui.FirebaseStorageUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2631,7 +2631,7 @@
 				INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2652,7 +2652,7 @@
 				INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2719,7 +2719,7 @@
 				INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks  ${BUILT_PRODUCTS_DIR}/GTMOAuth2-framework ${BUILT_PRODUCTS_DIR}/GTMSessionFetcher.default-Core-framework ${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f490f524\"";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2740,7 +2740,7 @@
 				INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks  ${BUILT_PRODUCTS_DIR}/GTMOAuth2-framework ${BUILT_PRODUCTS_DIR}/GTMSessionFetcher.default-Core-framework ${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f490f524\"";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2818,7 +2818,7 @@
 				INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks ${BUILT_PRODUCTS_DIR}/Bolts ${BUILT_PRODUCTS_DIR}/FBSDKCoreKit ${BUILT_PRODUCTS_DIR}/FBSDKLoginKit ${BUILT_PRODUCTS_DIR}/GTMOAuth2-framework ${BUILT_PRODUCTS_DIR}/GTMSessionFetcher.default-Core-framework ${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f490f524";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFacebookAuthUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2838,7 +2838,7 @@
 				INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks ${BUILT_PRODUCTS_DIR}/Bolts ${BUILT_PRODUCTS_DIR}/FBSDKCoreKit ${BUILT_PRODUCTS_DIR}/FBSDKLoginKit ${BUILT_PRODUCTS_DIR}/GTMOAuth2-framework ${BUILT_PRODUCTS_DIR}/GTMSessionFetcher.default-Core-framework ${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f490f524";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFacebookAuthUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2926,7 +2926,7 @@
 					"\"$PODS_CONFIGURATION_BUILD_DIR/OCMock/OCMock.framework/Headers\"",
 				);
 				OTHER_LDFLAGS = (
-					"-ObjC",
+					"$(inherited)",
 					"-framework",
 					"\"GTMOAuth2\"",
 					"-framework",
@@ -2955,7 +2955,7 @@
 					"\"$PODS_CONFIGURATION_BUILD_DIR/OCMock/OCMock.framework/Headers\"",
 				);
 				OTHER_LDFLAGS = (
-					"-ObjC",
+					"$(inherited)",
 					"-framework",
 					"\"GTMOAuth2\"",
 					"-framework",
@@ -3111,11 +3111,12 @@
 					"$(inherited)",
 					"\"${PODS_ROOT}/TwitterKit/iOS\"",
 					"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/TwitterCore/iOS\"",
 				);
 				INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks ${BUILT_PRODUCTS_DIR}/GTMOAuth2-framework ${BUILT_PRODUCTS_DIR}/GTMSessionFetcher.default-Core-framework ${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f490f524";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -3128,11 +3129,12 @@
 					"$(inherited)",
 					"\"${PODS_ROOT}/TwitterKit/iOS\"",
 					"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/TwitterCore/iOS\"",
 				);
 				INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks ${BUILT_PRODUCTS_DIR}/GTMOAuth2-framework ${BUILT_PRODUCTS_DIR}/GTMSessionFetcher.default-Core-framework ${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f490f524";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -3219,9 +3221,19 @@
 					"$(inherited)",
 					"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
 					"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
-					"$(PROJECT_DIR)/Pods/FirebaseCore/Frameworks",
-					"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework",
-					"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework",
+					"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
+					"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework\"",
+					"\"$(PODS_ROOT)/FirebaseDatabase/Frameworks\"",
+					"\"$(PODS_ROOT)/Fabric/iOS\"",
+					"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/FirebaseStorage/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/GoogleAppUtilities/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/GoogleInterchangeUtilities/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/GoogleSignIn/Frameworks\"",
+					"\"$(PODS_ROOT)/GoogleSymbolUtilities/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/TwitterCore/iOS\"",
+					"\"$(PODS_ROOT)/TwitterKit/iOS\"",
 				);
 				INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -3333,9 +3345,19 @@
 					"$(inherited)",
 					"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
 					"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
-					"$(PROJECT_DIR)/Pods/FirebaseCore/Frameworks",
-					"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework",
-					"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework",
+					"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
+					"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework\"",
+					"\"$(PODS_ROOT)/FirebaseDatabase/Frameworks\"",
+					"\"$(PODS_ROOT)/Fabric/iOS\"",
+					"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/FirebaseStorage/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/GoogleAppUtilities/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/GoogleInterchangeUtilities/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/GoogleSignIn/Frameworks\"",
+					"\"$(PODS_ROOT)/GoogleSymbolUtilities/Frameworks/frameworks\"",
+					"\"$(PODS_ROOT)/TwitterCore/iOS\"",
+					"\"$(PODS_ROOT)/TwitterKit/iOS\"",
 				);
 				INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

diff --git a/Podfile b/Podfile
@@ -16,11 +16,11 @@ target 'FirebaseStorageUI' do
   use_frameworks!
 
   pod 'Firebase/Storage'
-  pod 'SDWebImage'
+  pod 'SDWebImage', '~> 4.0'
 
   target 'FirebaseStorageUITests' do
     inherit! :search_paths
-    pod 'SDWebImage'
+    pod 'SDWebImage', '~> 4.0'
     pod 'OCMock'
   end
 end
@@ -38,7 +38,6 @@ end
 
 target 'FirebaseFacebookAuthUI' do
   use_frameworks!
-  inherit! :search_paths
   # Pods for Facebook Auth
   pod 'FBSDKLoginKit', '~> 4.0'
   pod 'FBSDKCoreKit', '~> 4.0'
@@ -53,7 +52,6 @@ end
 
 target 'FirebaseGoogleAuthUI' do
   use_frameworks!
-  inherit! :search_paths
   # Pods for Google Auth
   pod 'GoogleSignIn', '~> 4.0'
 
@@ -65,7 +63,6 @@ end
 
 target 'FirebaseTwitterAuthUI' do
   use_frameworks!
-  inherit! :search_paths
   # Pods for Twitter Auth
   pod 'TwitterKit', '~> 2.4'
 
@@ -77,7 +74,6 @@ end
 
 target 'Database' do
   use_frameworks!
-
   # Pods for Database
   pod 'Firebase/Database'
 end
@@ -86,7 +82,7 @@ target 'Storage' do
   use_frameworks!
 
   pod 'Firebase/Storage'
-  pod 'SDWebImage'
+  pod 'SDWebImage', '~> 4.0'
 end
 
 target 'Auth' do