Merge pull request #327 from ParsePlatform/nlutsenko.watch.installation

Exclude PFInstallation from watchOS target.
parse-community · Sep 26, 2015 · 4a4bc54 · 4a4bc54
2 parents 9e866f0 + bf64869
commit 4a4bc54
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 34 deletions.
diff --git a/Parse.xcodeproj/project.pbxproj b/Parse.xcodeproj/project.pbxproj
diff --git a/Parse/Internal/Installation/Controller/PFInstallationController.h b/Parse/Internal/Installation/Controller/PFInstallationController.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@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
@@ -22,7 +22,7 @@ extern NSString *const PFCurrentInstallationPinName;
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 @class PFInstallation;
 
-@interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
+PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
 
 @property (nonatomic, weak, readonly) id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider> commonDataSource;
 @property (nonatomic, weak, readonly) id<PFObjectFilePersistenceControllerProvider> coreDataSource;

diff --git a/Parse/Internal/PFCoreManager.m b/Parse/Internal/PFCoreManager.m
@@ -339,6 +339,8 @@ - (void)setSessionController:(PFSessionController *)sessionController {
     });
 }
 
+#if !TARGET_OS_WATCH
+
 ///--------------------------------------
 #pragma mark - Current Installation Controller
 ///--------------------------------------
@@ -366,6 +368,8 @@ - (void)setCurrentInstallationController:(PFCurrentInstallationController *)cont
     });
 }
 
+#endif
+
 ///--------------------------------------
 #pragma mark - Current User Controller
 ///--------------------------------------
@@ -393,6 +397,8 @@ - (void)setCurrentUserController:(PFCurrentUserController *)currentUserControlle
     });
 }
 
+#if !TARGET_OS_WATCH
+
 ///--------------------------------------
 #pragma mark - Installation Controller
 ///--------------------------------------
@@ -414,6 +420,8 @@ - (void)setInstallationController:(PFInstallationController *)installationContro
     });
 }
 
+#endif
+
 ///--------------------------------------
 #pragma mark - User Controller
 ///--------------------------------------

diff --git a/Parse/Internal/ParseManager.m b/Parse/Internal/ParseManager.m
@@ -293,6 +293,8 @@ - (void)unloadCoreManager {
     });
 }
 
+#if !TARGET_OS_WATCH
+
 #pragma mark PushManager
 
 - (PFPushManager *)pushManager {
@@ -312,6 +314,8 @@ - (void)setPushManager:(PFPushManager *)pushManager {
     });
 }
 
+#endif
+
 #pragma mark AnalyticsController
 
 - (PFAnalyticsController *)analyticsController {
@@ -368,8 +372,10 @@ - (BFTask *)preloadDiskObjectsToMemoryAsync {
         @strongify(self);
         [PFUser currentUser];
         [PFConfig currentConfig];
+#if !TARGET_OS_WATCH
         [PFInstallation currentInstallation];
-
+#endif
+
         [self eventuallyQueue];
 
         return nil;

diff --git a/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h b/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h
@@ -17,7 +17,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface PFPushChannelsController : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
 
 @property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> dataSource;
 

diff --git a/Parse/Internal/Push/Manager/PFPushManager.h b/Parse/Internal/Push/Manager/PFPushManager.h
@@ -9,6 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <Parse/PFConstants.h>
+
 #import "PFCoreDataProvider.h"
 #import "PFDataProvider.h"
 
@@ -17,7 +19,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@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/PFInstallation.h b/Parse/PFInstallation.h
@@ -33,7 +33,7 @@ PF_ASSUME_NONNULL_BEGIN
  the Parse cloud can be used to target push notifications.
  */
 
-@interface PFInstallation : PFObject<PFSubclassing>
+PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
 
 ///--------------------------------------
 /// @name Accessing the Current Installation

diff --git a/Parse/PFQuery.h b/Parse/PFQuery.h
@@ -607,8 +607,7 @@ typedef void (^PFQueryArrayResultBlock)(NSArray PF_GENERIC(PFGenericObject) * PF
  @param error Pointer to an NSError that will be set if necessary.
  @result The PFUser if found. Returns nil if the object isn't found, or if there was an error.
  */
-+ (PF_NULLABLE PFUser *)getUserObjectWithId:(NSString *)objectId
-                                      error:(NSError **)error;
++ (PF_NULLABLE PFUser *)getUserObjectWithId:(NSString *)objectId error:(NSError **)error;
 
 /*!
  @deprecated Please use [PFUser query] instead.

diff --git a/Parse/Parse.m b/Parse/Parse.m
@@ -72,13 +72,15 @@ + (void)setApplicationId:(NSString *)applicationId clientKey:(NSString *)clientK
     // We're forced to register subclasses directly this way, in order to prevent a deadlock.
     // If we ever switch to bundle scanning, this code can go away.
     [subclassingController registerSubclass:[PFUser class]];
-    [subclassingController registerSubclass:[PFInstallation class]];
     [subclassingController registerSubclass:[PFSession class]];
     [subclassingController registerSubclass:[PFRole class]];
     [subclassingController registerSubclass:[PFPin class]];
     [subclassingController registerSubclass:[PFEventuallyPin class]];
-#if TARGET_OS_IPHONE
+#if !TARGET_OS_WATCH
+    [subclassingController registerSubclass:[PFInstallation class]];
+#if TARGET_OS_IOS
     [subclassingController registerSubclass:[PFProduct class]];
+#endif
 #endif
 
     [currentParseManager_ preloadDiskObjectsToMemoryAsync];