Merge pull request #447 from ParsePlatform/nlutsenko.tvos.warnings

nlutsenko · nlutsenko · commit 1c2e0648cdde · 2015-10-20T18:53:13.000-07:00
Fixed imports and added warnings for imports that are unavailable on watchOS, tvOS.
diff --git a/Parse.xcodeproj/project.pbxproj b/Parse.xcodeproj/project.pbxproj
@@ -27,7 +27,6 @@
 		8101551A1BB3832700D7C7BD /* PFUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81ABC0FD1B5427EC00BA9009 /* PFUserController.m */; };
 		8101551B1BB3832700D7C7BD /* PFAsyncTaskQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C8F2BF1B1F7E6B00CD98E7 /* PFAsyncTaskQueue.m */; };
 		8101551C1BB3832700D7C7BD /* PFCommandCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C1FDDCB14E1B1BD00A77007 /* PFCommandCache.m */; };
-		8101551D1BB3832700D7C7BD /* PFMutablePushState.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CB7F931B1795CF00DC601D /* PFMutablePushState.m */; };
 		8101551E1BB3832700D7C7BD /* PFObjectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FC6C1B50376D003841A2 /* PFObjectController.m */; };
 		8101551F1BB3832700D7C7BD /* PFCategoryLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8103FA36198FC190000BAE3F /* PFCategoryLoader.m */; };
 		810155201BB3832700D7C7BD /* PFUserAuthenticationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FCD21B503914003841A2 /* PFUserAuthenticationController.m */; };
@@ -261,7 +260,6 @@
 		8101562A1BB3832700D7C7BD /* PFKeyValueCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 814881421B795C63008763BF /* PFKeyValueCache.h */; };
 		8101562C1BB3832700D7C7BD /* PFSessionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8124C89D1B27BF0900758E00 /* PFSessionController.h */; };
 		8101562D1BB3832700D7C7BD /* PFRole.h in Headers */ = {isa = PBXBuildFile; fileRef = 63723F6D1565A085007A1A73 /* PFRole.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8101562E1BB3832700D7C7BD /* PFMutablePushState.h in Headers */ = {isa = PBXBuildFile; fileRef = 81CB7F921B1795CF00DC601D /* PFMutablePushState.h */; };
 		810156301BB3832700D7C7BD /* PFSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812145751AA4A4C1000B23F5 /* PFSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		810156311BB3832700D7C7BD /* PFEventuallyPin.h in Headers */ = {isa = PBXBuildFile; fileRef = 91115EF71A097AF30092D1C9 /* PFEventuallyPin.h */; };
 		810156321BB3832700D7C7BD /* PFPinningEventuallyQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */; };
@@ -700,7 +698,6 @@
 		815F22C41BD04D150054659F /* PFUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81ABC0FD1B5427EC00BA9009 /* PFUserController.m */; };
 		815F22C51BD04D150054659F /* PFAsyncTaskQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C8F2BF1B1F7E6B00CD98E7 /* PFAsyncTaskQueue.m */; };
 		815F22C61BD04D150054659F /* PFCommandCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C1FDDCB14E1B1BD00A77007 /* PFCommandCache.m */; };
-		815F22C71BD04D150054659F /* PFMutablePushState.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CB7F931B1795CF00DC601D /* PFMutablePushState.m */; };
 		815F22C81BD04D150054659F /* PFObjectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FC6C1B50376D003841A2 /* PFObjectController.m */; };
 		815F22C91BD04D150054659F /* PFCategoryLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8103FA36198FC190000BAE3F /* PFCategoryLoader.m */; };
 		815F22CA1BD04D150054659F /* PFUserAuthenticationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FCD21B503914003841A2 /* PFUserAuthenticationController.m */; };
@@ -951,7 +948,6 @@
 		815F23D61BD04D150054659F /* PFKeyValueCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 814881421B795C63008763BF /* PFKeyValueCache.h */; };
 		815F23D81BD04D150054659F /* PFSessionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8124C89D1B27BF0900758E00 /* PFSessionController.h */; };
 		815F23D91BD04D150054659F /* PFRole.h in Headers */ = {isa = PBXBuildFile; fileRef = 63723F6D1565A085007A1A73 /* PFRole.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		815F23DA1BD04D150054659F /* PFMutablePushState.h in Headers */ = {isa = PBXBuildFile; fileRef = 81CB7F921B1795CF00DC601D /* PFMutablePushState.h */; };
 		815F23DC1BD04D150054659F /* PFSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812145751AA4A4C1000B23F5 /* PFSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		815F23DD1BD04D150054659F /* PFEventuallyPin.h in Headers */ = {isa = PBXBuildFile; fileRef = 91115EF71A097AF30092D1C9 /* PFEventuallyPin.h */; };
 		815F23DE1BD04D150054659F /* PFPinningEventuallyQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */; };
@@ -3916,7 +3912,6 @@
 				8101562A1BB3832700D7C7BD /* PFKeyValueCache.h in Headers */,
 				8101562C1BB3832700D7C7BD /* PFSessionController.h in Headers */,
 				8101562D1BB3832700D7C7BD /* PFRole.h in Headers */,
-				8101562E1BB3832700D7C7BD /* PFMutablePushState.h in Headers */,
 				810156301BB3832700D7C7BD /* PFSession.h in Headers */,
 				810156311BB3832700D7C7BD /* PFEventuallyPin.h in Headers */,
 				810156321BB3832700D7C7BD /* PFPinningEventuallyQueue.h in Headers */,
@@ -4106,7 +4101,6 @@
 				815F23D61BD04D150054659F /* PFKeyValueCache.h in Headers */,
 				815F23D81BD04D150054659F /* PFSessionController.h in Headers */,
 				815F23D91BD04D150054659F /* PFRole.h in Headers */,
-				815F23DA1BD04D150054659F /* PFMutablePushState.h in Headers */,
 				815F23DC1BD04D150054659F /* PFSession.h in Headers */,
 				815F23DD1BD04D150054659F /* PFEventuallyPin.h in Headers */,
 				815F23DE1BD04D150054659F /* PFPinningEventuallyQueue.h in Headers */,
@@ -4962,7 +4956,6 @@
 				8101551A1BB3832700D7C7BD /* PFUserController.m in Sources */,
 				8101551B1BB3832700D7C7BD /* PFAsyncTaskQueue.m in Sources */,
 				8101551C1BB3832700D7C7BD /* PFCommandCache.m in Sources */,
-				8101551D1BB3832700D7C7BD /* PFMutablePushState.m in Sources */,
 				8101551E1BB3832700D7C7BD /* PFObjectController.m in Sources */,
 				8101551F1BB3832700D7C7BD /* PFCategoryLoader.m in Sources */,
 				810155201BB3832700D7C7BD /* PFUserAuthenticationController.m in Sources */,
@@ -5099,7 +5092,6 @@
 				815F22C41BD04D150054659F /* PFUserController.m in Sources */,
 				815F22C51BD04D150054659F /* PFAsyncTaskQueue.m in Sources */,
 				815F22C61BD04D150054659F /* PFCommandCache.m in Sources */,
-				815F22C71BD04D150054659F /* PFMutablePushState.m in Sources */,
 				815F22C81BD04D150054659F /* PFObjectController.m in Sources */,
 				815F22C91BD04D150054659F /* PFCategoryLoader.m in Sources */,
 				815F22CA1BD04D150054659F /* PFUserAuthenticationController.m in Sources */,
diff --git a/Parse/Internal/Commands/PFRESTPushCommand.h b/Parse/Internal/Commands/PFRESTPushCommand.h
@@ -11,6 +11,9 @@
 
 #import <Parse/PFConstants.h>
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class PFPushState;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Parse/Internal/Installation/Controller/PFInstallationController.h b/Parse/Internal/Installation/Controller/PFInstallationController.h
@@ -12,6 +12,8 @@
 #import "PFCoreDataProvider.h"
 #import "PFObjectControlling.h"
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 NS_ASSUME_NONNULL_BEGIN
 
 PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
diff --git a/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h b/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h
@@ -16,6 +16,8 @@
 #import "PFDataProvider.h"
 #import "PFMacros.h"
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 extern NSString *const PFCurrentInstallationFileName;
 extern NSString *const PFCurrentInstallationPinName;
 
diff --git a/Parse/Internal/PFEventuallyQueue.m b/Parse/Internal/PFEventuallyQueue.m
@@ -21,9 +21,12 @@
 #import "PFLogging.h"
 #import "PFMacros.h"
 #import "PFRESTCommand.h"
-#import "PFReachability.h"
 #import "PFTaskQueue.h"
 
+#if !TARGET_OS_WATCH
+#import "PFReachability.h"
+#endif
+
 NSUInteger const PFEventuallyQueueDefaultMaxAttemptsCount = 5;
 NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval = 600.0f;
 
diff --git a/Parse/Internal/PFReachability.h b/Parse/Internal/PFReachability.h
@@ -11,6 +11,8 @@
 
 #import <Parse/PFConstants.h>
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class PFReachability;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Parse/Internal/ParseManager.m b/Parse/Internal/ParseManager.m
@@ -27,7 +27,7 @@
 #import "PFUser.h"
 #import "PFURLSessionCommandRunner.h"
 
-#if !TARGET_OS_WATCH
+#if !TARGET_OS_WATCH && !TARGET_OS_TV
 #import "PFPushManager.h"
 #import "PFInstallation.h"
 #endif
diff --git a/Parse/Internal/Product/ProductsRequestHandler/PFProductsRequestHandler.h b/Parse/Internal/Product/ProductsRequestHandler/PFProductsRequestHandler.h
@@ -12,6 +12,8 @@
 
 #import <Parse/PFConstants.h>
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 
 PF_WATCH_UNAVAILABLE @interface PFProductsRequestResult : NSObject
diff --git a/Parse/Internal/Purchase/Controller/PFPurchaseController.h b/Parse/Internal/Purchase/Controller/PFPurchaseController.h
@@ -13,6 +13,8 @@
 
 #import "PFMacros.h"
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 @class PFFileManager;
 @class PFPaymentTransactionObserver;
diff --git a/Parse/Internal/Purchase/PaymentTransactionObserver/PFPaymentTransactionObserver.h b/Parse/Internal/Purchase/PaymentTransactionObserver/PFPaymentTransactionObserver.h
@@ -12,6 +12,8 @@
 
 #import <Parse/PFConstants.h>
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 /*!
  * The PFPaymentTransactionObserver listens to the payment queue, processes a payment by running business logic,
  * and completes the transaction. It's a complex interaction and best explained as follows:
diff --git a/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h b/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h
@@ -13,6 +13,9 @@
 
 #import "PFCoreDataProvider.h"
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Parse/Internal/Push/Controller/PFPushController.h b/Parse/Internal/Push/Controller/PFPushController.h
@@ -11,6 +11,9 @@
 
 #import <Parse/PFConstants.h>
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class BFTask PF_GENERIC(__covariant BFGenericType);
 @class PFPushState;
 @protocol PFCommandRunning;
diff --git a/Parse/Internal/Push/Manager/PFPushManager.h b/Parse/Internal/Push/Manager/PFPushManager.h
@@ -14,6 +14,9 @@
 #import "PFCoreDataProvider.h"
 #import "PFDataProvider.h"
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class PFPushChannelsController;
 @class PFPushController;
 
diff --git a/Parse/Internal/Push/State/PFMutablePushState.h b/Parse/Internal/Push/State/PFMutablePushState.h
@@ -9,6 +9,9 @@
 
 #import "PFPushState.h"
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 NS_ASSUME_NONNULL_BEGIN
 
 PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
diff --git a/Parse/Internal/Push/State/PFPushState.h b/Parse/Internal/Push/State/PFPushState.h
@@ -13,6 +13,9 @@
 
 #import "PFBaseState.h"
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class PFQueryState;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Parse/Internal/Push/Utilites/PFPushUtilities.h b/Parse/Internal/Push/Utilites/PFPushUtilities.h
@@ -11,6 +11,9 @@
 
 #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>
diff --git a/Parse/PFConstants.h b/Parse/PFConstants.h
@@ -508,10 +508,26 @@ extern NSString *const PF_NONNULL_S PFNetworkNotificationURLResponseBodyUserInfo
 #  endif
 #endif
 
+#ifndef PF_WATCH_UNAVAILABLE_WARNING
+#  if TARGET_OS_WATCH
+#    define PF_WATCH_UNAVAILABLE_WARNING _Pragma("GCC warning \"This file is unavailable on watchOS.\"")
+#  else
+#    define PF_WATCH_UNAVAILABLE_WARNING
+#  endif
+#endif
+
 #ifndef PF_TV_UNAVAILABLE
 #  ifdef __TVOS_PROHIBITED
 #    define PF_TV_UNAVAILABLE __TVOS_PROHIBITED
 #  else
 #    define PF_TV_UNAVAILABLE
 #  endif
 #endif
+
+#ifndef PF_TV_UNAVAILABLE_WARNING
+#  if TARGET_OS_TV
+#    define PF_TV_UNAVAILABLE_WARNING _Pragma("GCC warning \"This file is unavailable on tvOS.\"")
+#  else
+#    define PF_TV_UNAVAILABLE_WARNING
+#  endif
+#endif
diff --git a/Parse/PFInstallation.h b/Parse/PFInstallation.h
@@ -13,6 +13,8 @@
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 PF_ASSUME_NONNULL_BEGIN
 
 /*!
diff --git a/Parse/PFProduct.h b/Parse/PFProduct.h
@@ -14,6 +14,8 @@
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
 
+PF_WATCH_UNAVAILABLE_WARNING
+
 PF_ASSUME_NONNULL_BEGIN
 
 /*!
diff --git a/Parse/PFPush.h b/Parse/PFPush.h
@@ -14,6 +14,9 @@
 #import <Parse/PFConstants.h>
 #import <Parse/PFInstallation.h>
 
+PF_TV_UNAVAILABLE_WARNING
+PF_WATCH_UNAVAILABLE_WARNING
+
 @class PFQuery PF_GENERIC(PFGenericObject : PFObject *);
 
 PF_ASSUME_NONNULL_BEGIN
