From 218e653a1178508c8b40acf77c9086e5ddf3d272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 6 Jan 2016 00:52:18 +0100 Subject: [PATCH 01/14] Point badges to the develop branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea1fddfec..48c69a0b1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## About -[![Build Status](https://img.shields.io/travis/0xced/XCDYouTubeKit/master.svg?style=flat)](https://travis-ci.org/0xced/XCDYouTubeKit) -[![Coverage Status](https://img.shields.io/coveralls/0xced/XCDYouTubeKit/master.svg?style=flat)](https://coveralls.io/r/0xced/XCDYouTubeKit?branch=master) +[![Build Status](https://img.shields.io/travis/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://travis-ci.org/0xced/XCDYouTubeKit) +[![Coverage Status](https://img.shields.io/coveralls/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://coveralls.io/r/0xced/XCDYouTubeKit?branch=develop) [![Platform](https://img.shields.io/cocoapods/p/XCDYouTubeKit.svg?style=flat)](http://cocoadocs.org/docsets/XCDYouTubeKit/) [![Pod Version](https://img.shields.io/cocoapods/v/XCDYouTubeKit.svg?style=flat)](https://cocoapods.org/pods/XCDYouTubeKit) [![Carthage Compatibility](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage/) From 08024b8580ba06dca30f907eb06db3ca637cccc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Mon, 11 Jan 2016 14:39:56 +0100 Subject: [PATCH 02/14] Simplify default log handler implementation --- XCDYouTubeKit/XCDYouTubeLogger.m | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/XCDYouTubeKit/XCDYouTubeLogger.m b/XCDYouTubeKit/XCDYouTubeLogger.m index f4d2dcecf..cc8386077 100644 --- a/XCDYouTubeKit/XCDYouTubeLogger.m +++ b/XCDYouTubeKit/XCDYouTubeLogger.m @@ -13,14 +13,6 @@ @protocol XCDYouTubeLogger_DDLog + (void) log:(BOOL)asynchronous message:(NSString *)message level:(NSUInteger)level flag:(NSUInteger)flag context:(NSInteger)context file:(const char *)file function:(const char *)function line:(NSUInteger)line tag:(id)tag; @end -static void (^const DefaultLogHandler)(NSString * (^)(void), XCDLogLevel, const char *, const char *, NSUInteger) = ^(NSString *(^message)(void), XCDLogLevel level, const char *file, const char *function, NSUInteger line) -{ - char *logLevelString = getenv("XCDYouTubeKitLogLevel"); - NSUInteger logLevelMask = logLevelString ? strtoul(logLevelString, NULL, 0) : (1 << XCDLogLevelError) | (1 << XCDLogLevelWarning); - if ((1 << level) & logLevelMask) - NSLog(@"[XCDYouTubeKit] %@", message()); -}; - static Class DDLogClass = Nil; static void (^const CocoaLumberjackLogHandler)(NSString * (^)(void), XCDLogLevel, const char *, const char *, NSUInteger) = ^(NSString *(^message)(void), XCDLogLevel level, const char *file, const char *function, NSUInteger line) @@ -29,7 +21,13 @@ static void (^const CocoaLumberjackLogHandler)(NSString * (^)(void), XCDLogLevel [DDLogClass log:YES message:message() level:NSUIntegerMax flag:(1 << level) context:XCDYouTubeKitLumberjackContext file:file function:function line:line tag:nil]; }; -static void (^LogHandler)(NSString * (^)(void), XCDLogLevel, const char *, const char *, NSUInteger); +static void (^LogHandler)(NSString * (^)(void), XCDLogLevel, const char *, const char *, NSUInteger) = ^(NSString *(^message)(void), XCDLogLevel level, const char *file, const char *function, NSUInteger line) +{ + char *logLevelString = getenv("XCDYouTubeKitLogLevel"); + NSUInteger logLevelMask = logLevelString ? strtoul(logLevelString, NULL, 0) : (1 << XCDLogLevelError) | (1 << XCDLogLevelWarning); + if ((1 << level) & logLevelMask) + NSLog(@"[XCDYouTubeKit] %@", message()); +}; @implementation XCDYouTubeLogger @@ -37,8 +35,6 @@ + (void) initialize { static dispatch_once_t once; dispatch_once(&once, ^{ - LogHandler = DefaultLogHandler; - DDLogClass = objc_lookUpClass("DDLog"); if (DDLogClass) { From 6089272d872a887351ed0f67fa830d48272d5ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Thu, 14 Jan 2016 18:14:52 +0100 Subject: [PATCH 03/14] Fix new Xcode 7.3 (beta) static analyzer warning Using blocks instead of statement expressions because stepping in with the debugger works with blocks but not with statement expressions. --- XCDYouTubeKit/XCDYouTubeClient.m | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/XCDYouTubeKit/XCDYouTubeClient.m b/XCDYouTubeKit/XCDYouTubeClient.m index a9064b117..478f9e1d9 100644 --- a/XCDYouTubeKit/XCDYouTubeClient.m +++ b/XCDYouTubeKit/XCDYouTubeClient.m @@ -34,7 +34,14 @@ - (instancetype) initWithLanguageIdentifier:(NSString *)languageIdentifier if (!(self = [super init])) return nil; // LCOV_EXCL_LINE - _languageIdentifier = languageIdentifier; + _languageIdentifier = ^{ + return languageIdentifier ?: ^{ + NSArray *preferredLocalizations = [[NSBundle mainBundle] preferredLocalizations]; + NSString *preferredLocalization = preferredLocalizations.firstObject ?: @"en"; + return [NSLocale canonicalLanguageIdentifierFromString:preferredLocalization] ?: @"en"; + }(); + }(); + _queue = [NSOperationQueue new]; _queue.maxConcurrentOperationCount = 6; // paul_irish: Chrome re-confirmed that the 6 connections-per-host limit is the right magic number: https://code.google.com/p/chromium/issues/detail?id=285567#c14 [https://twitter.com/paul_irish/status/422808635698212864] _queue.name = NSStringFromClass(self.class); @@ -42,18 +49,6 @@ - (instancetype) initWithLanguageIdentifier:(NSString *)languageIdentifier return self; } -- (NSString *) languageIdentifier -{ - if (!_languageIdentifier) - { - _languageIdentifier = @"en"; - NSArray *preferredLocalizations = [[NSBundle mainBundle] preferredLocalizations]; - if (preferredLocalizations.count > 0) - _languageIdentifier = [NSLocale canonicalLanguageIdentifierFromString:preferredLocalizations[0]]; - } - return _languageIdentifier; -} - - (id) getVideoWithIdentifier:(NSString *)videoIdentifier completionHandler:(void (^)(XCDYouTubeVideo * __nullable video, NSError * __nullable error))completionHandler { if (!completionHandler) From faf3dc1ae22e5072f1eb7cb4617895b0e1bacb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Fri, 15 Jan 2016 10:33:07 +0100 Subject: [PATCH 04/14] Make Xcode happy with schemes --- .../xcschemes/XCDYouTubeKit OS X Demo.xcscheme | 12 ++---------- .../xcschemes/XCDYouTubeKit iOS Demo.xcscheme | 12 ++---------- .../xcschemes/XCDYouTubeKit tvOS Demo.xcscheme | 3 ++- .../XCDYouTubeKit OS X Tests.xcscheme | 17 +++++++++++++++++ .../xcschemes/XCDYouTubeKit OS X.xcscheme | 18 ++++++++++++++---- .../XCDYouTubeKit iOS Framework.xcscheme | 3 ++- .../XCDYouTubeKit iOS Static Library.xcscheme | 12 +++++++++++- .../xcschemes/XCDYouTubeKit iOS Tests.xcscheme | 17 +++++++++++++++++ .../XCDYouTubeKit tvOS Tests.xcscheme | 17 +++++++++++++++++ .../xcschemes/XCDYouTubeKit tvOS.xcscheme | 6 ++++-- 10 files changed, 88 insertions(+), 29 deletions(-) diff --git a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit OS X Demo.xcscheme b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit OS X Demo.xcscheme index abb112861..f57428131 100644 --- a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit OS X Demo.xcscheme +++ b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit OS X Demo.xcscheme @@ -11,7 +11,8 @@ buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" - buildForAnalyzing = "YES"> + buildForAnalyzing = "YES" + hideIssues = "NO"> - - - - + buildForAnalyzing = "YES" + hideIssues = "NO"> - - - - + buildForAnalyzing = "YES" + hideIssues = "NO"> + + + + + + + buildForAnalyzing = "YES" + hideIssues = "NO"> @@ -96,6 +97,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + diff --git a/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Framework.xcscheme b/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Framework.xcscheme index 3785a54ea..a46b0697d 100644 --- a/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Framework.xcscheme +++ b/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Framework.xcscheme @@ -11,7 +11,8 @@ buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" - buildForAnalyzing = "YES"> + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "YES" + hideIssues = "NO"> + + + + diff --git a/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Tests.xcscheme b/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Tests.xcscheme index 9a91100d2..d5c975b46 100644 --- a/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Tests.xcscheme +++ b/XCDYouTubeKit.xcodeproj/xcshareddata/xcschemes/XCDYouTubeKit iOS Tests.xcscheme @@ -5,6 +5,23 @@ + + + + + + + + + + + + + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "NO" + hideIssues = "NO"> Date: Sun, 17 Jan 2016 14:36:20 +0100 Subject: [PATCH 05/14] Ensure that the allowed countries are computed if they are available --- XCDYouTubeKit/XCDYouTubeVideoOperation.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/XCDYouTubeKit/XCDYouTubeVideoOperation.m b/XCDYouTubeKit/XCDYouTubeVideoOperation.m index cd4a112dc..ec971ddff 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoOperation.m +++ b/XCDYouTubeKit/XCDYouTubeVideoOperation.m @@ -213,7 +213,7 @@ - (void) handleVideoInfoResponseWithInfo:(NSDictionary *)info response:(NSURLRes { self.lastError = error; if (error.code > 0) - self.youTubeError = YouTubeError(error, self.webpage.regionsAllowed, self.languageIdentifier); + self.youTubeError = error; [self startNextRequest]; } @@ -293,7 +293,7 @@ - (void) finishWithVideo:(XCDYouTubeVideo *)video - (void) finishWithError { - self.error = self.youTubeError ?: self.lastError; + self.error = self.youTubeError ? YouTubeError(self.youTubeError, self.webpage.regionsAllowed, self.languageIdentifier) : self.lastError; XCDYouTubeLogError(@"Video operation finished with error: %@\nDomain: %@\nCode: %@\nUser Info: %@", self.error.localizedDescription, self.error.domain, @(self.error.code), self.error.userInfo); [self finish]; } From 205402c088529bdf6d10dcbadc3e1564cacf7a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Mon, 18 Jan 2016 20:50:59 +0100 Subject: [PATCH 06/14] Instructions for `git update-index --skip-worktree` with full path --- .../tvOS Demo/Supporting Files/YouTube-API-Key.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/YouTube-API-Key.plist b/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/YouTube-API-Key.plist index 58cd35dc8..3da304fc9 100644 --- a/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/YouTube-API-Key.plist +++ b/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/YouTube-API-Key.plist @@ -5,6 +5,6 @@ From 148bb05656abeac7c8909bbdaddb8a7765015ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Fri, 22 Jan 2016 20:56:47 +0100 Subject: [PATCH 07/14] Use NS_DESIGNATED_INITIALIZER Replace __attribute__((objc_designated_initializer)) with NS_DESIGNATED_INITIALIZER which is available since the iOS 8.0 SDK, i.e. Xcode 6.0. --- XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h index a3f4493b8..bf427b58f 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h +++ b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h @@ -61,7 +61,7 @@ MP_EXTERN NSString *const XCDYouTubeVideoUserInfoKey; * * @discussion You can pass a nil *videoIdentifier* (or use the standard `init` method instead) and set the `` property later. */ -- (instancetype) initWithVideoIdentifier:(nullable NSString *)videoIdentifier __attribute__((objc_designated_initializer)); +- (instancetype) initWithVideoIdentifier:(nullable NSString *)videoIdentifier NS_DESIGNATED_INITIALIZER; /** * ------------------------------------ From 637c2bb3ce2aa92ae07245fd10706b9a06238933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 26 Jan 2016 10:05:53 +0100 Subject: [PATCH 08/14] Annotate `preferredVideoQualities` property with `null_resettable` This fixes a static analyzer warning introduced in Xcode 7.3 (beta) --- XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h index bf427b58f..09e11f66b 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h +++ b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.h @@ -6,6 +6,7 @@ #define NS_ASSUME_NONNULL_BEGIN #define NS_ASSUME_NONNULL_END #define nullable +#define null_resettable #endif #import @@ -89,7 +90,7 @@ MP_EXTERN NSString *const XCDYouTubeVideoUserInfoKey; * * @see XCDYouTubeVideoQuality */ -@property (nonatomic, copy) NSArray *preferredVideoQualities; +@property (nonatomic, copy, null_resettable) NSArray *preferredVideoQualities; /** * ------------------------ From 134bf991adc70d5d16e55c06251065cb50b22277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 2 Feb 2016 20:56:12 +0100 Subject: [PATCH 09/14] =?UTF-8?q?Don=E2=80=99t=20use=20.f=20suffix=20for?= =?UTF-8?q?=20CGFloat=20constants?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xcode 7.3 beta 2 intrdoduced a new warning (-Wdouble-promotion) > implicit conversion increases floating-point precision: 'float' to 'CGFloat' (aka 'double' Fixes #228 --- XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m index b34c50003..338d6e015 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m +++ b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m @@ -140,7 +140,7 @@ - (void) presentInView:(UIView *)view self.embedded = YES; self.moviePlayer.controlStyle = MPMovieControlStyleEmbedded; - self.moviePlayer.view.frame = CGRectMake(0.f, 0.f, view.bounds.size.width, view.bounds.size.height); + self.moviePlayer.view.frame = CGRectMake(0, 0, view.bounds.size.width, view.bounds.size.height); self.moviePlayer.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; if (![view.subviews containsObject:self.moviePlayer.view]) [view addSubview:self.moviePlayer.view]; From 3e21747acea3d2452ac8812da8091c172c1734f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 10 Feb 2016 22:19:08 +0100 Subject: [PATCH 10/14] Add CHANGELOG entry for version 2.5.1 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b632a6b5d..c52ee0dda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +#### Version 2.5.1 + +* Fixed compilation issue with Xcode 7.3 beta. (#228) + #### Version 2.5.0 * Logging is fully configurable with the new `XCDYouTubeLogger` class. From dd8a1415601f3043c09d7218ad399326fc643135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 10 Feb 2016 22:24:01 +0100 Subject: [PATCH 11/14] Add dummy navigator.userAgent property to JavaScript context Fixes #231 --- CHANGELOG.md | 1 + XCDYouTubeKit/XCDYouTubePlayerScript.m | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c52ee0dda..aa93ecfd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ #### Version 2.5.1 +* Adaptation to YouTube API change. (#231) * Fixed compilation issue with Xcode 7.3 beta. (#228) #### Version 2.5.0 diff --git a/XCDYouTubeKit/XCDYouTubePlayerScript.m b/XCDYouTubeKit/XCDYouTubePlayerScript.m index fcd57b2ff..c331b822c 100644 --- a/XCDYouTubeKit/XCDYouTubePlayerScript.m +++ b/XCDYouTubeKit/XCDYouTubePlayerScript.m @@ -40,7 +40,9 @@ - (instancetype) initWithString:(NSString *)string @"location": @{ @"hash": @"" }, - @"navigator": @{}, + @"navigator": @{ + @"userAgent": @"" + }, }; _context[@"window"] = @{}; for (NSString *propertyName in environment) From 53d732438bf1913c2591f6961d5b2222c433bd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 10 Feb 2016 22:32:55 +0100 Subject: [PATCH 12/14] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa93ecfd5..7d9a1c477 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Adaptation to YouTube API change. (#231) * Fixed compilation issue with Xcode 7.3 beta. (#228) +* Properly annotated the `preferredVideoQualities` property as `null_resettable`. #### Version 2.5.0 From 3075203112b450b5d394b7513fc1d790f89c0385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 10 Feb 2016 22:33:03 +0100 Subject: [PATCH 13/14] Update version to 2.5.1 --- .../XCDYouTubeKit Demo.xcodeproj/project.pbxproj | 4 ++-- XCDYouTubeKit.podspec | 2 +- XCDYouTubeKit.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj index c273c2422..ba0b807cc 100644 --- a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj @@ -760,7 +760,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.5.0; + CURRENT_PROJECT_VERSION = 2.5.1; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -805,7 +805,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 2.5.0; + CURRENT_PROJECT_VERSION = 2.5.1; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; diff --git a/XCDYouTubeKit.podspec b/XCDYouTubeKit.podspec index 023ba9454..a54038dfe 100644 --- a/XCDYouTubeKit.podspec +++ b/XCDYouTubeKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "XCDYouTubeKit" - s.version = "2.5.0" + s.version = "2.5.1" s.summary = "YouTube video player for iOS and OS X." s.homepage = "https://github.com/0xced/XCDYouTubeKit" s.screenshot = "https://raw.github.com/0xced/XCDYouTubeKit/#{s.version}/Screenshots/XCDYouTubeVideoPlayerViewController.png" diff --git a/XCDYouTubeKit.xcodeproj/project.pbxproj b/XCDYouTubeKit.xcodeproj/project.pbxproj index 419e847f1..1bc859f7e 100644 --- a/XCDYouTubeKit.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit.xcodeproj/project.pbxproj @@ -1157,10 +1157,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.5.0; + DYLIB_CURRENT_VERSION = 2.5.1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1223,10 +1223,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.5.0; + DYLIB_CURRENT_VERSION = 2.5.1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1296,10 +1296,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.5.0; + DYLIB_CURRENT_VERSION = 2.5.1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; From dc9d3483dbd36391a8702cb1b3489f3276b573eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 10 Feb 2016 22:33:03 +0100 Subject: [PATCH 14/14] Point badges to the master branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 48c69a0b1..ea1fddfec 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## About -[![Build Status](https://img.shields.io/travis/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://travis-ci.org/0xced/XCDYouTubeKit) -[![Coverage Status](https://img.shields.io/coveralls/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://coveralls.io/r/0xced/XCDYouTubeKit?branch=develop) +[![Build Status](https://img.shields.io/travis/0xced/XCDYouTubeKit/master.svg?style=flat)](https://travis-ci.org/0xced/XCDYouTubeKit) +[![Coverage Status](https://img.shields.io/coveralls/0xced/XCDYouTubeKit/master.svg?style=flat)](https://coveralls.io/r/0xced/XCDYouTubeKit?branch=master) [![Platform](https://img.shields.io/cocoapods/p/XCDYouTubeKit.svg?style=flat)](http://cocoadocs.org/docsets/XCDYouTubeKit/) [![Pod Version](https://img.shields.io/cocoapods/v/XCDYouTubeKit.svg?style=flat)](https://cocoapods.org/pods/XCDYouTubeKit) [![Carthage Compatibility](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage/)