Merge pull request #434 from ParsePlatform/nlutsenko.tvos.device

Fix PFDevice, PFApplication to compile for tvOS.

Author: nlutsenko

Parse.xcodeproj/xcshareddata/xcschemes/Parse-tvOS.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "815F22AF1BD04D150054659F"
-               BuildableName = "Parse-tvOS.framework"
+               BuildableName = "Parse.framework"
                BlueprintName = "Parse-tvOS"
                ReferencedContainer = "container:Parse.xcodeproj">
             </BuildableReference>
@@ -46,7 +46,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "815F22AF1BD04D150054659F"
-            BuildableName = "Parse-tvOS.framework"
+            BuildableName = "Parse.framework"
             BlueprintName = "Parse-tvOS"
             ReferencedContainer = "container:Parse.xcodeproj">
          </BuildableReference>
@@ -64,7 +64,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "815F22AF1BD04D150054659F"
-            BuildableName = "Parse-tvOS.framework"
+            BuildableName = "Parse.framework"
             BlueprintName = "Parse-tvOS"
             ReferencedContainer = "container:Parse.xcodeproj">
          </BuildableReference>

Parse/Internal/PFApplication.h

@@ -11,11 +11,11 @@
 
 #import <Parse/PFConstants.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS || TARGET_OS_TV
 #import <UIKit/UIKit.h>
 #elif TARGET_OS_WATCH
 @class UIApplication;
-#elif TARGET_OS_MAC
+#elif PF_TARGET_OS_OSX
 #import <AppKit/AppKit.h>
 @compatibility_alias UIApplication NSApplication;
 #endif

Parse/Internal/PFApplication.m

@@ -9,9 +9,9 @@
 
 #import "PFApplication.h"
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS || TARGET_OS_TV
 #import <UIKit/UIKit.h>
-#elif !TARGET_OS_WATCH && TARGET_OS_MAC
+#elif PF_TARGET_OS_OSX
 #import <AppKit/AppKit.h>
 #endif
 
@@ -47,11 +47,11 @@ - (BOOL)isExtensionEnvironment {
 }
 
 - (NSInteger)iconBadgeNumber {
-#if TARGET_OS_WATCH
+#if TARGET_OS_WATCH || TARGET_OS_TV
     return 0;
 #elif TARGET_OS_IOS
     return self.systemApplication.applicationIconBadgeNumber;
-#elif TARGET_OS_MAC
+#elif PF_TARGET_OS_OSX
     // Make sure not to use `NSApp` here, because it doesn't work sometimes,
     // `NSApplication +sharedApplication` does though.
     NSString *badgeLabel = [[NSApplication sharedApplication] dockTile].badgeLabel;
@@ -75,7 +75,7 @@ - (void)setIconBadgeNumber:(NSInteger)iconBadgeNumber {
     if (self.iconBadgeNumber != iconBadgeNumber) {
 #if TARGET_OS_IOS
         self.systemApplication.applicationIconBadgeNumber = iconBadgeNumber;
-#elif !TARGET_OS_WATCH
+#elif PF_TARGET_OS_OSX
         [[NSApplication sharedApplication] dockTile].badgeLabel = [@(iconBadgeNumber) stringValue];
 #endif
     }

Parse/Internal/PFDevice.m

@@ -13,9 +13,9 @@
 
 #if TARGET_OS_WATCH
 #import <WatchKit/WatchKit.h>
-#elif TARGET_OS_IOS
+#elif TARGET_OS_IOS || TARGET_OS_TV
 #import <UIKit/UIKit.h>
-#elif TARGET_OS_MAC
+#elif PF_TARGET_OS_OSX
 #import <CoreServices/CoreServices.h>
 #endif
 
@@ -85,13 +85,13 @@ - (NSString *)operatingSystemFullVersion {
 - (NSString *)operatingSystemVersion {
 #if TARGET_OS_IOS
     return [UIDevice currentDevice].systemVersion;
-#elif TARGET_OS_WATCH
+#elif TARGET_OS_WATCH || TARGET_OS_TV
     NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
     return [NSString stringWithFormat:@"%d.%d.%d",
             (int)version.majorVersion,
             (int)version.minorVersion,
             (int)version.patchVersion];
-#elif TARGET_OS_MAC
+#elif PF_TARGET_OS_OSX
     NSProcessInfo *info = [NSProcessInfo processInfo];
     if ([info respondsToSelector:@selector(operatingSystemVersion)]) {
         NSOperatingSystemVersion version = info.operatingSystemVersion;