Merge branch 'release/2.0.3'

.gitignore

@@ -0,0 +1 @@
+XcodeCoverage

.travis.yml

@@ -5,8 +5,8 @@ install:
 script:
     - export LC_CTYPE=en_US.UTF-8
     - set -o pipefail
-    - xcodebuild test -project XCDYouTubeKit.xcodeproj -scheme 'XCDYouTubeKit iOS' -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch)' | xcpretty -c
-    - xcodebuild test -project XCDYouTubeKit.xcodeproj -scheme 'XCDYouTubeKit iOS' -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch 64-bit)' OBJROOT=XCDYouTubeKit/build | xcpretty -c
+    - xcodebuild test -project XCDYouTubeKit.xcodeproj -scheme 'XCDYouTubeKit iOS Static Library' -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch)' | xcpretty -c
+    - xcodebuild test -project XCDYouTubeKit.xcodeproj -scheme 'XCDYouTubeKit iOS Static Library' -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch 64-bit)' OBJROOT=XCDYouTubeKit/build | xcpretty -c
     - xcodebuild test -project XCDYouTubeKit.xcodeproj -scheme 'XCDYouTubeKit OS X' | xcpretty -c
 after_success:
     - ./Scripts/coveralls.sh

CHANGELOG.md

@@ -1,3 +1,9 @@
+#### Version 2.0.3
+
+* Adaptation to YouTube API change. (#94)
+* Support for age restricted videos.
+* Project upgraded to Xcode 6.
+
 #### Version 2.0.2
 
 * Fixed errors on protected videos. (#52)
@@ -13,7 +19,7 @@
 #### Version 2.0.0
 
 * Project renamed to `XCDYouTubeKit`.
-* Support for protected video. (#6, #11, #12, #21, #27, #31, #33)
+* Support for protected videos. (#6, #11, #12, #21, #27, #31, #33)
 * OS X compatibility thanks to the new `XCDYouTubeClient` class. (#14, #18)
 * OS X dynamic framework target
 * Support for live videos. (#34)

README.md

@@ -2,7 +2,7 @@
 
 [![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)
+[![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)](http://cocoadocs.org/docsets/XCDYouTubeKit/)
 [![License](https://img.shields.io/cocoapods/l/XCDYouTubeKit.svg?style=flat)](LICENSE)
 
@@ -33,9 +33,20 @@ Are you enjoying XCDYouTubeKit? You can say thank you with [a tweet](https://twi
 
 XCDYouTubeKit is available through CocoaPods.
 
-Alternatively, you can manually use the provided static library on iOS or dynamic framework on OS X.
+```ruby
+pod "XCDYouTubeKit", "~> 2.0.3"
+```
+
+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:
+
+1. Create a workspace (File → New → Workspace…)
+2. Add your project to the workspace
+3. Add the XCDYouTubeKit project to the workspace
+4. Drag and drop the `libXCDYouTubeKit.a` file referenced from XCDYouTubeKit → Products → libXCDYouTubeKit.a into the *Link Binary With Libraries* build phase of your app’s target.
+
+These steps will ensure that `#import <XCDYouTubeKit/XCDYouTubeKit.h>` will work properly in your project.
 
-If you use the iOS static library and you are targeting iOS 7, add the JavaScriptCore framework. If you are targeting iOS 5 or 6, you must add the following *Other Linker Flags* instead to your app:
+**Warning**: If you use the iOS static library and you are targeting iOS 7, add the JavaScriptCore framework. If you are targeting iOS 5 or 6, you must add the following *Other Linker Flags* instead to your app:
 
 ```
 -Wl,-U,_JSContextGetGlobalObject -Wl,-U,_JSEvaluateScript -Wl,-U,_JSGlobalContextCreate -Wl,-U,_JSGlobalContextRelease -Wl,-U,_JSObjectCallAsFunction -Wl,-U,_JSObjectIsFunction -Wl,-U,_JSObjectSetProperty -Wl,-U,_JSStringCopyCFString -Wl,-U,_JSStringCreateWithCFString -Wl,-U,_JSStringRelease -Wl,-U,_JSValueIsObject -Wl,-U,_JSValueIsString -Wl,-U,_JSValueMakeString -Wl,-U,_JSValueToStringCopy
@@ -48,10 +59,6 @@ See my [JavaScriptCore framework availability on iOS](http://stackoverflow.com/q
 
 XCDYouTubeKit is [fully documented](http://cocoadocs.org/docsets/XCDYouTubeKit/).
 
-```
-#import <XCDYouTubeKit/XCDYouTubeKit.h>`
-```
-
 ### iOS and OS X
 
 ```objc

Scripts/release.sh

@@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+if [[ $# -ne 1 ]]; then
+    echo "usage: $0 VERSION"
+    exit 1
+fi
+
+VERSION=$1
+
+git flow release start ${VERSION}
+
+echo "Updating version"
+set -v
+sed -i "" "s/DYLIB_CURRENT_VERSION = .*;/DYLIB_CURRENT_VERSION = ${VERSION};/g" "XCDYouTubeKit.xcodeproj/project.pbxproj"
+sed -i "" "s/CURRENT_PROJECT_VERSION = .*;/CURRENT_PROJECT_VERSION = ${VERSION};/g" "XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj"
+sed -i "" "s/^\(.*s.version.*=.*\)\".*\"/\1\"${VERSION}\"/" "XCDYouTubeKit.podspec"
+sed -i "" "s/\"~> .*\"/\"~> ${VERSION}\"/g" "README.md"
+set +v
+git add "XCDYouTubeKit.xcodeproj"
+git add "XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj"
+git add "XCDYouTubeKit.podspec"
+git add "README.md"
+git commit -m "Update version to ${VERSION}"
+
+echo "Updating badges"
+set -v
+sed -i "" "s/develop\.svg/master.svg/g" "README.md"
+sed -i "" "s/branch=develop/branch=master/g" "README.md"
+set +v
+git add "README.md"
+git commit -m "Point badges to the master branch"

XCDYouTubeKit Demo/OS X Demo/AppDelegate.m

@@ -16,7 +16,8 @@ - (IBAction) playVideo:(id)sender
 	self.playerView.player = nil;
 
 	[self.progressIndicator startAnimation:sender];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:[sender stringValue] completionHandler:^(XCDYouTubeVideo *video, NSError *error) {
+	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:[sender stringValue] completionHandler:^(XCDYouTubeVideo *video, NSError *error)
+	{
 		[self.progressIndicator stopAnimation:sender];
 
 		if (video)

XCDYouTubeKit Demo/OS X Demo/Images.xcassets/AppIcon.appiconset/Contents.json → XCDYouTubeKit Demo/OS X Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,53 +1,63 @@
 {
   "images" : [
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "Icon-16.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "Icon-32.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "Icon-32.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "Icon-64.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "Icon-128.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "Icon-256.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "Icon-256.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "Icon-512.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "Icon-512.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "Icon-1024.png",
       "scale" : "2x"
     }
   ],