Merge branch 'release/2.5.2'

.gitignore

@@ -1 +1,2 @@
 XcodeCoverage
+RELEASE_NOTES.md

CHANGELOG.md

@@ -1,3 +1,9 @@
+#### Version 2.5.2
+
+* Ensure that all the streams are downloadable at full speed. (#177)
+* Post the video notification after setting the movie player’s contentURL property. (#233)
+* Fixed playback of some age restricted videos.
+
 #### Version 2.5.1
 
 * Adaptation to YouTube API change. (#231)

Scripts/release.sh

@@ -19,8 +19,15 @@ fi
 VERSION=$1
 VERSION_PARTS=(${VERSION//./ })
 
+grep "#### Version ${VERSION}" RELEASE_NOTES.md > /dev/null || (echo "RELEASE_NOTES.md must contain release notes for version ${VERSION}" && exit 1)
+
 git flow release start ${VERSION}
 
+echo "Updating CHANGELOG"
+echo -e "$(cat RELEASE_NOTES.md)\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+git add CHANGELOG.md
+git commit -m "Update CHANGELOG for version ${VERSION}"
+
 echo "Updating version"
 CURRENT_PROJECT_VERSION=$(xcodebuild -project XCDYouTubeKit.xcodeproj -showBuildSettings | awk '/CURRENT_PROJECT_VERSION/{print $3}')
 CURRENT_PROJECT_VERSION=$(expr ${CURRENT_PROJECT_VERSION} + 1)
@@ -39,15 +46,19 @@ git commit -m "Update version to ${VERSION}"
 
 update_badges "develop" "master"
 
-git flow release finish ${VERSION}
+# allow warnings until https://github.com/CocoaPods/CocoaPods/issues/5188 is resolved
+pod lib lint --allow-warnings XCDYouTubeKit.podspec
+
+GIT_MERGE_AUTOEDIT=no git flow release finish -s -f RELEASE_NOTES.md ${VERSION}
+
+echo -e "#### Version X.Y.Z\n\n* " > RELEASE_NOTES.md
 
 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"
+echo "  * pod spec lint 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"

XCDYouTubeKit Demo/Podfile

@@ -1,10 +1,10 @@
-xcodeproj 'XCDYouTubeKit Demo.xcodeproj'
+project 'XCDYouTubeKit Demo.xcodeproj'
 workspace '../XCDYouTubeKit Demo.xcworkspace'
 
 inhibit_all_warnings!
 
 def import_pods
-  pod 'XCDLumberjackNSLogger', '~> 1.0.0'
+  pod 'XCDLumberjackNSLogger', '~> 1.0'
 end
 
 target 'XCDYouTubeKit iOS Demo' do
@@ -18,7 +18,6 @@ target 'XCDYouTubeKit OS X Demo' do
 end
 
 target 'XCDYouTubeKit tvOS Demo' do
-  plugin 'cocoapods-expert-difficulty'
   platform :tvos, '9.0'
-  pod 'Google-API-Client/YouTube', '~> 1.0.422'
+  pod 'GoogleAPIClient/YouTube', '~> 1.0'
 end

XCDYouTubeKit Demo/Podfile.lock

@@ -1,39 +1,40 @@
 PODS:
-  - CocoaLumberjack (2.0.1):
-    - CocoaLumberjack/Default (= 2.0.1)
-    - CocoaLumberjack/Extensions (= 2.0.1)
-  - CocoaLumberjack/Core (2.0.1)
-  - CocoaLumberjack/Default (2.0.1):
+  - CocoaLumberjack (2.2.0):
+    - CocoaLumberjack/Default (= 2.2.0)
+    - CocoaLumberjack/Extensions (= 2.2.0)
+  - CocoaLumberjack/Core (2.2.0)
+  - CocoaLumberjack/Default (2.2.0):
     - CocoaLumberjack/Core
-  - CocoaLumberjack/Extensions (2.0.1):
+  - CocoaLumberjack/Extensions (2.2.0):
     - 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)
+  - GoogleAPIClient/Core (1.0.3):
+    - GTMSessionFetcher (~> 1.1)
+  - GoogleAPIClient/YouTube (1.0.3):
+    - GoogleAPIClient/Core
+    - GTMSessionFetcher (~> 1.1)
+  - GTMSessionFetcher (1.1.2):
+    - GTMSessionFetcher/Full (= 1.1.2)
+  - GTMSessionFetcher/Core (1.1.2)
+  - GTMSessionFetcher/Full (1.1.2):
+    - GTMSessionFetcher/Core (= 1.1.2)
   - NSLogger (1.5.1):
     - NSLogger/Standard (= 1.5.1)
   - NSLogger/Standard (1.5.1)
-  - XCDLumberjackNSLogger (1.0.1):
-    - CocoaLumberjack (~> 2.0.0)
-    - NSLogger (~> 1.5.1)
+  - XCDLumberjackNSLogger (1.0.2):
+    - CocoaLumberjack (~> 2.0)
+    - NSLogger (~> 1.5)
 
 DEPENDENCIES:
-  - Google-API-Client/YouTube (~> 1.0.422)
-  - XCDLumberjackNSLogger (~> 1.0.0)
+  - GoogleAPIClient/YouTube (~> 1.0)
+  - XCDLumberjackNSLogger (~> 1.0)
 
 SPEC CHECKSUMS:
-  CocoaLumberjack: 019d1361244274a6138c788c6cb80baabc13fb8f
-  Google-API-Client: cb712cf122f1d7fda966de4c2bc551324573366c
-  gtm-http-fetcher: 6d4617e7d343b6e4c082b777541c334eb6f5d81e
-  gtm-oauth2: 2a18b824e4f8a02df6cfe987beb59ae9d9697f9d
+  CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
+  GoogleAPIClient: 06a32889d31c0f1c9ae528e31139ec3680b25e0d
+  GTMSessionFetcher: 765d87b1ff52999f865857c11bcdad516696cc89
   NSLogger: 5ed223a2436df96244e033be750656dacdeec034
-  XCDLumberjackNSLogger: 867392d7b40490e1b15aac9c1acee0952bf33d61
+  XCDLumberjackNSLogger: 0226baa5148a2fa0d18731eee295fbf8f991f7ff
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 9d0d2c79901dca180e90c5f942f01e6e718c8673
+
+COCOAPODS: 1.0.0.beta.8