Merge branch 'release/2.5.5'

0xced · Mar 7, 2017 · bbd2ee1 · bbd2ee1
2 parents 97c8fc1 + af33b83
commit bbd2ee1
Show file tree

Hide file tree

Showing 19 changed files with 318 additions and 305 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -4,11 +4,11 @@ source_directory: XCDYouTubeKit
 framework_root: .
 umbrella_header: XCDYouTubeKit/XCDYouTubeKit.h
 module: XCDYouTubeKit
-module_version: 2.5.4
+module_version: 2.5.5
 
 author: Cédric Luthi
 author_url: https://twitter.com/0xced
 
 readme: README.md
 github_url: https://github.com/0xced/XCDYouTubeKit
-github_file_prefix: https://github.com/0xced/XCDYouTubeKit/tree/2.5.4/XCDYouTubeKit
+github_file_prefix: https://github.com/0xced/XCDYouTubeKit/tree/2.5.5/XCDYouTubeKit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### Version 2.5.5
+
+* Adaptation to YouTube API change. (#314)
+
 #### Version 2.5.4
 
 * Adaptation to YouTube API change. (#295, #296, #297)

diff --git a/Makefile b/Makefile
@@ -9,32 +9,32 @@ export SCAN_OUTPUT_TYPES =
 .PHONY: default test_macOS_report test_iOS_report test_tvOS_report test_macOS test_iOS test_tvOS test_iOS_9 check_scan check_slather
 
 default: check_slather check_scan
-	scan --clean --device "iPhone 5s" --code_coverage --buildlog_path "~/Library/Logs/scan"
+	fastlane scan --clean --device "iPhone 5s" --code_coverage --buildlog_path "~/Library/Logs/scan"
 	slather coverage --verbose --output-directory "${TMPDIR}/${SCAN_SCHEME} Coverage Report" --html --show --ignore "../**/Contents/Developer/**" --scheme "${SCAN_SCHEME}" "${SCAN_PROJECT}" || true
 
 test_macOS_report: check_scan
-	scan --output_directory "${CIRCLE_TEST_REPORTS}" --output_types junit --custom_report_file_name $@.xml
+	fastlane scan --output_directory "${CIRCLE_TEST_REPORTS}" --output_types junit --custom_report_file_name $@.xml
 
 test_iOS_report: check_scan
-	scan --output_directory "${CIRCLE_TEST_REPORTS}" --output_types junit --custom_report_file_name $@.xml --device "iPhone 5s" --code_coverage --xcargs "OBJROOT=build GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES"
+	fastlane scan --output_directory "${CIRCLE_TEST_REPORTS}" --output_types junit --custom_report_file_name $@.xml --device "iPhone 5s" --code_coverage --xcargs "OBJROOT=build GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES"
 
 test_tvOS_report: check_scan
-	scan --output_directory "${CIRCLE_TEST_REPORTS}" --output_types junit --custom_report_file_name $@.xml --device "Apple TV 1080p"
+	fastlane scan --output_directory "${CIRCLE_TEST_REPORTS}" --output_types junit --custom_report_file_name $@.xml --device "Apple TV 1080p"
 
 test_macOS: check_scan
-	scan --configuration Release                           --xcargs "RUN_CLANG_STATIC_ANALYZER=YES CLANG_STATIC_ANALYZER_MODE=Deep MACOSX_DEPLOYMENT_TARGET=`xcrun --sdk "macosx" --show-sdk-version`"
+	fastlane scan --configuration Release                           --xcargs "RUN_CLANG_STATIC_ANALYZER=YES CLANG_STATIC_ANALYZER_MODE=Deep MACOSX_DEPLOYMENT_TARGET=`xcrun --sdk "macosx" --show-sdk-version`"
 
 test_iOS: check_scan
-	scan --configuration Release --device "iPhone 5s"      --xcargs "RUN_CLANG_STATIC_ANALYZER=YES CLANG_STATIC_ANALYZER_MODE=Deep IPHONEOS_DEPLOYMENT_TARGET=`xcrun --sdk "iphonesimulator" --show-sdk-version`"
+	fastlane scan --configuration Release --device "iPhone 5s"      --xcargs "RUN_CLANG_STATIC_ANALYZER=YES CLANG_STATIC_ANALYZER_MODE=Deep IPHONEOS_DEPLOYMENT_TARGET=`xcrun --sdk "iphonesimulator" --show-sdk-version`"
 
 test_tvOS: check_scan
-	scan --configuration Release --device "Apple TV 1080p" --xcargs "RUN_CLANG_STATIC_ANALYZER=YES CLANG_STATIC_ANALYZER_MODE=Deep TVOS_DEPLOYMENT_TARGET=`xcrun --sdk "appletvsimulator" --show-sdk-version`"
+	fastlane scan --configuration Release --device "Apple TV 1080p" --xcargs "RUN_CLANG_STATIC_ANALYZER=YES CLANG_STATIC_ANALYZER_MODE=Deep TVOS_DEPLOYMENT_TARGET=`xcrun --sdk "appletvsimulator" --show-sdk-version`"
 
 test_iOS_9: check_scan
-	scan --device "iPhone 5s (9.0)"
+	fastlane scan --device "iPhone 5s (9.0)"
 
 check_scan:
-	@scan --version > /dev/null 2>&1 || (printf "❌  Please install \e[1;30mscan\e[0m (https://github.com/fastlane/fastlane/tree/master/scan) to run unit tests: $$ [sudo] \e[1;30mgem install scan\e[0m\n" && false)
+	@fastlane scan --version > /dev/null 2>&1 || (printf "❌  Please install \e[1;30mscan\e[0m (https://github.com/fastlane/fastlane/tree/master/scan) to run unit tests: $$ [sudo] \e[1;30mgem install scan\e[0m\n" && false)
 
 check_slather:
 	@slather version > /dev/null 2>&1 || printf "⚠️  Please install \e[1;30mslather\e[0m (https://github.com/SlatherOrg/slather) to get a code coverage report: $$ [sudo] \e[1;30mgem install slather\e[0m\n"
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Carthage Compatibility](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage/)
 [![License](https://img.shields.io/cocoapods/l/XCDYouTubeKit.svg?style=flat)](LICENSE)
 
-**XCDYouTubeKit** is a YouTube video player for iOS, tvOS and OS X.
+**XCDYouTubeKit** is a YouTube video player for iOS, tvOS and macOS.
 
 <img src="Screenshots/XCDYouTubeVideoPlayerViewController.png" width="480" height="320">
 
@@ -17,8 +17,9 @@ Are you enjoying XCDYouTubeKit? You can say thank you with [a tweet](https://twi
 
 ## Requirements
 
-- Runs on iOS 7.0 and later
-- Runs on OS X 10.9 and later
+- Runs on iOS 8.0 and later
+- Runs on macOS 10.9 and later
+- Runs on tvOS 9.0 and later
 
 ## Warning
 
@@ -40,7 +41,7 @@ Carthage:
 github "0xced/XCDYouTubeKit" ~> 2.5
 ```
 
-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:
+Alternatively, you can manually use the provided static library or dynamic framework. In order to use the static library, you must:
 
 1. Create a workspace (File → New → Workspace…)
 2. Add your project to the workspace
@@ -88,10 +89,10 @@ XCDYouTubeVideoPlayerViewController *videoPlayerViewController = [[XCDYouTubeVid
 [videoPlayerViewController.moviePlayer play];
 ```
 
-### iOS and OS X
+### iOS, tvOS and macOS
 
 ```objc
-NSString *videoIdentifier = @"EdeVaT-zZt4"; // A 11 characters YouTube video identifier
+NSString *videoIdentifier = @"9bZkp7q19f0"; // A 11 characters YouTube video identifier
 [[XCDYouTubeClient defaultClient] getVideoWithIdentifier:videoIdentifier completionHandler:^(XCDYouTubeVideo *video, NSError *error) {
 	if (video)
 	{

diff --git a/Scripts/release.sh b/Scripts/release.sh
@@ -60,7 +60,7 @@ 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 "  * check that build is passing on CircleCI: https://circleci.com/gh/0xced/XCDYouTubeKit"
 echo "  * pod trunk push XCDYouTubeKit.podspec"
 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"
diff --git 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.4;
+				CURRENT_PROJECT_VERSION = 2.5.5;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -804,7 +804,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 2.5.4;
+				CURRENT_PROJECT_VERSION = 2.5.5;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;

diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testMobileRestrictedVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testMobileRestrictedVideo.json
diff --git a/...ts/Cassettes/XCDYouTubeClientTestCase/testThatVideoIsAvailalbeOnDetailPageEventLabel.json b/...ts/Cassettes/XCDYouTubeClientTestCase/testThatVideoIsAvailalbeOnDetailPageEventLabel.json
diff --git a/...eKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testAgeRestrictedUnratedVideo.json b/...eKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testAgeRestrictedUnratedVideo.json
diff --git a/...TubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testAgeRestrictedVEVOVideo.json b/...TubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testAgeRestrictedVEVOVideo.json
diff --git a/...ts/Cassettes/XCDYouTubeProtectedVideosTestCase/testDASHAudioWithRateBypassIsPlayable.json b/...ts/Cassettes/XCDYouTubeProtectedVideosTestCase/testDASHAudioWithRateBypassIsPlayable.json
diff --git a/...ubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOIsPlayable.json b/...ubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOIsPlayable.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo1.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo1.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo2.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo2.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo3.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo3.json
diff --git a/XCDYouTubeKit.podspec b/XCDYouTubeKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                   = "XCDYouTubeKit"
-  s.version                = "2.5.4"
+  s.version                = "2.5.5"
   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
@@ -596,10 +596,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2.0.0;
-				DYLIB_CURRENT_VERSION = 2.5.4;
+				DYLIB_CURRENT_VERSION = 2.5.5;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -674,10 +674,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2.0.0;
-				DYLIB_CURRENT_VERSION = 2.5.4;
+				DYLIB_CURRENT_VERSION = 2.5.5;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/XCDYouTubeKit/XCDYouTubePlayerScript.m b/XCDYouTubeKit/XCDYouTubePlayerScript.m
@@ -69,11 +69,19 @@ - (instancetype) initWithString:(NSString *)string
 	}
 
 	NSRegularExpression *signatureRegularExpression = [NSRegularExpression regularExpressionWithPattern:@"[\"']signature[\"']\\s*,\\s*([^\\(]+)" options:NSRegularExpressionCaseInsensitive error:NULL];
-	NSTextCheckingResult *signatureResult = [signatureRegularExpression firstMatchInString:script options:(NSMatchingOptions)0 range:NSMakeRange(0, script.length)];
-	NSString *signatureFunctionName = signatureResult.numberOfRanges > 1 ? [script substringWithRange:[signatureResult rangeAtIndex:1]] : nil;
-
-	if (signatureFunctionName)
-		_signatureFunction = self.context[signatureFunctionName];
+	for (NSTextCheckingResult *signatureResult in [signatureRegularExpression matchesInString:script options:(NSMatchingOptions)0 range:NSMakeRange(0, script.length)])
+	{
+		NSString *signatureFunctionName = signatureResult.numberOfRanges > 1 ? [script substringWithRange:[signatureResult rangeAtIndex:1]] : nil;
+		if (!signatureFunctionName)
+			continue;
+
+		JSValue *signatureFunction = self.context[signatureFunctionName];
+		if (signatureFunction.isObject)
+		{
+			_signatureFunction = signatureFunction;
+			break;
+		}
+	}
 
 	if (!_signatureFunction)
 		XCDYouTubeLogWarning(@"No signature function in player script");

diff --git a/circle.yml b/circle.yml
@@ -27,6 +27,10 @@ test:
     # Run unit tests on iOS 9
     - make test_iOS_9
 
-  post:
-    - sudo pip install cpp-coveralls && coveralls --include XCDYouTubeKit
-    - bash <(curl -s https://codecov.io/bash) -J XCDYouTubeKit -f XCDYouTubeKit.framework.coverage.txt -X coveragepy -X gcov
+deployment:
+  coverage:
+    branch: [develop, master]
+    commands:
+      - bash <(curl -s https://codecov.io/bash) -J XCDYouTubeKit -X coveragepy -X gcov
+      - rsync -a *.coverage.txt "${CIRCLE_ARTIFACTS}/coverage/"
+      - sudo pip install cpp-coveralls && coveralls --include XCDYouTubeKit