Merge branch 'feature/tvOS' into develop

Conflicts (because of 2.3.3 hotfix):
	XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj
	XCDYouTubeKit.podspec

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode6.4
+osx_image: xcode7.1
 language: objective-c
 env:
   matrix:
@@ -12,14 +12,14 @@ env:
     - 'DESTINATION="platform=iOS Simulator,name=iPhone 4s"        CONFIGURATION="Release"       SCHEME="XCDYouTubeKit iOS Framework"      RUN_CLANG_STATIC_ANALYZER="YES"'
     - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s"        CONFIGURATION="Release"       SCHEME="XCDYouTubeKit iOS Framework"      RUN_CLANG_STATIC_ANALYZER="YES"'
     - 'DESTINATION="platform=OS X"                                CONFIGURATION="Release"       SCHEME="XCDYouTubeKit OS X"               RUN_CLANG_STATIC_ANALYZER="YES"'
+    - 'DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"  CONFIGURATION="Release"       SCHEME="XCDYouTubeKit tvOS"               RUN_CLANG_STATIC_ANALYZER="YES"'
 before_install:
   - xcrun simctl list
-  - brew update; brew update
 install:
-  - brew install coreutils
   - gem install xcpretty-travis-formatter --no-rdoc --no-ri --no-document --quiet
   - sudo easy_install cpp-coveralls
 script:
+  - open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040
   - ./Scripts/run-tests.sh
 after_success:
   - '[ "$CONFIGURATION" == "Code Coverage" ] && coveralls --include XCDYouTubeKit'

Scripts/run-tests.sh

@@ -6,9 +6,7 @@ set -o pipefail
 : ${CONFIGURATION:="Release"}
 : ${DESTINATION:="platform=iOS Simulator,name=iPhone 5s"}
 
-COMMAND=""
-gstdbuf --version > /dev/null 2>&1 && COMMAND+="gstdbuf -o 0 "
-COMMAND+="xcodebuild clean test -project XCDYouTubeKit.xcodeproj -scheme '${SCHEME}' -configuration '${CONFIGURATION}' -destination '${DESTINATION}'"
+COMMAND="env NSUnbufferedIO=YES 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}"`

XCDYouTubeKit Demo/OS X Demo/Base.lproj/MainMenu.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.AVKitIBPlugin" version="9059"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
+        <plugIn identifier="com.apple.AVKitIBPlugin" version="9060"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">

XCDYouTubeKit Demo/Podfile

@@ -16,3 +16,9 @@ target 'XCDYouTubeKit OS X Demo' do
   platform :osx, '10.9'
   import_pods
 end
+
+target 'XCDYouTubeKit tvOS Demo' do
+  plugin 'cocoapods-expert-difficulty'
+  platform :tvos, '9.0'
+  pod 'Google-API-Client/YouTube', '~> 1.0.422'
+end

XCDYouTubeKit Demo/Podfile.lock

@@ -7,6 +7,16 @@ PODS:
     - CocoaLumberjack/Core
   - CocoaLumberjack/Extensions (2.0.1):
     - CocoaLumberjack/Default
+  - Google-API-Client/Common (1.0.422):
+    - gtm-http-fetcher (~> 1.0.141)
+    - gtm-oauth2 (~> 1.0.125)
+  - Google-API-Client/YouTube (1.0.422):
+    - Google-API-Client/Common
+    - gtm-http-fetcher (~> 1.0.141)
+    - gtm-oauth2 (~> 1.0.125)
+  - gtm-http-fetcher (1.0.141)
+  - gtm-oauth2 (1.0.126):
+    - gtm-http-fetcher (~> 1.0.141)
   - NSLogger (1.5.1):
     - NSLogger/Standard (= 1.5.1)
   - NSLogger/Standard (1.5.1)
@@ -15,11 +25,15 @@ PODS:
     - NSLogger (~> 1.5.1)
 
 DEPENDENCIES:
+  - Google-API-Client/YouTube (~> 1.0.422)
   - XCDLumberjackNSLogger (~> 1.0.0)
 
 SPEC CHECKSUMS:
   CocoaLumberjack: 019d1361244274a6138c788c6cb80baabc13fb8f
+  Google-API-Client: cb712cf122f1d7fda966de4c2bc551324573366c
+  gtm-http-fetcher: 6d4617e7d343b6e4c082b777541c334eb6f5d81e
+  gtm-oauth2: 2a18b824e4f8a02df6cfe987beb59ae9d9697f9d
   NSLogger: 5ed223a2436df96244e033be750656dacdeec034
   XCDLumberjackNSLogger: 867392d7b40490e1b15aac9c1acee0952bf33d61
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0