Merge pull request #59 from neonichu/tvos-support

Add tvOS support to existing Cocoa Touch targets.
boredzo · Nov 30, 2015 · 590e7cf · 590e7cf
2 parents 43210ea + b56be72
commit 590e7cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode7.1
 before_install:
     - sudo easy_install cpp-coveralls
 
@@ -7,6 +8,7 @@ before_script:
 script:
     - xcodebuild test -scheme 'ISO8601ForCocoa' SRCROOT=../build OBJROOT=../build SHARED_PRECOMPS_DIR=../build
     - xcodebuild test -scheme 'ISO8601ForCocoaTouch' -destination 'name=iPhone 5s' SRCROOT=../build OBJROOT=../build SHARED_PRECOMPS_DIR=../build
+    - xcodebuild test -scheme 'ISO8601ForCocoaTouch' -destination 'name=Apple TV 1080p' SRCROOT=../build OBJROOT=../build SHARED_PRECOMPS_DIR=../build
 after_success:
     - cd ..
     - coveralls -x '.m'
diff --git a/ISO8601ForCocoa/ISO8601ForCocoa.xcodeproj/project.pbxproj b/ISO8601ForCocoa/ISO8601ForCocoa.xcodeproj/project.pbxproj
@@ -643,6 +643,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 			};
 			name = Debug;
 		};
@@ -662,6 +663,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -685,6 +687,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 			};
 			name = Debug;
 		};
@@ -707,6 +710,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/ISO8601ForCocoa/ISO8601ForCocoaTests/ISO8601ForCocoaCalendarDateTests.m b/ISO8601ForCocoa/ISO8601ForCocoaTests/ISO8601ForCocoaCalendarDateTests.m
@@ -14,6 +14,10 @@
 #import "PRHNamedCharacter.h"
 #include <vis.h>
 
+#ifndef TARGET_OS_TV
+#define TARGET_OS_TV 0
+#endif
+
 static const NSTimeInterval gSecondsPerHour = 3600.0;
 
 @interface ISO8601ForCocoaCalendarDateTests ()
@@ -306,7 +310,11 @@ - (void) testParsingDateWithTimeOnly {
 - (void) testUnparsingDatesWithoutTime {
 	_iso8601DateFormatter.includeTime = false;
 
+#if TARGET_OS_TV
+    NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+#else
 	NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+#endif
 	XCTAssertNotNil(calendar, @"Couldn't create Gregorian calendar with which to set up date-unparsing tests");
 	NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
 	XCTAssertNotNil(calendar, @"Couldn't create C/POSIX locale with which to set up date-unparsing tests");