parse-community · flovilmart · Dec 16, 2015 · Dec 16, 2015
diff --git a/Parse.podspec b/Parse.podspec
@@ -29,15 +29,7 @@ Pod::Spec.new do |s|
                         'Parse/Internal/Purchase/**/*.{h,m}',
                         'Parse/Internal/PFMemoryEventuallyQueue.{h,m}'
   s.tvos.exclude_files = 'Parse/PFNetworkActivityIndicatorManager.{h,m}',
-                         'Parse/PFPush.{h,m}',
-                         'Parse/PFInstallation.{h,m}',
-                         'Parse/Internal/PFAlertView.{h,m}',
-                         'Parse/Internal/Push/**/*.{h,m}',
-                         'Parse/Internal/Installation/Controller/*.{h,m}',
-                         'Parse/Internal/Installation/Constants/*.{h,m}',
-                         'Parse/Internal/Installation/CurrentInstallationController/*.{h,m}',
-                         'Parse/Internal/Installation/PFInstallationPrivate.h',
-                         'Parse/Internal/Commands/PFRESTPushCommand.{h,m}'
+                         'Parse/Internal/PFAlertView.{h,m}'
   s.watchos.exclude_files = 'Parse/PFNetworkActivityIndicatorManager.{h,m}',
                             'Parse/PFProduct.{h,m}',
                             'Parse/PFPurchase.{h,m}',

diff --git a/Parse.xcodeproj/project.pbxproj b/Parse.xcodeproj/project.pbxproj
diff --git a/Parse/Internal/Commands/PFRESTPushCommand.h b/Parse/Internal/Commands/PFRESTPushCommand.h
@@ -11,14 +11,13 @@
 
 #import <Parse/PFConstants.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFPushState;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
+PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
 
 + (instancetype)sendPushCommandWithPushState:(PFPushState *)state
                                 sessionToken:(nullable NSString *)sessionToken;

diff --git a/Parse/Internal/Installation/Controller/PFInstallationController.h b/Parse/Internal/Installation/Controller/PFInstallationController.h
@@ -12,12 +12,11 @@
 #import "PFCoreDataProvider.h"
 #import "PFObjectControlling.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
+PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
 
 @property (nonatomic, weak, readonly) id<PFObjectControllerProvider, PFCurrentInstallationControllerProvider> dataSource;
 

diff --git a/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h b/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h
@@ -16,7 +16,6 @@
 #import "PFDataProvider.h"
 #import "PFMacros.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 extern NSString *const PFCurrentInstallationFileName;
@@ -25,7 +24,7 @@ extern NSString *const PFCurrentInstallationPinName;
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 @class PFInstallation;
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
+PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
 
 @property (nonatomic, weak, readonly) id<PFInstallationIdentifierStoreProvider> commonDataSource;
 @property (nonatomic, weak, readonly) id<PFObjectFilePersistenceControllerProvider> coreDataSource;

diff --git a/Parse/Internal/Installation/PFInstallationPrivate.h b/Parse/Internal/Installation/PFInstallationPrivate.h
@@ -11,7 +11,6 @@
 
 #import <Parse/PFInstallation.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @interface PFInstallation (Private)

diff --git a/Parse/Internal/PFCoreManager.h b/Parse/Internal/PFCoreManager.h
@@ -47,7 +47,7 @@ PFObjectFilePersistenceControllerProvider,
 PFPinningObjectStoreProvider,
 PFObjectLocalIdStoreProvider,
 PFUserAuthenticationControllerProvider,
-#if !TARGET_OS_TV && !TARGET_OS_WATCH
+#if !TARGET_OS_WATCH
 PFInstallationControllerProvider,
 PFCurrentInstallationControllerProvider,
 #endif

diff --git a/Parse/Internal/PFCoreManager.m b/Parse/Internal/PFCoreManager.m
@@ -30,7 +30,7 @@
 #import "PFUserAuthenticationController.h"
 #import "PFUserController.h"
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 #import "PFCurrentInstallationController.h"
 #import "PFInstallationController.h"
 #endif
@@ -62,7 +62,7 @@ @implementation PFCoreManager
 @synthesize currentUserController = _currentUserController;
 @synthesize userController = _userController;
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 @synthesize currentInstallationController = _currentInstallationController;
 @synthesize installationController = _installationController;
 #endif
@@ -361,7 +361,7 @@ - (void)setSessionController:(PFSessionController *)sessionController {
     });
 }
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 
 ///--------------------------------------
 #pragma mark - Current Installation Controller
@@ -419,7 +419,7 @@ - (void)setCurrentUserController:(PFCurrentUserController *)currentUserControlle
     });
 }
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 
 ///--------------------------------------
 #pragma mark - Installation Controller

diff --git a/Parse/Internal/ParseManager.h b/Parse/Internal/ParseManager.h
@@ -40,7 +40,7 @@ PFInstallationIdentifierStoreProvider>
 
 @property (nonatomic, strong, readonly) PFCoreManager *coreManager;
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 @property (nonatomic, strong) PFPushManager *pushManager;
 #endif
 

diff --git a/Parse/Internal/ParseManager.m b/Parse/Internal/ParseManager.m
@@ -28,7 +28,7 @@
 #import "PFURLSessionCommandRunner.h"
 #import "PFPersistenceController.h"
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 #import "PFPushManager.h"
 #import "PFInstallation.h"
 #endif
@@ -75,7 +75,7 @@ @implementation ParseManager
 @synthesize keyValueCache = _keyValueCache;
 @synthesize coreManager = _coreManager;
 @synthesize analyticsController = _analyticsController;
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 @synthesize pushManager = _pushManager;
 #endif
 #if TARGET_OS_IOS
@@ -360,7 +360,7 @@ - (void)unloadCoreManager {
     });
 }
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 
 #pragma mark PushManager
 
@@ -437,7 +437,7 @@ - (BFTask *)preloadDiskObjectsToMemoryAsync {
         @strongify(self);
         [PFUser currentUser];
         [PFConfig currentConfig];
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
         [PFInstallation currentInstallation];
 #endif
 

diff --git a/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h b/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h
@@ -13,14 +13,13 @@
 
 #import "PFCoreDataProvider.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
 
 @property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> dataSource;
 

diff --git a/Parse/Internal/Push/Controller/PFPushController.h b/Parse/Internal/Push/Controller/PFPushController.h
@@ -11,7 +11,6 @@
 
 #import <Parse/PFConstants.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class BFTask PF_GENERIC(__covariant BFGenericType);
@@ -20,7 +19,7 @@ PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
 
 @property (nonatomic, strong, readonly) id<PFCommandRunning> commandRunner;
 

diff --git a/Parse/Internal/Push/Manager/PFPushManager.h b/Parse/Internal/Push/Manager/PFPushManager.h
@@ -14,15 +14,14 @@
 #import "PFCoreDataProvider.h"
 #import "PFDataProvider.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFPushChannelsController;
 @class PFPushController;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushManager : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushManager : NSObject
 
 @property (nonatomic, weak, readonly) id<PFCommandRunnerProvider> commonDataSource;
 @property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> coreDataSource;

diff --git a/Parse/Internal/Push/PFPushPrivate.h b/Parse/Internal/Push/PFPushPrivate.h
@@ -13,7 +13,6 @@
 
 #import "PFMacros.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/Parse/Internal/Push/State/PFMutablePushState.h b/Parse/Internal/Push/State/PFMutablePushState.h
@@ -9,12 +9,11 @@
 
 #import "PFPushState.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
+PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
 
 @property (nullable, nonatomic, copy, readwrite) NSSet *channels;
 @property (nullable, nonatomic, copy, readwrite) PFQueryState *queryState;

diff --git a/Parse/Internal/Push/State/PFPushState.h b/Parse/Internal/Push/State/PFPushState.h
@@ -13,14 +13,13 @@
 
 #import "PFBaseState.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFQueryState;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
+PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
 
 @property (nullable, nonatomic, copy, readonly) NSSet *channels;
 @property (nullable, nonatomic, copy, readonly) PFQueryState *queryState;

diff --git a/Parse/Internal/Push/Utilites/PFPushUtilities.h b/Parse/Internal/Push/Utilites/PFPushUtilities.h
@@ -11,12 +11,11 @@
 
 #import "PFPushPrivate.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
+PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
 
 @end
 

diff --git a/Parse/PFConstants.m b/Parse/PFConstants.m
@@ -11,10 +11,14 @@
 
 NSInteger const PARSE_API_VERSION          = 2;
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 NSString *const kPFDeviceType                = @"ios";
-#else
+#elif PF_TARGET_OS_OSX
 NSString *const kPFDeviceType                = @"osx";
+#elif TARGET_OS_TV
+NSString *const kPFDeviceType                = @"appletv";
+#elif TARGET_OS_WATCH
+NSString *const kPFDeviceType                = @"applewatch";
 #endif
 
 NSString *const kPFParseServer               = @"https://api.parse.com";

diff --git a/Parse/PFInstallation.h b/Parse/PFInstallation.h
@@ -12,7 +12,6 @@
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
@@ -35,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
  the Parse cloud can be used to target push notifications.
  */
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
+PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
 
 ///--------------------------------------
 /// @name Accessing the Current Installation
@@ -74,7 +73,7 @@ PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSu
 /**
  The badge for the `PFInstallation`.
  */
-@property (nonatomic, assign) NSInteger badge;
+@property (nonatomic, assign) NSInteger badge PF_TV_UNAVAILABLE;
 
 /**
  The name of the time zone for the `PFInstallation`.

diff --git a/Parse/PFInstallation.m b/Parse/PFInstallation.m
@@ -141,10 +141,12 @@ + (instancetype)currentInstallation {
 ///--------------------------------------
 
 - (id)objectForKey:(NSString *)key {
+#if !TARGET_OS_TV
     if ([key isEqualToString:PFInstallationKeyBadge] && [self _isCurrentInstallation]) {
         // Update the data dictionary badge value from the device.
         [self _updateBadgeFromDevice];
     }
+#endif
 
     return [super objectForKey:key];
 }
@@ -250,7 +252,9 @@ - (void)_objectWillSave {
     if ([self _isCurrentInstallation]) {
         @synchronized(self.lock) {
             [self _updateTimeZoneFromDevice];
+#if !TARGET_OS_TV
             [self _updateBadgeFromDevice];
+#endif
             [self _updateVersionInfoFromDevice];
             [self _updateLocaleIdentifierFromDevice];
         }
@@ -266,7 +270,7 @@ - (void)_updateTimeZoneFromDevice {
     }
 }
 
-- (void)_updateBadgeFromDevice {
+- (void)_updateBadgeFromDevice PF_TV_UNAVAILABLE {
     // Get the application icon and update the installation if necessary.
     NSNumber *applicationBadge = @([PFApplication currentApplication].iconBadgeNumber);
     NSNumber *installationBadge = [super objectForKey:PFInstallationKeyBadge];

diff --git a/Parse/PFPush.h b/Parse/PFPush.h
@@ -14,7 +14,6 @@
 #import <Parse/PFConstants.h>
 #import <Parse/PFInstallation.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFQuery PF_GENERIC(PFGenericObject : PFObject *);
@@ -27,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
  The preferred way of modifying or retrieving channel subscriptions is to use
  the `PFInstallation` class, instead of the class methods in `PFPush`.
  */
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPush : NSObject <NSCopying>
+PF_WATCH_UNAVAILABLE @interface PFPush : NSObject <NSCopying>
 
 ///--------------------------------------
 /// @name Creating a Push Notification
@@ -399,7 +398,7 @@ PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPush : NSObject <NSCopying>
 
  @param userInfo The userInfo dictionary you get in `appplication:didReceiveRemoteNotification:`.
  */
-+ (void)handlePush:(nullable NSDictionary *)userInfo NS_AVAILABLE_IOS(3_0) PF_EXTENSION_UNAVAILABLE("");
++ (void)handlePush:(nullable NSDictionary *)userInfo NS_AVAILABLE_IOS(3_0) PF_EXTENSION_UNAVAILABLE("") PF_TV_UNAVAILABLE;
 
 ///--------------------------------------
 /// @name Managing Channel Subscriptions

diff --git a/Parse/PFPush.m b/Parse/PFPush.m
@@ -386,7 +386,7 @@ + (void)unsubscribeFromChannelInBackground:(NSString *)channel target:(id)target
 #pragma mark - Handling Notifications
 ///--------------------------------------
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 + (void)handlePush:(NSDictionary *)userInfo {
     UIApplication *application = [UIApplication sharedApplication];
     if (application.applicationState != UIApplicationStateActive) {

diff --git a/Parse/Parse.h b/Parse/Parse.h
@@ -42,6 +42,8 @@
 
 #elif TARGET_OS_TV
 
+#import <Parse/PFInstallation.h>
+#import <Parse/PFPush.h>
 #import <Parse/PFProduct.h>
 #import <Parse/PFPurchase.h>