mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.x 

# Conflicts:
#	SDWebImage/SDWebImageManager.m
This commit is contained in:
Bogdan Poplauschi 2016-06-07 12:19:48 +03:00
parent 3364a981d5 c012fc9bb2
commit bb0b84342f
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,3 +1,10 @@
## [3.8.1 Patch release for 3.8.0 on Jun 7th, 2016](https://github.com/rs/SDWebImage/releases/tag/3.8.1)
#### Fixes:
- SDWebImage 3.8.0 get wrong image #1589 - the issue was caused by the changes in 3.8.0 (Removed the URL query params from the filename (key) fb0cdb6d 1bf62d4 #1584 - fixes #1433 #1553 #1583 #1585) - Reverted.
- Note: The solution for those issues (i.e. #1433 #1553) is to set the `SDWebImageManager` `cacheKeyFilter` block and do their own calculations there.
## [3.8.0 Minor release - Replaces NSURLConnection (deprecated) with NSURLSession - on Jun 6th, 2016](https://github.com/rs/SDWebImage/releases/tag/3.8.0) ## [3.8.0 Minor release - Replaces NSURLConnection (deprecated) with NSURLSession - on Jun 6th, 2016](https://github.com/rs/SDWebImage/releases/tag/3.8.0)
#### Infrastructure: #### Infrastructure:
@ -11,7 +18,7 @@
#### Fixes: #### Fixes:
- Removed the URL query params from the filename (key) fb0cdb6d 1bf62d4 #1584 - fixes #1433 #1533 #1583 #1585 - Removed the URL query params from the filename (key) fb0cdb6d 1bf62d4 #1584 - fixes #1433 #1553 #1583 #1585
- Fixed the WebP build with the official 1.0.0 CocoaPods release f1a471e - fixes #1444 - Fixed the WebP build with the official 1.0.0 CocoaPods release f1a471e - fixes #1444
- Updated doc: `removeImageForKey:` not synchronous e6e5c51 - fixes #1379 #1415 - Updated doc: `removeImageForKey:` not synchronous e6e5c51 - fixes #1379 #1415

2
SDWebImage.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'SDWebImage' s.name = 'SDWebImage'
s.version = '3.8.0' s.version = '3.8.1'
s.ios.deployment_target = '7.0' s.ios.deployment_target = '7.0'
s.tvos.deployment_target = '9.0' s.tvos.deployment_target = '9.0'
s.license = 'MIT' s.license = 'MIT'

6
SDWebImage/SDWebImageManager.m
View File

@ -60,15 +60,9 @@
if (self.cacheKeyFilter) { if (self.cacheKeyFilter) {
return self.cacheKeyFilter(url); return self.cacheKeyFilter(url);
} else {
if (NSClassFromString(@"NSURLComponents") && [NSURLComponents instancesRespondToSelector:@selector(string)]) {
NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithURL:url resolvingAgainstBaseURL:NO];
urlComponents.query = nil; // Strip out query parameters.
return urlComponents.URL.absoluteString;
} else { } else {
return url.absoluteString; return url.absoluteString;
} }
}
} }
- (BOOL)cachedImageExistsForURL:(NSURL *)url { - (BOOL)cachedImageExistsForURL:(NSURL *)url {

2
WebImage/Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.8.0</string> <string>3.8.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>