Merge branch 'release/2.3.2'

.travis.yml

@@ -17,7 +17,10 @@ env:
 before_install:
   - xcrun simctl list
 install:
+  - brew update; brew update
+  - brew install coreutils
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+  - gem install xcpretty-travis-formatter --no-rdoc --no-ri --no-document --quiet
   - sudo easy_install cpp-coveralls
 script:
   - ./Scripts/run-tests.sh

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### Version 2.3.2
+
+* Adaptation to YouTube API change. (#186)
+
 #### Version 2.3.1
 
 * Improved Swift 2.0 interoperability. (#178)

README.md

@@ -30,12 +30,12 @@ XCDYouTubeKit is available through CocoaPods and Carthage.
 
 CocoaPods:
 ```ruby
-pod "XCDYouTubeKit", "~> 2.3.1"
+pod "XCDYouTubeKit", "~> 2.3.2"
 ```
 
 Carthage:
 ```objc
-github "0xced/XCDYouTubeKit" ~> 2.3.1
+github "0xced/XCDYouTubeKit" ~> 2.3.2
 ```
 
 Alternatively, you can manually use the provided static library on iOS or dynamic framework on OS X. In order to use the iOS static library, you must:

Scripts/release.sh

@@ -42,7 +42,8 @@ update_badges "master" "develop"
 echo "Things remaining to do"
 echo "  * git push with tags (master and develop)"
 echo "  * check that build is passing on travis: https://travis-ci.org/0xced/XCDYouTubeKit/"
+echo "  * pod lib lint --verbose XCDYouTubeKit.podspec"
+echo "  * pod trunk push --verbose XCDYouTubeKit.podspec"
 echo "  * pod spec lint --verbose XCDYouTubeKit.podspec"
-echo "  * pod trunk push XCDYouTubeKit.podspec --verbose"
 echo "  * create a new release on GitHub: https://github.com/0xced/XCDYouTubeKit/releases/new"
 echo "  * close milestone on GitHub if applicable: https://github.com/0xced/XCDYouTubeKit/milestones"

Scripts/run-tests.sh

@@ -6,7 +6,9 @@ set -o pipefail
 : ${CONFIGURATION:="Release"}
 : ${DESTINATION:="platform=iOS Simulator,name=iPhone 5s"}
 
-COMMAND="xcodebuild clean test -project XCDYouTubeKit.xcodeproj -scheme '${SCHEME}' -configuration '${CONFIGURATION}' -destination '${DESTINATION}'"
+COMMAND=""
+gstdbuf --version > /dev/null && COMMAND+="gstdbuf -o 0 "
+COMMAND+="xcodebuild clean test -project XCDYouTubeKit.xcodeproj -scheme '${SCHEME}' -configuration '${CONFIGURATION}' -destination '${DESTINATION}'"
 
 for BUILD_SETTING in OBJROOT RUN_CLANG_STATIC_ANALYZER; do
     VALUE=`eval echo \\$"${BUILD_SETTING}"`
@@ -17,6 +19,7 @@ for BUILD_SETTING in OBJROOT RUN_CLANG_STATIC_ANALYZER; do
 done
 
 xcpretty --version > /dev/null && COMMAND+=" | xcpretty -c"
+xcpretty-travis-formatter > /dev/null && COMMAND+=" -f `xcpretty-travis-formatter`"
 
 set -x
 eval "${COMMAND}"

XCDYouTubeKit Demo/OS X Demo/AppDelegate.h

@@ -2,6 +2,9 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import AppKit;
+@import AVKit;
+
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
 @property (assign) IBOutlet NSWindow *window;

XCDYouTubeKit Demo/OS X Demo/AppDelegate.m

@@ -4,7 +4,10 @@
 
 #import "AppDelegate.h"
 
+@import AVFoundation;
+
 #import <CocoaLumberjack/CocoaLumberjack.h>
+#import <XCDYouTubeKit/XCDYouTubeKit.h>
 
 @implementation AppDelegate
 

XCDYouTubeKit Demo/OS X Demo/Supporting Files/main.m

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import AppKit;
+
 int main(int argc, const char * argv[])
 {
 	return NSApplicationMain(argc, argv);

XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj

@@ -71,7 +71,6 @@
 		C2428AF0191C3C1400065504 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		C2428B04191C3DE400065504 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		C2428B05191C3DE400065504 /* XCDYouTubeKit OS X Demo-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "XCDYouTubeKit OS X Demo-Info.plist"; sourceTree = "<group>"; };
-		C2428B06191C3DE400065504 /* XCDYouTubeKit OS X Demo-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCDYouTubeKit OS X Demo-Prefix.pch"; sourceTree = "<group>"; };
 		C2428B0B191C415300065504 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AVKit.framework; sourceTree = DEVELOPER_DIR; };
 		C2570B841A02415F00127127 /* NowPlayingInfoCenterProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NowPlayingInfoCenterProvider.h; sourceTree = "<group>"; };
 		C2570B851A02415F00127127 /* NowPlayingInfoCenterProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NowPlayingInfoCenterProvider.m; sourceTree = "<group>"; };
@@ -95,7 +94,6 @@
 		C27415CA17F4CDD80026834B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard.storyboard; sourceTree = "<group>"; };
 		C27415D117F4CDD80026834B /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		C27415DD17F4CE4A0026834B /* XCDYouTubeKit iOS Demo-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "XCDYouTubeKit iOS Demo-Info.plist"; sourceTree = "<group>"; };
-		C27415DE17F4CE4A0026834B /* XCDYouTubeKit iOS Demo-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCDYouTubeKit iOS Demo-Prefix.pch"; sourceTree = "<group>"; };
 		C27415E217F4D02E0026834B /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		C27415E417F4D0330026834B /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
 		C27AD2A01A0791F000866050 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
@@ -159,7 +157,6 @@
 				C2428AE9191C3C1400065504 /* Images.xcassets */,
 				C2428B04191C3DE400065504 /* main.m */,
 				C2428B05191C3DE400065504 /* XCDYouTubeKit OS X Demo-Info.plist */,
-				C2428B06191C3DE400065504 /* XCDYouTubeKit OS X Demo-Prefix.pch */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -246,7 +243,6 @@
 				C27415D117F4CDD80026834B /* main.m */,
 				C235BB821B2099450076FC81 /* Settings.bundle */,
 				C27415DD17F4CE4A0026834B /* XCDYouTubeKit iOS Demo-Info.plist */,
-				C27415DE17F4CE4A0026834B /* XCDYouTubeKit iOS Demo-Prefix.pch */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -474,14 +470,11 @@
 			baseConfigurationReference = 505BA2F7B06DFF74374D198E /* Pods-XCDYouTubeKit OS X Demo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "OS X Demo/Supporting Files/XCDYouTubeKit OS X Demo-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -504,16 +497,13 @@
 			baseConfigurationReference = 552B9F1CEBBB6991A374874F /* Pods-XCDYouTubeKit OS X Demo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "OS X Demo/Supporting Files/XCDYouTubeKit OS X Demo-Prefix.pch";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -533,6 +523,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -541,7 +532,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2.3.1;
+				CURRENT_PROJECT_VERSION = 2.3.2;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -568,6 +559,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -576,7 +568,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 2.3.1;
+				CURRENT_PROJECT_VERSION = 2.3.2;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"NS_BLOCK_ASSERTIONS=1",
@@ -600,8 +592,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Prefix.pch";
 				INFOPLIST_FILE = "iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -615,8 +605,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Prefix.pch";
 				INFOPLIST_FILE = "iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";

XCDYouTubeKit Demo/iOS Demo/AppDelegate.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import UIKit;
+
 #import "PlayerEventLogger.h"
 #import "NowPlayingInfoCenterProvider.h"
 

XCDYouTubeKit Demo/iOS Demo/AppDelegate.m

@@ -4,9 +4,11 @@
 
 #import "AppDelegate.h"
 
-#import "ContextLogFormatter.h"
+@import AVFoundation;
 #import <XCDLumberjackNSLogger/XCDLumberjackNSLogger.h>
 
+#import "ContextLogFormatter.h"
+
 @implementation AppDelegate
 
 @synthesize window = _window;

XCDYouTubeKit Demo/iOS Demo/ContextLogFormatter.h

@@ -2,7 +2,7 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import <CocoaLumberjack/CocoaLumberjack.h>
 
 @interface ContextLogFormatter : NSObject <DDLogFormatter>

XCDYouTubeKit Demo/iOS Demo/DemoAsynchronousViewController.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import UIKit;
+
 @interface DemoAsynchronousViewController : UIViewController
 
 @property (nonatomic, weak) IBOutlet UITextField *apiKeyTextField;

XCDYouTubeKit Demo/iOS Demo/DemoAsynchronousViewController.m

@@ -4,6 +4,10 @@
 
 #import "DemoAsynchronousViewController.h"
 
+#import <XCDYouTubeKit/XCDYouTubeKit.h>
+
+#import "MPMoviePlayerController+BackgroundPlayback.h"
+
 @implementation DemoAsynchronousViewController
 
 - (void) viewDidLoad

XCDYouTubeKit Demo/iOS Demo/DemoFullScreenViewController.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import UIKit;
+
 #import "VideoPickerController.h"
 
 @interface DemoFullScreenViewController : UIViewController <UITextFieldDelegate, VideoPickerControllerDelegate>

XCDYouTubeKit Demo/iOS Demo/DemoFullScreenViewController.m

@@ -4,6 +4,10 @@
 
 #import "DemoFullScreenViewController.h"
 
+#import <XCDYouTubeKit/XCDYouTubeKit.h>
+
+#import "MPMoviePlayerController+BackgroundPlayback.h"
+
 @implementation DemoFullScreenViewController
 
 - (void) viewDidLoad

XCDYouTubeKit Demo/iOS Demo/DemoInlineViewController.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import UIKit;
+
 @interface DemoInlineViewController : UIViewController
 
 @property (nonatomic, weak) IBOutlet UIView *videoContainerView;

XCDYouTubeKit Demo/iOS Demo/DemoInlineViewController.m

@@ -4,6 +4,10 @@
 
 #import "DemoInlineViewController.h"
 
+#import <XCDYouTubeKit/XCDYouTubeKit.h>
+
+#import "MPMoviePlayerController+BackgroundPlayback.h"
+
 @interface DemoInlineViewController ()
 
 @property (nonatomic, strong) XCDYouTubeVideoPlayerViewController *videoPlayerViewController;

XCDYouTubeKit Demo/iOS Demo/DemoThumbnailViewController.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import UIKit;
+
 @interface DemoThumbnailViewController : UIViewController
 
 @property (nonatomic, weak) IBOutlet UIButton *actionButton;

XCDYouTubeKit Demo/iOS Demo/DemoThumbnailViewController.m

@@ -4,6 +4,10 @@
 
 #import "DemoThumbnailViewController.h"
 
+#import <XCDYouTubeKit/XCDYouTubeKit.h>
+
+#import "MPMoviePlayerController+BackgroundPlayback.h"
+
 @interface DemoThumbnailViewController ()
 
 @property (nonatomic, strong) XCDYouTubeVideoPlayerViewController *videoPlayerViewController;

XCDYouTubeKit Demo/iOS Demo/MPMoviePlayerController+BackgroundPlayback.h

@@ -2,7 +2,7 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
-#import <MediaPlayer/MediaPlayer.h>
+@import MediaPlayer;
 
 @interface MPMoviePlayerController (BackgroundPlayback)
 

XCDYouTubeKit Demo/iOS Demo/MPMoviePlayerController+BackgroundPlayback.m

@@ -4,7 +4,8 @@
 
 #import "MPMoviePlayerController+BackgroundPlayback.h"
 
-#import <objc/runtime.h>
+@import AVFoundation;
+@import ObjectiveC;
 
 #ifndef NSFoundationVersionNumber_iOS_7_0
 #define NSFoundationVersionNumber_iOS_7_0 1047.2

XCDYouTubeKit Demo/iOS Demo/NowPlayingInfoCenterProvider.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import Foundation;
+
 @interface NowPlayingInfoCenterProvider : NSObject
 
 @property (nonatomic, assign, getter = isEnabled) BOOL enabled; // defaults to `YES`

XCDYouTubeKit Demo/iOS Demo/NowPlayingInfoCenterProvider.m

@@ -4,6 +4,8 @@
 
 #import "NowPlayingInfoCenterProvider.h"
 
+#import <XCDYouTubeKit/XCDYouTubeKit.h>
+
 @implementation NowPlayingInfoCenterProvider
 
 - (instancetype) init

XCDYouTubeKit Demo/iOS Demo/PlayerEventLogger.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import Foundation;
+
 @interface PlayerEventLogger : NSObject
 
 @property (nonatomic, assign, getter = isEnabled) BOOL enabled; // defaults to `YES`

XCDYouTubeKit Demo/iOS Demo/PlayerEventLogger.m

@@ -5,6 +5,7 @@
 #import "PlayerEventLogger.h"
 
 #import <CocoaLumberjack/CocoaLumberjack.h>
+@import MediaPlayer;
 
 @implementation PlayerEventLogger
 

XCDYouTubeKit Demo/iOS Demo/SettingsViewController.h

@@ -2,6 +2,8 @@
 //  Copyright (c) 2013-2015 Cédric Luthi. All rights reserved.
 //
 
+@import UIKit;
+
 @interface SettingsViewController : UIViewController
 
 @end

XCDYouTubeKit Demo/iOS Demo/SettingsViewController.m

@@ -4,6 +4,8 @@
 
 #import "SettingsViewController.h"
 
+@import AVFoundation;
+
 @interface SettingsViewController () <UIActionSheetDelegate>
 
 @property (nonatomic, weak) IBOutlet UISwitch *playVideoInBackgroundSwitch;