Skip to content

Commit 2224a49

Browse files
morganchen12morganchen12
committed
use SDWebImage 4.0 and CocoaPods 1.2.0
1 parent b1226e5 commit 2224a49

File tree

4 files changed

+46
-28
lines changed

4 files changed

+46
-28
lines changed

‎FirebaseStorageUI/UIImageView+FirebaseStorage.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ - (FIRStorageDownloadTask *)sd_setImageWithStorageReference:(FIRStorageReference
120120
self.image = image;
121121

122122
// Cache downloaded image
123-
[cache storeImage:image forKey:storageRef.fullPath];
123+
[cache storeImage:image forKey:storageRef.fullPath completion:nil];
124124

125125
if (completion != nil) {
126126
completion(image, nil, SDImageCacheTypeNone, storageRef);

‎FirebaseStorageUITests/FUIImageViewCategoryTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ - (void)testItDoesNotCreateADownloadIfImageIsCached {
6363
.andReturn(OCMClassMock([FIRStorageDownloadTask class]));
6464
UIImage *image = [[UIImage alloc] init];
6565
self.cache = [[SDImageCache alloc] initWithNamespace:@"FirebaseStorageUITests"];
66-
[self.cache storeImage:image forKey:self.ref.fullPath];
66+
[self.cache storeImage:image forKey:self.ref.fullPath completion:nil];
6767
FIRStorageDownloadTask *download = [self.imageView sd_setImageWithStorageReference:self.ref
6868
maxImageSize:4096
6969
placeholderImage:nil
7070
cache:self.cache
7171
completion:nil];
7272
XCTAssertNil(download, @"expected image view to not create new download when fetching cached image");
7373
XCTAssertEqual(self.imageView.image, image, @"expected image view to use cached image");
74-
[self.cache cleanDisk];
74+
[self.cache clearDiskOnCompletion:nil];
7575
[self.cache clearMemory];
7676
}
7777

‎FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2436,7 +2436,7 @@
24362436
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
24372437
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(BUILT_PRODUCTS_DIR)/SDWebImage";
24382438
LIBRARY_SEARCH_PATHS = "";
2439-
OTHER_LDFLAGS = "-ObjC";
2439+
OTHER_LDFLAGS = "$(inherited)";
24402440
PRODUCT_BUNDLE_IDENTIFIER = com.firebaseui.FirebaseStorageUITests;
24412441
PRODUCT_NAME = "$(TARGET_NAME)";
24422442
};
@@ -2460,7 +2460,7 @@
24602460
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
24612461
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(BUILT_PRODUCTS_DIR)";
24622462
LIBRARY_SEARCH_PATHS = "";
2463-
OTHER_LDFLAGS = "-ObjC";
2463+
OTHER_LDFLAGS = "$(inherited)";
24642464
PRODUCT_BUNDLE_IDENTIFIER = com.firebaseui.FirebaseStorageUITests;
24652465
PRODUCT_NAME = "$(TARGET_NAME)";
24662466
};
@@ -2631,7 +2631,7 @@
26312631
INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
26322632
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
26332633
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2634-
OTHER_LDFLAGS = "-ObjC";
2634+
OTHER_LDFLAGS = "$(inherited)";
26352635
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests;
26362636
PRODUCT_NAME = "$(TARGET_NAME)";
26372637
};
@@ -2652,7 +2652,7 @@
26522652
INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
26532653
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
26542654
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2655-
OTHER_LDFLAGS = "-ObjC";
2655+
OTHER_LDFLAGS = "$(inherited)";
26562656
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests;
26572657
PRODUCT_NAME = "$(TARGET_NAME)";
26582658
};
@@ -2719,7 +2719,7 @@
27192719
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
27202720
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
27212721
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\"";
2722-
OTHER_LDFLAGS = "-ObjC";
2722+
OTHER_LDFLAGS = "$(inherited)";
27232723
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests;
27242724
PRODUCT_NAME = "$(TARGET_NAME)";
27252725
};
@@ -2740,7 +2740,7 @@
27402740
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
27412741
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
27422742
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\"";
2743-
OTHER_LDFLAGS = "-ObjC";
2743+
OTHER_LDFLAGS = "$(inherited)";
27442744
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests;
27452745
PRODUCT_NAME = "$(TARGET_NAME)";
27462746
};
@@ -2818,7 +2818,7 @@
28182818
INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
28192819
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
28202820
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";
2821-
OTHER_LDFLAGS = "-ObjC";
2821+
OTHER_LDFLAGS = "$(inherited)";
28222822
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFacebookAuthUITests;
28232823
PRODUCT_NAME = "$(TARGET_NAME)";
28242824
};
@@ -2838,7 +2838,7 @@
28382838
INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
28392839
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
28402840
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";
2841-
OTHER_LDFLAGS = "-ObjC";
2841+
OTHER_LDFLAGS = "$(inherited)";
28422842
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFacebookAuthUITests;
28432843
PRODUCT_NAME = "$(TARGET_NAME)";
28442844
};
@@ -2926,7 +2926,7 @@
29262926
"\"$PODS_CONFIGURATION_BUILD_DIR/OCMock/OCMock.framework/Headers\"",
29272927
);
29282928
OTHER_LDFLAGS = (
2929-
"-ObjC",
2929+
"$(inherited)",
29302930
"-framework",
29312931
"\"GTMOAuth2\"",
29322932
"-framework",
@@ -2955,7 +2955,7 @@
29552955
"\"$PODS_CONFIGURATION_BUILD_DIR/OCMock/OCMock.framework/Headers\"",
29562956
);
29572957
OTHER_LDFLAGS = (
2958-
"-ObjC",
2958+
"$(inherited)",
29592959
"-framework",
29602960
"\"GTMOAuth2\"",
29612961
"-framework",
@@ -3111,11 +3111,12 @@
31113111
"$(inherited)",
31123112
"\"${PODS_ROOT}/TwitterKit/iOS\"",
31133113
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3114+
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
31143115
);
31153116
INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
31163117
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
31173118
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";
3118-
OTHER_LDFLAGS = "-ObjC";
3119+
OTHER_LDFLAGS = "$(inherited)";
31193120
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUITests;
31203121
PRODUCT_NAME = "$(TARGET_NAME)";
31213122
};
@@ -3128,11 +3129,12 @@
31283129
"$(inherited)",
31293130
"\"${PODS_ROOT}/TwitterKit/iOS\"",
31303131
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3132+
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
31313133
);
31323134
INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
31333135
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
31343136
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";
3135-
OTHER_LDFLAGS = "-ObjC";
3137+
OTHER_LDFLAGS = "$(inherited)";
31363138
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUITests;
31373139
PRODUCT_NAME = "$(TARGET_NAME)";
31383140
};
@@ -3219,9 +3221,19 @@
32193221
"$(inherited)",
32203222
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
32213223
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3222-
"$(PROJECT_DIR)/Pods/FirebaseCore/Frameworks",
3223-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework",
3224-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework",
3224+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
3225+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework\"",
3226+
"\"$(PODS_ROOT)/FirebaseDatabase/Frameworks\"",
3227+
"\"$(PODS_ROOT)/Fabric/iOS\"",
3228+
"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks/frameworks\"",
3229+
"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks/frameworks\"",
3230+
"\"$(PODS_ROOT)/FirebaseStorage/Frameworks/frameworks\"",
3231+
"\"$(PODS_ROOT)/GoogleAppUtilities/Frameworks/frameworks\"",
3232+
"\"$(PODS_ROOT)/GoogleInterchangeUtilities/Frameworks/frameworks\"",
3233+
"\"$(PODS_ROOT)/GoogleSignIn/Frameworks\"",
3234+
"\"$(PODS_ROOT)/GoogleSymbolUtilities/Frameworks/frameworks\"",
3235+
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
3236+
"\"$(PODS_ROOT)/TwitterKit/iOS\"",
32253237
);
32263238
INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist;
32273239
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -3333,9 +3345,19 @@
33333345
"$(inherited)",
33343346
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
33353347
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3336-
"$(PROJECT_DIR)/Pods/FirebaseCore/Frameworks",
3337-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework",
3338-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework",
3348+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
3349+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework\"",
3350+
"\"$(PODS_ROOT)/FirebaseDatabase/Frameworks\"",
3351+
"\"$(PODS_ROOT)/Fabric/iOS\"",
3352+
"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks/frameworks\"",
3353+
"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks/frameworks\"",
3354+
"\"$(PODS_ROOT)/FirebaseStorage/Frameworks/frameworks\"",
3355+
"\"$(PODS_ROOT)/GoogleAppUtilities/Frameworks/frameworks\"",
3356+
"\"$(PODS_ROOT)/GoogleInterchangeUtilities/Frameworks/frameworks\"",
3357+
"\"$(PODS_ROOT)/GoogleSignIn/Frameworks\"",
3358+
"\"$(PODS_ROOT)/GoogleSymbolUtilities/Frameworks/frameworks\"",
3359+
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
3360+
"\"$(PODS_ROOT)/TwitterKit/iOS\"",
33393361
);
33403362
INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist;
33413363
IPHONEOS_DEPLOYMENT_TARGET = 10.0;

‎Podfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ target 'FirebaseStorageUI' do
1616
use_frameworks!
1717

1818
pod 'Firebase/Storage'
19-
pod 'SDWebImage'
19+
pod 'SDWebImage', '~> 4.0'
2020

2121
target 'FirebaseStorageUITests' do
2222
inherit! :search_paths
23-
pod 'SDWebImage'
23+
pod 'SDWebImage', '~> 4.0'
2424
pod 'OCMock'
2525
end
2626
end
@@ -38,7 +38,6 @@ end
3838

3939
target 'FirebaseFacebookAuthUI' do
4040
use_frameworks!
41-
inherit! :search_paths
4241
# Pods for Facebook Auth
4342
pod 'FBSDKLoginKit', '~> 4.0'
4443
pod 'FBSDKCoreKit', '~> 4.0'
@@ -53,7 +52,6 @@ end
5352

5453
target 'FirebaseGoogleAuthUI' do
5554
use_frameworks!
56-
inherit! :search_paths
5755
# Pods for Google Auth
5856
pod 'GoogleSignIn', '~> 4.0'
5957

@@ -65,7 +63,6 @@ end
6563

6664
target 'FirebaseTwitterAuthUI' do
6765
use_frameworks!
68-
inherit! :search_paths
6966
# Pods for Twitter Auth
7067
pod 'TwitterKit', '~> 2.4'
7168

@@ -77,7 +74,6 @@ end
7774

7875
target 'Database' do
7976
use_frameworks!
80-
8177
# Pods for Database
8278
pod 'Firebase/Database'
8379
end
@@ -86,7 +82,7 @@ target 'Storage' do
8682
use_frameworks!
8783

8884
pod 'Firebase/Storage'
89-
pod 'SDWebImage'
85+
pod 'SDWebImage', '~> 4.0'
9086
end
9187

9288
target 'Auth' do

0 commit comments

Comments
 (0)