Commit Graph

21 Commits

Author SHA1 Message Date
Bogdan Poplauschi 3364a981d5 Merge branch 'master' into 4.x
+ SDWebImageDownloader downloadImageWithURL:... properly use the weakself-strongself pattern

# Conflicts:
#	.travis.yml
#	Examples/SDWebImage Demo.xcodeproj/project.pbxproj
#	README.md
#	SDWebImage.xcodeproj/project.pbxproj
#	SDWebImage/SDWebImageDownloader.m
#	SDWebImage/SDWebImageDownloaderOperation.h
#	SDWebImage/SDWebImageDownloaderOperation.m
#	SDWebImage/SDWebImageManager.m
#	Tests/Podfile
#	Tests/SDWebImage Tests.xcodeproj/project.pbxproj
2016-06-07 08:36:45 +03:00
Bogdan Poplauschi 512c536fcf The pod setup output is huge with CocoaPods 1.0.0 (10.000+ lines), causes Travis to "This log is too long to be displayed. Please reduce the verbosity of your build or download the raw log." 2016-05-29 13:08:15 +03:00
Bogdan Poplauschi f8a7b6bac7 The pod setup output is huge with CocoaPods 1.0.0 (10.000+ lines), causes Travis to "This log is too long to be displayed. Please reduce the verbosity of your build or download the raw log." 2016-05-29 12:48:26 +03:00
Bogdan Poplauschi d625be8d98 Need to clean the SDWebImage scheme to allow the tests to rebuild it using their required platform. 2016-05-29 00:53:49 +03:00
Bogdan Poplauschi 8e300c92a4 Need to clean the SDWebImage scheme to allow the tests to rebuild it using their required platform. 2016-05-29 00:50:24 +03:00
Bogdan Poplauschi 44eac986bb Another attempt at the build 2016-05-29 00:44:02 +03:00
Bogdan Poplauschi afaf306222 This should fix the build (the tests project) 2016-05-29 00:00:33 +03:00
Bogdan Poplauschi 718cbcad3e The tests target should also use xcpretty 2016-05-08 23:41:31 +03:00
Bogdan Poplauschi 3902ed7dec Fixed the build (the test target cannot do clean) 2016-05-08 23:29:29 +03:00
Bogdan Poplauschi 56c1ba63ad Cleanup for the Travis CI config file 2016-05-08 23:04:40 +03:00
hoseking 11c7efb6e1 Add CocoaPods support for tvOS 2015-10-30 10:50:33 -07:00
Bogdan Poplauschi d41bfaf8c8 Fix: xcodebuild: error: -destination implies architecture, -arch must not also be specified. 2015-03-17 16:53:00 +02:00
Bogdan Poplauschi 6c29c8b009 Another try to fix the travis builds 2015-03-17 16:36:50 +02:00
Bogdan Poplauschi b3ad18ea56 Updated travis.yml 2015-03-17 16:14:33 +02:00
Bogdan Poplauschi 36f5b1e4e9 The latest libwebp library has some warnings that cause our pod spec lint to fail 2015-03-17 15:43:11 +02:00
Bogdan Poplauschi 0aa9b61bcc Everything worked except the tests, trying using xcodebuild instead of xctool 2014-11-04 13:52:11 +02:00
Bogdan Poplauschi 542fc29808 Another try with Travis CI, this time no clean action, as it fails with
xcodebuild build clean
Scheme Tests is not currently configured for the clean action.
2014-11-04 13:44:45 +02:00
Bogdan Poplauschi 0b50b57c13 Reverted last change, doesn't work with Travis CI 2014-11-04 12:28:49 +02:00
Bogdan Poplauschi 55f4beade5 Updated Travis CI config, making sure xctool is installed 2014-11-04 12:22:59 +02:00
Bogdan Poplauschi ef9a2798a7 Updated Travis CI script, replaced xcpretty with xctool 2014-11-04 12:16:25 +02:00
Bogdan Poplauschi 936f47c005 Added Travis CI configuration file 2014-11-02 22:53:45 +02:00