From 00b3f3cb3c36a3901682347641ea78c5d9fc711b Mon Sep 17 00:00:00 2001 From: Eric Vargas Date: Tue, 14 Jan 2020 16:35:44 -0800 Subject: [PATCH 1/3] [Cocoapods] Update Podfile of sample app The current Podfile of the sample app does not work with Cocoapods v1.8.4. Updated it so we can build the sample app. --- Project/youtube-player-ios-example/Podfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Project/youtube-player-ios-example/Podfile b/Project/youtube-player-ios-example/Podfile index de92228..fa8dc2d 100644 --- a/Project/youtube-player-ios-example/Podfile +++ b/Project/youtube-player-ios-example/Podfile @@ -12,8 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -pod "youtube-ios-player-helper", :path => "../../youtube-ios-player-helper.podspec" +platform :ios, '11.0' +inhibit_all_warnings! +use_frameworks! -target "youtube-player-ios-exampleTests", :exclusive => true do +target "youtube-player-ios-example" do + pod "youtube-ios-player-helper", :path => "../../youtube-ios-player-helper.podspec" + + target "youtube-player-ios-exampleTests" do pod "OCMock", "3.1.2" + end end From a5b6660ef136b3a6ef2b66a6e8f4c719196b6d17 Mon Sep 17 00:00:00 2001 From: Eric Vargas Date: Tue, 14 Jan 2020 16:37:24 -0800 Subject: [PATCH 2/3] [Cocoapods] Change import syntax of Pod classes Change the syntax of the imports of the Pod we use in the sample app. --- .../youtube-player-ios-example/PlaylistViewController.h | 4 ++-- .../youtube-player-ios-example/SingleVideoViewController.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Project/youtube-player-ios-example/youtube-player-ios-example/PlaylistViewController.h b/Project/youtube-player-ios-example/youtube-player-ios-example/PlaylistViewController.h index a99a2be..ac6c632 100644 --- a/Project/youtube-player-ios-example/youtube-player-ios-example/PlaylistViewController.h +++ b/Project/youtube-player-ios-example/youtube-player-ios-example/PlaylistViewController.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "YTPlayerView.h" +#import @interface PlaylistViewController : UIViewController @@ -26,4 +26,4 @@ - (IBAction)buttonPressed:(id)sender; -@end \ No newline at end of file +@end diff --git a/Project/youtube-player-ios-example/youtube-player-ios-example/SingleVideoViewController.h b/Project/youtube-player-ios-example/youtube-player-ios-example/SingleVideoViewController.h index a97023b..2609581 100644 --- a/Project/youtube-player-ios-example/youtube-player-ios-example/SingleVideoViewController.h +++ b/Project/youtube-player-ios-example/youtube-player-ios-example/SingleVideoViewController.h @@ -14,7 +14,7 @@ #import -#import "YTPlayerView.h" +#import @interface SingleVideoViewController : UIViewController @@ -33,4 +33,4 @@ - (IBAction)buttonPressed:(id)sender; -@end \ No newline at end of file +@end From feafb133b1196e35deecee4456796b81bd66f9a3 Mon Sep 17 00:00:00 2001 From: Eric Vargas Date: Tue, 14 Jan 2020 16:39:57 -0800 Subject: [PATCH 3/3] Use iOS 11 in sample app project We were still building against iOS 6.x in the sample app. Changed that to iOS 11. --- .../youtube-player-ios-example.xcodeproj/project.pbxproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Project/youtube-player-ios-example/youtube-player-ios-example.xcodeproj/project.pbxproj b/Project/youtube-player-ios-example/youtube-player-ios-example.xcodeproj/project.pbxproj index 28a361e..d32b646 100644 --- a/Project/youtube-player-ios-example/youtube-player-ios-example.xcodeproj/project.pbxproj +++ b/Project/youtube-player-ios-example/youtube-player-ios-example.xcodeproj/project.pbxproj @@ -59,7 +59,6 @@ 4D69941B18E22EE10073680F /* PlaylistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistViewController.h; sourceTree = ""; }; 4D69941C18E22EE10073680F /* PlaylistViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistViewController.m; sourceTree = ""; }; 4D69942118E22F000073680F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 5EDBAF28CE586F953081FFD5 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; 614CB957CD094425884C83E1 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 97FE8C7A7A914485BBD9A3D4 /* libPods-youtube-player-ios-exampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-youtube-player-ios-exampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 9F1A73947F21B4AC48269A4E /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; @@ -243,6 +242,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -470,6 +470,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "youtube-player-ios-example/youtube-player-ios-example-Prefix.pch"; INFOPLIST_FILE = "youtube-player-ios-example/youtube-player-ios-example-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -485,6 +486,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "youtube-player-ios-example/youtube-player-ios-example-Prefix.pch"; INFOPLIST_FILE = "youtube-player-ios-example/youtube-player-ios-example-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app;