Replace custom target conditional macros.

Author: nlutsenko

Parse/Internal/Object/PFObjectPrivate.h

@@ -97,7 +97,7 @@
 
 - (PFObjectEstimatedData *)_estimatedData;
 
-#if PARSE_OSX_ONLY
+#if PF_TARGET_OS_OSX
 // Not available publicly, but available for testing
 
 - (instancetype)refresh;

Parse/Internal/PFFileManager.m

@@ -246,7 +246,12 @@ - (instancetype)initWithApplicationIdentifier:(NSString *)applicationIdentifier
 - (NSString *)parseDefaultDataDirectoryPath {
     // NSHomeDirectory: Returns the path to either the user's or application's
     // home directory, depending on the platform. Sandboxed by default on iOS.
-#if PARSE_IOS_ONLY
+#if PF_TARGET_OS_OSX
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+    NSString *directoryPath = [paths firstObject];
+    directoryPath = [directoryPath stringByAppendingPathComponent:_PFFileManagerParseDirectoryName];
+    directoryPath = [directoryPath stringByAppendingPathComponent:self.applicationIdentifier];
+#else
     NSString *directoryPath = nil;
     if (self.applicationGroupIdentifier) {
         NSURL *containerPath = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:self.applicationGroupIdentifier];
@@ -255,11 +260,6 @@ - (NSString *)parseDefaultDataDirectoryPath {
     } else {
         return [self parseLocalSandboxDataDirectoryPath];
     }
-#else
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-    NSString *directoryPath = [paths firstObject];
-    directoryPath = [directoryPath stringByAppendingPathComponent:_PFFileManagerParseDirectoryName];
-    directoryPath = [directoryPath stringByAppendingPathComponent:self.applicationIdentifier];
 #endif
 
     BFTask *createDirectoryTask = [[self class] createDirectoryIfNeededAsyncAtPath:directoryPath

Parse/PFConstants.h

@@ -24,9 +24,6 @@ extern NSInteger const PARSE_API_VERSION;
 #pragma mark - Platform
 ///--------------------------------------
 
-#define PARSE_IOS_ONLY (TARGET_OS_IPHONE)
-#define PARSE_OSX_ONLY (TARGET_OS_MAC && !(TARGET_OS_IPHONE))
-
 extern NSString *const _Nonnull kPFDeviceType;
 
 ///--------------------------------------

Parse/PFObject.h

@@ -394,7 +394,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
  */
 @property (nonatomic, assign, readonly, getter=isDataAvailable) BOOL dataAvailable;
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 
 /**
  Refreshes the PFObject with the current data from the server.

Parse/PFPush.m

@@ -28,6 +28,7 @@
 #import "PFQueryPrivate.h"
 #import "PFUserPrivate.h"
 #import "Parse_Private.h"
+#import "PFApplication.h"
 
 static Class _pushInternalUtilClass = nil;
 
@@ -286,9 +287,9 @@ + (void)unsubscribeFromChannelInBackground:(NSString *)channel block:(PFBooleanR
 #pragma mark - Handling Notifications
 ///--------------------------------------
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 + (void)handlePush:(NSDictionary *)userInfo {
-    UIApplication *application = [UIApplication sharedApplication];
+    UIApplication *application = [PFApplication currentApplication].systemApplication;
     if (application.applicationState != UIApplicationStateActive) {
         return;
     }

Parse/Parse.h

@@ -171,7 +171,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (NSString *)containingApplicationBundleIdentifierForDataSharing PF_WATCH_UNAVAILABLE PF_TV_UNAVAILABLE;
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 
 ///--------------------------------------
 #pragma mark - Configuring UI Settings

Parse/Parse.m

@@ -186,7 +186,7 @@ + (BOOL)isLocalDatastoreEnabled {
 #pragma mark - User Interface
 ///--------------------------------------
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 
 + (void)offlineMessagesEnabled:(BOOL)enabled {
     // Deprecated method - shouldn't do anything.

Tests/Other/LocationManager/CLLocationManager+TestAdditions.m

@@ -9,6 +9,8 @@
 
 #import "CLLocationManager+TestAdditions.h"
 
+#import <Parse/PFConstants.h>
+
 #import "PFTestSwizzlingUtilities.h"
 
 @interface CLLocationManager ()
@@ -31,7 +33,7 @@ @implementation CLLocationManager (TestAdditions)
 
 + (void)setMockingEnabled:(BOOL)enabled {
     // There is no ability to use real CLLocationManager on Mac, due to permission requests
-#if PARSE_OSX_ONLY
+#if PF_TARGET_OS_OSX
     if (!enabled) {
         return;
     }