Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SDWebImage to 4.0 #597

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,466 changes: 699 additions & 1,767 deletions Example/MWPhotoBrowser.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Example/MWPhotoBrowser/MWPhotoBrowser-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>MWPhotoBrowser 需要访问相机</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>MWPhotoBrowser 需要访问相册</string>
<key>UILaunchStoryboardName</key>
<string>Main</string>
<key>UIMainStoryboardFile</key>
Expand Down
2 changes: 1 addition & 1 deletion Example/MWPhotoBrowser/Menu.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
self.title = @"MWPhotoBrowser";

// Clear cache for testing
[[SDImageCache sharedImageCache] clearDisk];
[[SDImageCache sharedImageCache] clearDiskOnCompletion:nil];
[[SDImageCache sharedImageCache] clearMemory];

_segmentedControl = [[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:@"Push", @"Modal", nil]];
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://github.com/CocoaPods/Specs.git'

target 'MWPhotoBrowser_Example', :exclusive => true do
target 'MWPhotoBrowser_Example' do
pod "MWPhotoBrowser", :path => "../"
end

target 'MWPhotoBrowser_Tests', :exclusive => true do
target 'MWPhotoBrowser_Tests' do
pod "MWPhotoBrowser", :path => "../"

pod 'Specta'
Expand Down
24 changes: 13 additions & 11 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ PODS:
- Expecta (~> 1.0)
- FBSnapshotTestCase (~> 1.8)
- FBSnapshotTestCase (1.8.1)
- MBProgressHUD (0.9.2)
- MBProgressHUD (1.0.0)
- MWPhotoBrowser (2.1.2):
- DACircularProgress (~> 2.3)
- MBProgressHUD (~> 0.9)
- SDWebImage (!= 3.7.2, ~> 3.7)
- SDWebImage (3.7.5):
- SDWebImage/Core (= 3.7.5)
- SDWebImage/Core (3.7.5)
- DACircularProgress (~> 2.3.1)
- MBProgressHUD (~> 1.0.0)
- SDWebImage (~> 4.0.0)
- SDWebImage (4.0.0):
- SDWebImage/Core (= 4.0.0)
- SDWebImage/Core (4.0.0)
- Specta (1.0.2)

DEPENDENCIES:
Expand All @@ -31,9 +31,11 @@ SPEC CHECKSUMS:
Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024
Expecta+Snapshots: ca15bfb57e7a0f78f86c7699c2c54ffacfa4ad2a
FBSnapshotTestCase: 3dc3899168747a0319c5278f5b3445c13a6532dd
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5
SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a
MWPhotoBrowser: 07ef0151444d6bbc6d49e8239f9cdef13580bcf7
SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41
Specta: 9cec98310dca411f7c7ffd6943552b501622abfe

COCOAPODS: 0.39.0
PODFILE CHECKSUM: f0528201d484bd48f65798bc253cd3bf45d69fcd

COCOAPODS: 1.0.1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Example/Pods/Expecta+Snapshots/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Example/Pods/Expecta/Expecta/EXPDoubleTuple.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Example/Pods/Expecta/Expecta/EXPExpect.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Example/Pods/Expecta/Expecta/EXPFloatTuple.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Example/Pods/Expecta/Expecta/EXPUnsupportedObject.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Expecta/Expecta/Expecta.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Expecta/Expecta/ExpectaObject.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Example/Pods/Expecta/Expecta/ExpectaSupport.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion Example/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Example/Pods/Expecta/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading