From 5795399aa8d3c9bc564df4b5c21ded3f3b05ac65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Thu, 26 Nov 2015 08:08:43 +0100 Subject: [PATCH 01/16] Point badges to the develop branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e8c4b49..8b648d27 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## About -[![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) +[![Build Status](https://img.shields.io/travis/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://travis-ci.org/0xced/XCDYouTubeKit) +[![Coverage Status](https://img.shields.io/coveralls/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://coveralls.io/r/0xced/XCDYouTubeKit?branch=develop) [![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)](https://cocoapods.org/pods/XCDYouTubeKit) [![Carthage Compatibility](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage/) From 016741f6b29bdf2a659b246f4e815c48dc6cd3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Thu, 26 Nov 2015 11:23:06 +0100 Subject: [PATCH 02/16] Display framework version in settings for the iOS demo app --- .../iOS Demo/SettingsViewController.m | 4 ++++ .../iOS Demo/en.lproj/MainStoryboard.storyboard | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/XCDYouTubeKit Demo/iOS Demo/SettingsViewController.m b/XCDYouTubeKit Demo/iOS Demo/SettingsViewController.m index dd0b2a23..3948d8a1 100644 --- a/XCDYouTubeKit Demo/iOS Demo/SettingsViewController.m +++ b/XCDYouTubeKit Demo/iOS Demo/SettingsViewController.m @@ -10,6 +10,7 @@ @interface SettingsViewController () @property (nonatomic, weak) IBOutlet UISwitch *playVideoInBackgroundSwitch; @property (nonatomic, weak) IBOutlet UILabel *audioSessionCategoryLabel; +@property (nonatomic, weak) IBOutlet UILabel *versionLabel; @end @@ -21,6 +22,9 @@ - (void) viewDidLoad self.playVideoInBackgroundSwitch.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"PlayVideoInBackground"]; self.audioSessionCategoryLabel.text = [[AVAudioSession sharedInstance] category]; + + NSBundle *bundle = [NSBundle bundleWithIdentifier:@"ch.pitaya.xcdyoutubekit"]; + self.versionLabel.text = [NSString stringWithFormat:@"Version %@ (%@)", [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], [bundle objectForInfoDictionaryKey:@"CFBundleVersion"]]; } #pragma mark - Actions diff --git a/XCDYouTubeKit Demo/iOS Demo/en.lproj/MainStoryboard.storyboard b/XCDYouTubeKit Demo/iOS Demo/en.lproj/MainStoryboard.storyboard index b50392fd..bdae45be 100644 --- a/XCDYouTubeKit Demo/iOS Demo/en.lproj/MainStoryboard.storyboard +++ b/XCDYouTubeKit Demo/iOS Demo/en.lproj/MainStoryboard.storyboard @@ -81,6 +81,22 @@ + + + + + + + + + @@ -95,6 +111,7 @@ + From 326ca4a73a31ce0c1925d8fda9e906db64c28004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Sat, 28 Nov 2015 15:51:08 +0100 Subject: [PATCH 03/16] Upload code coverage to Codecov --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a52403d..0d4d7aa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,12 @@ before_install: install: - gem install xcpretty-travis-formatter --no-rdoc --no-ri --no-document --quiet - sudo easy_install cpp-coveralls + - sudo easy_install codecov 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' + - '[ "$CONFIGURATION" == "Code Coverage" ] && coveralls --include XCDYouTubeKit; codecov --gcov-glob "*XCDYouTubeKit iOS Tests*"' after_failure: - cat xcodebuild.log - cat $TMPDIR/com.apple.dt.XCTest-status/Session*.log From 30a770a5a1da8f4c20163f1f3eacc2908c4f3d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 2 Dec 2015 15:04:16 +0100 Subject: [PATCH 04/16] Touch XCDYouTubeKit project --- XCDYouTubeKit.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XCDYouTubeKit.xcodeproj/project.pbxproj b/XCDYouTubeKit.xcodeproj/project.pbxproj index 72830dd6..ef749788 100644 --- a/XCDYouTubeKit.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ dependencies = ( ); name = "XCDYouTubeKit tvOS"; - productName = "XCDYouTubeKit"; + productName = XCDYouTubeKit; productReference = C215BE971BE2E36600F9783B /* XCDYouTubeKit.framework */; productType = "com.apple.product-type.framework"; }; From 16213c0984a8f1beee45b13ca68ad0ba6dcd16f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 2 Dec 2015 16:18:17 +0100 Subject: [PATCH 05/16] Split coveralls and codecov commands --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0d4d7aa5..2b40c565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,8 @@ 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; codecov --gcov-glob "*XCDYouTubeKit iOS Tests*"' + - '[ "$CONFIGURATION" == "Code Coverage" ] && coveralls --include XCDYouTubeKit' + - '[ "$CONFIGURATION" == "Code Coverage" ] && codecov --gcov-glob "*XCDYouTubeKit iOS Tests*"' after_failure: - cat xcodebuild.log - cat $TMPDIR/com.apple.dt.XCTest-status/Session*.log From 6524f7820dc19cde6545842b97ec248ba4bbe1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 8 Dec 2015 23:39:18 +0100 Subject: [PATCH 06/16] Add iPad Pro app icon --- .../AppIcon.appiconset/Contents.json | 6 ++++++ .../AppIcon.appiconset/Icon-167.png | Bin 0 -> 2724 bytes 2 files changed, 6 insertions(+) create mode 100644 XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Icon-167.png diff --git a/XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json b/XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json index 9134ffce..894b74ee 100644 --- a/XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json @@ -113,6 +113,12 @@ "idiom" : "ipad", "filename" : "Icon-152.png", "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-167.png", + "scale" : "2x" } ], "info" : { diff --git a/XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Icon-167.png b/XCDYouTubeKit Demo/iOS Demo/Supporting Files/Images.xcassets/AppIcon.appiconset/Icon-167.png new file mode 100644 index 0000000000000000000000000000000000000000..4c8bcb478adfeb1f9c115d47b7cc04c848ca3b48 GIT binary patch literal 2724 zcmdT`d00~09>p>(%WQCX7ABIG4MG}D2$WOK<^T?vQ-+EPhw*}XwX~<1+VD(KOAQkX zH7zrvY)+KQf=aY*3Y4W@HRmyHcv#(gd%gSj`@VO+Z=b#QI%}=pu=gM5h?l36y4o5w z5D291;_Tp~n9t9T#S0YgIeNzp#iT^@ak2x|h`@b{%@VS6APof4HkuzwEg{lGpvj720X*dP#!g;XqwczQU5MT{fSkSsLxD+8%m&%%W=&;p2d(MNkQ3IsqU-=6%EW0Sr1C3Y`!1=kq;J zBKgliB-;0?6!pPb;bgceY#aRVM07&rU+MjaYW~YN+1IMR1w$!XgS4mO!|4DO3jlE# z+X#S4g8YJ~(&jTnz|3J5DEQB$zmi4GyCUrYBAJS(%}X%mDENP2Kl1~9@H8NfG2aA? zDFX3b@gw@PBH(WoKce3iDENF=f9UeJBm9ag&Jd%fsOFFRfKg*NM!SJPiV#=8^ho#B?@yw}dl&JJs6_)q7>OAOBDtbpEIM2HQ_ zyi#7T{phx)T5u^xz;jmizPCuzw&0hB{Gno9K-VQD_iAfAA3arNl*soC9?kvW z+s7{lym|{j!ou1Yr6Nm3O|1#3XB|9}TE$Cv&%wd$M3iJvf-q>f_JX z7+R^NS8rexF1P(c*zJ~;>K)GDb=clKx;nx#N=THxnR`%{one?=xq&e^le+ir(&SOY z6Dt;H<@EdV>oW2aMpNM-Q|Pj@fjc)LxqI3Y?Vk1tj^h8bjCjT}HLsF$ zR|5TlARGIK-lG;`bBNd5y=q6#ComG1C&1wp*Qk9>qfeXMCNLPaw6fpK)_8xB%fxVc zpIJm;cY$TkK&R9^t7jtYln?*>8*MP^vlN$}lgSCJ3!Yd5eoCMZeh&SJYCh~#Gxw5w z$trAiTqNYys;!Z$l~5?pD%QSb4vwE5<2Ju5(sg>fO${Zj{bp)Jw1Bjk5Z1L*tf)3pm#{AzuNO_UvHnxnHvI*~5ww)7pjl)#>Xw7%QVyx7F}K}w!rd0Imw1i4#$;=|JHZlS$A zWHW}{J(93sDF@@A{6?=~f5j#J@tz>0#&H8b-BP?4b2Docxg)uIuK9UcS=60#XOD;3 zNjEX(_Dx@+tc=~^j>3Ysy6eO%OszcM#rYMVn~z)7OL@y5*6yV@6-qlu=f;dAMy?rhxghS5A#2y}xjSxb z-YcMQXf}b?bM91X^;MB5Sp%G6Q(E)u@9k{uah;&Y*MkH)kNo}5LM3_5qkihO)v*fGFuYz4QLypRC;L7&N&EA<8=ff1`!q2 z_O3UuqeI0Ci)Pw?D)DQ-YLP+|iLM|lrQ;BWOlcC+85bPPxWV+pbD1yNCn)?`Aa%Al z-7hxj*}cjuxuPon;hXlpa@$+^b$!ukEVuU0z52H-2@_j*(|2VvLqU|x>dE)IM>osS z+RVwTXT*g$mWTtiv7s=;Cv@oKF}Hm8Ge+j@yy#c_;Wt*5%-}nbuDglGoj_f{tf%7u zf6QmNrfPLQN-|^&Vc}ZInAU5&AfR(w@BY){)C<+sjfL{kEgOVBTz3gW8a`=dO5s1@Mq5`*-%zD%g>euld!`yj^q#<({A z3tAuAhA0yML#v93^Y@S9whjK)G^N>b;*4=6mXEN&MiFbIY=8*pkG(6>sdNu63aonA zV%{4Wbn3KqowfCi7)cY(qw8b5SXDJPwzx>QrHwP9lM=}VWzpr=&^I&u?~V1?iE$WrrK3- zHAdG?pI3((as!U&q#-GgO@p?jBfl=kQctk6Yob^Fsx6~uy*4g4 zEJyR)j^wetd8<`(p0AUX3tVp+OO7mbA!zjb>@y0{?EinZpV)Cm=L-AS)5tCJzm6`B Lo(?s3VX6NH?=#xg literal 0 HcmV?d00001 From 7003513456dbbfc382d733859c5bd63ba5779de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Thu, 10 Dec 2015 00:16:46 +0100 Subject: [PATCH 07/16] Add a playground in the demo project --- .../Playground.playground/Contents.swift | 18 ++++++++++++++++++ .../contents.xcplayground | 4 ++++ .../Playground.playground/timeline.xctimeline | 6 ++++++ .../project.pbxproj | 2 ++ 4 files changed, 30 insertions(+) create mode 100644 XCDYouTubeKit Demo/Playground.playground/Contents.swift create mode 100644 XCDYouTubeKit Demo/Playground.playground/contents.xcplayground create mode 100644 XCDYouTubeKit Demo/Playground.playground/timeline.xctimeline diff --git a/XCDYouTubeKit Demo/Playground.playground/Contents.swift b/XCDYouTubeKit Demo/Playground.playground/Contents.swift new file mode 100644 index 00000000..e5353073 --- /dev/null +++ b/XCDYouTubeKit Demo/Playground.playground/Contents.swift @@ -0,0 +1,18 @@ +import XCPlayground +import XCDYouTubeKit + +setenv("XCDYouTubeKitLogLevel", "0", 1) + +var client = XCDYouTubeClient(languageIdentifier: "en") + +client.getVideoWithIdentifier("6v2L2UGZJAM") { (video: XCDYouTubeVideo?, error: NSError?) -> Void in + video + error?.localizedDescription +} + +client.getVideoWithIdentifier("xxxxxxxxxxx") { (video: XCDYouTubeVideo?, error: NSError?) -> Void in + video + error?.localizedDescription +} + +XCPlaygroundPage.currentPage.needsIndefiniteExecution = true diff --git a/XCDYouTubeKit Demo/Playground.playground/contents.xcplayground b/XCDYouTubeKit Demo/Playground.playground/contents.xcplayground new file mode 100644 index 00000000..06828af9 --- /dev/null +++ b/XCDYouTubeKit Demo/Playground.playground/contents.xcplayground @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/XCDYouTubeKit Demo/Playground.playground/timeline.xctimeline b/XCDYouTubeKit Demo/Playground.playground/timeline.xctimeline new file mode 100644 index 00000000..bf468afe --- /dev/null +++ b/XCDYouTubeKit Demo/Playground.playground/timeline.xctimeline @@ -0,0 +1,6 @@ + + + + + diff --git a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj index bb50cfcb..eef5a0b8 100644 --- a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj @@ -139,6 +139,7 @@ C2BA376C192AB32200B27FAD /* MPMoviePlayerController+BackgroundPlayback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPMoviePlayerController+BackgroundPlayback.m"; sourceTree = ""; }; C2C5D2961A6E5AB900F2B3F8 /* VideoPickerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPickerController.h; sourceTree = ""; }; C2C5D2971A6E5AB900F2B3F8 /* VideoPickerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPickerController.m; sourceTree = ""; }; + C2CEABA61C0EFBE80077C5CA /* Playground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground.playground; sourceTree = ""; }; C2CF7CEC1B17737400C356EA /* ContextLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextLogFormatter.h; sourceTree = ""; }; C2CF7CED1B17737400C356EA /* ContextLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextLogFormatter.m; sourceTree = ""; }; C2D627591BE3C648005367FF /* XCDYouTubeKit tvOS Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "XCDYouTubeKit tvOS Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -221,6 +222,7 @@ C274159517F491230026834B = { isa = PBXGroup; children = ( + C2CEABA61C0EFBE80077C5CA /* Playground.playground */, C27415BE17F4CDD80026834B /* iOS Demo */, C2428AD7191C3C1400065504 /* OS X Demo */, C2D6275A1BE3C648005367FF /* tvOS Demo */, From 350e6a7699cd35b7ffb7361967ef5f65be9de0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Thu, 10 Dec 2015 14:04:44 +0100 Subject: [PATCH 08/16] =?UTF-8?q?Use=20Google=E2=80=99s=20official=20worka?= =?UTF-8?q?round=20for=20accessing=20the=20snippet=E2=80=99s=20`videoId`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tvOS Demo/PlaylistCollectionViewController.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/XCDYouTubeKit Demo/tvOS Demo/PlaylistCollectionViewController.m b/XCDYouTubeKit Demo/tvOS Demo/PlaylistCollectionViewController.m index 48eca4b1..9af7bbe2 100644 --- a/XCDYouTubeKit Demo/tvOS Demo/PlaylistCollectionViewController.m +++ b/XCDYouTubeKit Demo/tvOS Demo/PlaylistCollectionViewController.m @@ -71,7 +71,10 @@ - (void) collectionView:(UICollectionView *)collectionView didSelectItemAtIndexP [self presentViewController:playerViewController animated:YES completion:nil]; __weak AVPlayerViewController *weakPlayerViewController = playerViewController; - [[XCDYouTubeClient defaultClient] getVideoWithIdentifier:playlistItem.snippet.resourceId.videoId completionHandler:^(XCDYouTubeVideo * _Nullable video, NSError * _Nullable error) { + // Quoting https://github.com/google/google-api-objectivec-client/issues/92#issuecomment-135566515 + // > For now, apps should just directly access the JSON of that incorrect class instance rather than the properties. + // Change to `playlistItem.snippet.resourceId.videoId` once https://github.com/google/google-api-objectivec-client/pull/109 is merged + [[XCDYouTubeClient defaultClient] getVideoWithIdentifier:playlistItem.snippet.resourceId.JSON[@"videoId"] completionHandler:^(XCDYouTubeVideo * _Nullable video, NSError * _Nullable error) { if (video) { NSDictionary *streamURLs = video.streamURLs; From 45b8edb0e03b25189b28e0d64339c8f1be1ac5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Fri, 11 Dec 2015 00:56:00 +0100 Subject: [PATCH 09/16] Restore CFBundleVersion keys for demo apps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not setting the `CFBundleVersion` Info.plist key is the cause of "The operation couldn’t be completed. (LaunchServicesError error 0.)" errors. Thanks Jeremy Huddleston Sequoia! http://stackoverflow.com/questions/25632886/an-error-was-encountered-while-running-domain-launchserviceserror-code-0/26129829#26129829 --- .../Supporting Files/XCDYouTubeKit OS X Demo-Info.plist | 2 ++ .../iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist | 2 ++ XCDYouTubeKit Demo/tvOS Demo/Supporting Files/Info.plist | 2 ++ 3 files changed, 6 insertions(+) diff --git a/XCDYouTubeKit Demo/OS X Demo/Supporting Files/XCDYouTubeKit OS X Demo-Info.plist b/XCDYouTubeKit Demo/OS X Demo/Supporting Files/XCDYouTubeKit OS X Demo-Info.plist index a5580329..65d76dcf 100644 --- a/XCDYouTubeKit Demo/OS X Demo/Supporting Files/XCDYouTubeKit OS X Demo-Info.plist +++ b/XCDYouTubeKit Demo/OS X Demo/Supporting Files/XCDYouTubeKit OS X Demo-Info.plist @@ -18,6 +18,8 @@ APPL CFBundleShortVersionString $(CURRENT_PROJECT_VERSION) + CFBundleVersion + 0 LSApplicationCategoryType public.app-category.entertainment LSMinimumSystemVersion diff --git a/XCDYouTubeKit Demo/iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist b/XCDYouTubeKit Demo/iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist index ef7533e2..011d3f82 100644 --- a/XCDYouTubeKit Demo/iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist +++ b/XCDYouTubeKit Demo/iOS Demo/Supporting Files/XCDYouTubeKit iOS Demo-Info.plist @@ -22,6 +22,8 @@ APPL CFBundleShortVersionString $(CURRENT_PROJECT_VERSION) + CFBundleVersion + 0 LSRequiresIPhoneOS UIBackgroundModes diff --git a/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/Info.plist b/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/Info.plist index e43283c0..1194c8b2 100644 --- a/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/Info.plist +++ b/XCDYouTubeKit Demo/tvOS Demo/Supporting Files/Info.plist @@ -18,6 +18,8 @@ APPL CFBundleShortVersionString $(CURRENT_PROJECT_VERSION) + CFBundleVersion + 0 LSRequiresIPhoneOS UIMainStoryboardFile From b13b256a5bcf064aca2a0e8275ee3ab69554f0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Fri, 11 Dec 2015 16:24:11 +0100 Subject: [PATCH 10/16] Improve -[XCDYouTubeVideo debugDescription] by sorting streams by itag --- XCDYouTubeKit/XCDYouTubeVideo.m | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/XCDYouTubeKit/XCDYouTubeVideo.m b/XCDYouTubeKit/XCDYouTubeVideo.m index 8c50a5a7..dd111955 100644 --- a/XCDYouTubeKit/XCDYouTubeVideo.m +++ b/XCDYouTubeKit/XCDYouTubeVideo.m @@ -48,6 +48,22 @@ return [query stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; } +static NSString *SortedDictionaryDescription(NSDictionary *dictionary) +{ + NSArray *sortedKeys = [dictionary.allKeys sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) { + return [[obj1 description] compare:[obj2 description] options:NSNumericSearch]; + }]; + + NSMutableString *description = [[NSMutableString alloc] initWithString:@"{\n"]; + for (id key in sortedKeys) + { + [description appendFormat:@"\t%@ \u2192 %@\n", key, dictionary[key]]; + } + [description appendString:@"}"]; + + return [description copy]; +} + @implementation XCDYouTubeVideo static NSDate * ExpirationDate(NSURL *streamURL) @@ -197,7 +213,8 @@ - (NSString *) debugDescription dateComponentsFormatter.unitsStyle = NSDateComponentsFormatterUnitsStyleAbbreviated; NSString *duration = [dateComponentsFormatter stringFromTimeInterval:self.duration] ?: [NSString stringWithFormat:@"%@ seconds", @(self.duration)]; NSString *thumbnailDescription = [NSString stringWithFormat:@"Small thumbnail: %@\nMedium thumbnail: %@\nLarge thumbnail: %@", self.smallThumbnailURL, self.mediumThumbnailURL, self.largeThumbnailURL]; - return [NSString stringWithFormat:@"<%@: %p> %@\nDuration: %@\nExpiration date: %@\n%@\nVideo Streams: %@", self.class, self, self.description, duration, self.expirationDate, thumbnailDescription, self.streamURLs]; + NSString *streamsDescription = SortedDictionaryDescription(self.streamURLs); + return [NSString stringWithFormat:@"<%@: %p> %@\nDuration: %@\nExpiration date: %@\n%@\nStreams: %@", self.class, self, self.description, duration, self.expirationDate, thumbnailDescription, streamsDescription]; } #pragma mark - NSCopying From 931ec6665838568122e3a44513889122f50c6440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Sat, 12 Dec 2015 14:38:27 +0100 Subject: [PATCH 11/16] Improve logging performance --- XCDYouTubeKit/XCDYouTubeLogger.h | 19 +++++------ XCDYouTubeKit/XCDYouTubeLogger.m | 42 +++++++++++------------- XCDYouTubeKit/XCDYouTubeVideoOperation.m | 2 +- XCDYouTubeKit/XCDYouTubeVideoWebpage.m | 2 +- 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/XCDYouTubeKit/XCDYouTubeLogger.h b/XCDYouTubeKit/XCDYouTubeLogger.h index dbc9c1b1..ab3a9045 100644 --- a/XCDYouTubeKit/XCDYouTubeLogger.h +++ b/XCDYouTubeKit/XCDYouTubeLogger.h @@ -16,17 +16,14 @@ typedef NS_OPTIONS(NSUInteger, DDLogFlag) { __attribute__((visibility("hidden"))) @interface XCDYouTubeLogger : NSObject -// Compatible with CocoaLumberjack's DDLog interface -+ (void) log:(BOOL)asynchronous level:(NSUInteger)level flag:(DDLogFlag)flag context:(NSInteger)context file:(const char *)file function:(const char *)function line:(NSUInteger)line tag:(id)tag format:(NSString *)format, ... NS_FORMAT_FUNCTION(9,10); ++ (void) logMessage:(NSString * (^)(void))message flag:(DDLogFlag)flag file:(const char *)file function:(const char *)function line:(NSUInteger)line; @end -extern Class XCDYouTubeLogClass(void); +#define XCDYouTubeLog(_flag, _message) [XCDYouTubeLogger logMessage:(_message) flag:(_flag) file:__FILE__ function:__PRETTY_FUNCTION__ line:__LINE__] -#define XCDYouTubeLog(_flag, _format, ...) [XCDYouTubeLogClass() log:YES level:NSUIntegerMax flag:(_flag) context:(NSInteger)0xced70676 file:__FILE__ function:__PRETTY_FUNCTION__ line:__LINE__ tag:nil format:(_format), ##__VA_ARGS__] - -#define XCDYouTubeLogError(format, ...) XCDYouTubeLog(DDLogFlagError, format, ##__VA_ARGS__) -#define XCDYouTubeLogWarning(format, ...) XCDYouTubeLog(DDLogFlagWarning, format, ##__VA_ARGS__) -#define XCDYouTubeLogInfo(format, ...) XCDYouTubeLog(DDLogFlagInfo, format, ##__VA_ARGS__) -#define XCDYouTubeLogDebug(format, ...) XCDYouTubeLog(DDLogFlagDebug, format, ##__VA_ARGS__) -#define XCDYouTubeLogVerbose(format, ...) XCDYouTubeLog(DDLogFlagVerbose, format, ##__VA_ARGS__) -#define XCDYouTubeLogTrace(format, ...) XCDYouTubeLog(DDLogFlagTrace, format, ##__VA_ARGS__) +#define XCDYouTubeLogError(format, ...) XCDYouTubeLog(DDLogFlagError, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; })) +#define XCDYouTubeLogWarning(format, ...) XCDYouTubeLog(DDLogFlagWarning, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; })) +#define XCDYouTubeLogInfo(format, ...) XCDYouTubeLog(DDLogFlagInfo, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; })) +#define XCDYouTubeLogDebug(format, ...) XCDYouTubeLog(DDLogFlagDebug, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; })) +#define XCDYouTubeLogVerbose(format, ...) XCDYouTubeLog(DDLogFlagVerbose, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; })) +#define XCDYouTubeLogTrace(format, ...) XCDYouTubeLog(DDLogFlagTrace, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; })) diff --git a/XCDYouTubeKit/XCDYouTubeLogger.m b/XCDYouTubeKit/XCDYouTubeLogger.m index aeb7b183..ce22ede6 100644 --- a/XCDYouTubeKit/XCDYouTubeLogger.m +++ b/XCDYouTubeKit/XCDYouTubeLogger.m @@ -4,31 +4,29 @@ #import "XCDYouTubeLogger.h" +@protocol XCDYouTubeLogger_DDLog +// Copied from CocoaLumberjack's DDLog interface ++ (void) log:(BOOL)asynchronous message:(NSString *)message level:(NSUInteger)level flag:(DDLogFlag)flag context:(NSInteger)context file:(const char *)file function:(const char *)function line:(NSUInteger)line tag:(id)tag; +@end + @implementation XCDYouTubeLogger -+ (void) log:(BOOL)asynchronous level:(NSUInteger)level flag:(DDLogFlag)flag context:(NSInteger)context file:(const char *)file function:(const char *)function line:(NSUInteger)line tag:(id)tag format:(NSString *)format, ... ++ (void) logMessage:(NSString * (^)(void))message flag:(DDLogFlag)flag file:(const char *)file function:(const char *)function line:(NSUInteger)line { - char *logLevelString = getenv("XCDYouTubeKitLogLevel"); - NSUInteger logLevel = logLevelString ? strtoul(logLevelString, NULL, 0) : DDLogFlagError | DDLogFlagWarning; - if (!(flag & logLevel)) - return; - - va_list arguments; - va_start(arguments, format); - NSLog(@"[XCDYouTubeKit] %@", [[NSString alloc] initWithFormat:format arguments:arguments]); - va_end(arguments); + Class DDLogClass = NSClassFromString(@"DDLog"); + if ([DDLogClass respondsToSelector:@selector(log:message:level:flag:context:file:function:line:tag:)]) + { + [DDLogClass log:YES message:message() level:NSUIntegerMax flag:flag context:(NSInteger)0xced70676 file:file function:function line:line tag:nil]; + } + else + { + char *logLevelString = getenv("XCDYouTubeKitLogLevel"); + NSUInteger logLevel = logLevelString ? strtoul(logLevelString, NULL, 0) : DDLogFlagError | DDLogFlagWarning; + if (!(flag & logLevel)) + return; + + NSLog(@"[XCDYouTubeKit] %@", message()); + } } @end - -Class XCDYouTubeLogClass(void) -{ - static Class logClass; - static dispatch_once_t once; - dispatch_once(&once, ^{ - logClass = NSClassFromString(@"DDLog"); - if (![logClass methodSignatureForSelector:@selector(log:level:flag:context:file:function:line:tag:format:)]) - logClass = [XCDYouTubeLogger class]; - }); - return logClass; -} diff --git a/XCDYouTubeKit/XCDYouTubeVideoOperation.m b/XCDYouTubeKit/XCDYouTubeVideoOperation.m index dba90ae3..b789b2be 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoOperation.m +++ b/XCDYouTubeKit/XCDYouTubeVideoOperation.m @@ -265,7 +265,7 @@ - (void) finishWithVideo:(XCDYouTubeVideo *)video { self.video = video; XCDYouTubeLogInfo(@"Video operation finished with success: %@", video); - XCDYouTubeLogDebug(@"%@", video.debugDescription); + XCDYouTubeLogDebug(@"%@", ^{ return video.debugDescription; }()); [self finish]; } diff --git a/XCDYouTubeKit/XCDYouTubeVideoWebpage.m b/XCDYouTubeKit/XCDYouTubeVideoWebpage.m index 8983286e..1fe7bf68 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoWebpage.m +++ b/XCDYouTubeKit/XCDYouTubeVideoWebpage.m @@ -38,7 +38,7 @@ - (NSString *) html { CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((__bridge CFStringRef)self.response.textEncodingName ?: CFSTR("")); _html = CFBridgingRelease(CFStringCreateWithBytes(kCFAllocatorDefault, self.data.bytes, (CFIndex)self.data.length, encoding != kCFStringEncodingInvalidId ? encoding : kCFStringEncodingISOLatin1, false)); - XCDYouTubeLogTrace(@"%@", _html); + XCDYouTubeLogTrace(@"%@", self->_html); } return _html; } From 23afc3565f67a71c7c2d5b692b91acc92966aac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Sat, 12 Dec 2015 18:29:26 +0100 Subject: [PATCH 12/16] Use the Xcode 7.2 image on Travis --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b40c565..3552e40a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode7.1 +osx_image: xcode7.2 language: objective-c env: matrix: @@ -9,13 +9,14 @@ env: - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=8.4" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library"' - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.0" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library"' - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.1" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library"' - - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.1" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" IPHONEOS_DEPLOYMENT_TARGET="9.1"' + - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.2" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library"' + - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.2" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" IPHONEOS_DEPLOYMENT_TARGET="9.2"' - 'DESTINATION="platform=iOS Simulator,name=iPhone 4s" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" RUN_CLANG_STATIC_ANALYZER="YES"' - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s" CONFIGURATION="Release" SCHEME="XCDYouTubeKit iOS Static Library" RUN_CLANG_STATIC_ANALYZER="YES"' - '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=OS X" CONFIGURATION="Release" SCHEME="XCDYouTubeKit OS X" MACOSX_DEPLOYMENT_TARGET="10.10"' + - 'DESTINATION="platform=OS X" CONFIGURATION="Release" SCHEME="XCDYouTubeKit OS X" MACOSX_DEPLOYMENT_TARGET="10.11"' - 'DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p" CONFIGURATION="Release" SCHEME="XCDYouTubeKit tvOS" RUN_CLANG_STATIC_ANALYZER="YES"' before_install: - xcrun simctl list @@ -33,4 +34,4 @@ after_failure: - cat xcodebuild.log - cat $TMPDIR/com.apple.dt.XCTest-status/Session*.log - cat ~/Library/Logs/DiagnosticReports/xctest*.crash - - sleep 5 \ No newline at end of file + - sleep 5 From e7e303cde3e469f588f49c020c76102be4f05699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 15 Dec 2015 20:39:48 +0100 Subject: [PATCH 13/16] Restore iOS deployment target to 7.0 The iOS deployment target was accidentally updated to 8.0 in 6747311c000795c06c11ee413e62daa8eb3e2cdd where only the demo app was supposed to be updated to 8.0. Fixes #220 --- XCDYouTubeKit.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/XCDYouTubeKit.xcodeproj/project.pbxproj b/XCDYouTubeKit.xcodeproj/project.pbxproj index ef749788..aee25c74 100644 --- a/XCDYouTubeKit.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit.xcodeproj/project.pbxproj @@ -1171,7 +1171,7 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = XCDYouTubeKit/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = ch.pitaya.xcdyoutubekit; @@ -1231,7 +1231,7 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = XCDYouTubeKit/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = ch.pitaya.xcdyoutubekit; PRODUCT_NAME = XCDYouTubeKit; @@ -1311,7 +1311,7 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = XCDYouTubeKit/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = ch.pitaya.xcdyoutubekit; From 6c62f060a612cf3016bf620a86d8aae1a7becb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 15 Dec 2015 20:49:43 +0100 Subject: [PATCH 14/16] Update CHANGELOG for version 2.4.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a48115d2..8a8482ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +#### Version 2.4.2 + +* Restored iOS deployment target to 7.0. (#220) +* Improved `-[XCDYouTubeVideo debugDescription]` by sorting streams by itag. +* Improved logging performance. + #### Version 2.4.1 * Added the CFBundleVersion key in the Info.plist file for iTunes Connect validation. (#214) From 41f4733c62fe70d7afb4802cbf131a4e6f5c4c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 15 Dec 2015 20:51:58 +0100 Subject: [PATCH 15/16] Update version to 2.4.2 --- README.md | 4 ++-- .../XCDYouTubeKit Demo.xcodeproj/project.pbxproj | 4 ++-- XCDYouTubeKit.podspec | 2 +- XCDYouTubeKit.xcodeproj/project.pbxproj | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8b648d27..c2c3f2e9 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,13 @@ XCDYouTubeKit is available through CocoaPods and Carthage. CocoaPods: ```ruby -pod "XCDYouTubeKit", "~> 2.4.1" +pod "XCDYouTubeKit", "~> 2.4.2" ``` Carthage: ```objc -github "0xced/XCDYouTubeKit" ~> 2.4.1 +github "0xced/XCDYouTubeKit" ~> 2.4.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: diff --git a/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj b/XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj index eef5a0b8..e2d50473 100644 --- 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.4.1; + CURRENT_PROJECT_VERSION = 2.4.2; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -805,7 +805,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 2.4.1; + CURRENT_PROJECT_VERSION = 2.4.2; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; diff --git a/XCDYouTubeKit.podspec b/XCDYouTubeKit.podspec index 69e35ed1..57449153 100644 --- a/XCDYouTubeKit.podspec +++ b/XCDYouTubeKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "XCDYouTubeKit" - s.version = "2.4.1" + s.version = "2.4.2" 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 index aee25c74..e3268f17 100644 --- a/XCDYouTubeKit.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit.xcodeproj/project.pbxproj @@ -1141,10 +1141,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.4.1; + DYLIB_CURRENT_VERSION = 2.4.2; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1207,10 +1207,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.4.1; + DYLIB_CURRENT_VERSION = 2.4.2; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1279,10 +1279,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.4.1; + DYLIB_CURRENT_VERSION = 2.4.2; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; From 8d71aeb059b2633384086a459bde85b80005716a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 15 Dec 2015 20:51:58 +0100 Subject: [PATCH 16/16] Point badges to the master branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c2c3f2e9..2d7ab029 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## About -[![Build Status](https://img.shields.io/travis/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://travis-ci.org/0xced/XCDYouTubeKit) -[![Coverage Status](https://img.shields.io/coveralls/0xced/XCDYouTubeKit/develop.svg?style=flat)](https://coveralls.io/r/0xced/XCDYouTubeKit?branch=develop) +[![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)](http://cocoadocs.org/docsets/XCDYouTubeKit/) [![Pod Version](https://img.shields.io/cocoapods/v/XCDYouTubeKit.svg?style=flat)](https://cocoapods.org/pods/XCDYouTubeKit) [![Carthage Compatibility](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage/)