Skip to content

Commit fd78796

Browse files
committed
Fix PFDevice, PFApplication to compile for tvOS.
1 parent 06ed95f commit fd78796

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "815F22AF1BD04D150054659F"
18-
BuildableName = "Parse-tvOS.framework"
18+
BuildableName = "Parse.framework"
1919
BlueprintName = "Parse-tvOS"
2020
ReferencedContainer = "container:Parse.xcodeproj">
2121
</BuildableReference>
@@ -46,7 +46,7 @@
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
4848
BlueprintIdentifier = "815F22AF1BD04D150054659F"
49-
BuildableName = "Parse-tvOS.framework"
49+
BuildableName = "Parse.framework"
5050
BlueprintName = "Parse-tvOS"
5151
ReferencedContainer = "container:Parse.xcodeproj">
5252
</BuildableReference>
@@ -64,7 +64,7 @@
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
6666
BlueprintIdentifier = "815F22AF1BD04D150054659F"
67-
BuildableName = "Parse-tvOS.framework"
67+
BuildableName = "Parse.framework"
6868
BlueprintName = "Parse-tvOS"
6969
ReferencedContainer = "container:Parse.xcodeproj">
7070
</BuildableReference>

Parse/Internal/PFApplication.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
#import <Parse/PFConstants.h>
1313

14-
#if TARGET_OS_IOS
14+
#if TARGET_OS_IOS || TARGET_OS_TV
1515
#import <UIKit/UIKit.h>
1616
#elif TARGET_OS_WATCH
1717
@class UIApplication;
18-
#elif TARGET_OS_MAC
18+
#elif PF_TARGET_OS_OSX
1919
#import <AppKit/AppKit.h>
2020
@compatibility_alias UIApplication NSApplication;
2121
#endif

Parse/Internal/PFApplication.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#import "PFApplication.h"
1111

12-
#if TARGET_OS_IOS
12+
#if TARGET_OS_IOS || TARGET_OS_TV
1313
#import <UIKit/UIKit.h>
14-
#elif !TARGET_OS_WATCH && TARGET_OS_MAC
14+
#elif PF_TARGET_OS_OSX
1515
#import <AppKit/AppKit.h>
1616
#endif
1717

@@ -47,11 +47,11 @@ - (BOOL)isExtensionEnvironment {
4747
}
4848

4949
- (NSInteger)iconBadgeNumber {
50-
#if TARGET_OS_WATCH
50+
#if TARGET_OS_WATCH || TARGET_OS_TV
5151
return 0;
5252
#elif TARGET_OS_IOS
5353
return self.systemApplication.applicationIconBadgeNumber;
54-
#elif TARGET_OS_MAC
54+
#elif PF_TARGET_OS_OSX
5555
// Make sure not to use `NSApp` here, because it doesn't work sometimes,
5656
// `NSApplication +sharedApplication` does though.
5757
NSString *badgeLabel = [[NSApplication sharedApplication] dockTile].badgeLabel;
@@ -75,7 +75,7 @@ - (void)setIconBadgeNumber:(NSInteger)iconBadgeNumber {
7575
if (self.iconBadgeNumber != iconBadgeNumber) {
7676
#if TARGET_OS_IOS
7777
self.systemApplication.applicationIconBadgeNumber = iconBadgeNumber;
78-
#elif !TARGET_OS_WATCH
78+
#elif PF_TARGET_OS_OSX
7979
[[NSApplication sharedApplication] dockTile].badgeLabel = [@(iconBadgeNumber) stringValue];
8080
#endif
8181
}

Parse/Internal/PFDevice.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
#if TARGET_OS_WATCH
1515
#import <WatchKit/WatchKit.h>
16-
#elif TARGET_OS_IOS
16+
#elif TARGET_OS_IOS || TARGET_OS_TV
1717
#import <UIKit/UIKit.h>
18-
#elif TARGET_OS_MAC
18+
#elif PF_TARGET_OS_OSX
1919
#import <CoreServices/CoreServices.h>
2020
#endif
2121

@@ -85,13 +85,13 @@ - (NSString *)operatingSystemFullVersion {
8585
- (NSString *)operatingSystemVersion {
8686
#if TARGET_OS_IOS
8787
return [UIDevice currentDevice].systemVersion;
88-
#elif TARGET_OS_WATCH
88+
#elif TARGET_OS_WATCH || TARGET_OS_TV
8989
NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
9090
return [NSString stringWithFormat:@"%d.%d.%d",
9191
(int)version.majorVersion,
9292
(int)version.minorVersion,
9393
(int)version.patchVersion];
94-
#elif TARGET_OS_MAC
94+
#elif PF_TARGET_OS_OSX
9595
NSProcessInfo *info = [NSProcessInfo processInfo];
9696
if ([info respondsToSelector:@selector(operatingSystemVersion)]) {
9797
NSOperatingSystemVersion version = info.operatingSystemVersion;

0 commit comments

Comments
 (0)