Skip to content

Commit e2bed4d

Browse files
committed
Merge pull request #369 from ParsePlatform/nlutsenko.watch.imports
Update few imports to unbreak watchOS target.
2 parents a1356c3 + 861523a commit e2bed4d

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

Parse/Internal/PFInternalUtils.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#import <Foundation/Foundation.h>
1111

1212
#import <Parse/PFConstants.h>
13-
#import "PFPushPrivate.h"
1413

1514
#import "PFEncoder.h"
1615

Parse/Internal/PFInternalUtils.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#import "PFMultiProcessFileLockController.h"
3535
#import "PFHash.h"
3636

37-
#if PARSE_IOS_ONLY
37+
#if TARGET_OS_IOS
3838
#import "PFProduct.h"
3939
#endif
4040

Parse/Internal/ParseManager.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#import "PFConfig.h"
1919
#import "PFCoreManager.h"
2020
#import "PFFileManager.h"
21-
#import "PFInstallation.h"
2221
#import "PFInstallationIdentifierStore.h"
2322
#import "PFKeyValueCache.h"
2423
#import "PFKeychainStore.h"
@@ -29,6 +28,10 @@
2928
#import "PFUser.h"
3029
#import "PFURLSessionCommandRunner.h"
3130

31+
#if !TARGET_OS_WATCH
32+
#import "PFInstallation.h"
33+
#endif
34+
3235
#if TARGET_OS_IOS
3336
#import "PFPurchaseController.h"
3437
#import "PFProduct.h"

Parse/Parse.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@
2626
#import <Parse/PFSubclassing.h>
2727
#import <Parse/PFUser.h>
2828
#import <Parse/PFUserAuthenticationDelegate.h>
29-
#import <Parse/PFInstallation.h>
3029
#import <Parse/PFNullability.h>
30+
31+
#if !TARGET_OS_WATCH
32+
33+
#import <Parse/PFInstallation.h>
3134
#import <Parse/PFPush.h>
3235

36+
#endif
37+
3338
#if TARGET_OS_IOS
3439

3540
#import <Parse/PFNetworkActivityIndicatorManager.h>

Parse/Parse.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@
2323
#import "PFApplication.h"
2424
#import "PFKeychainStore.h"
2525
#import "PFLogging.h"
26-
#import "PFInstallationPrivate.h"
2726
#import "PFObjectSubclassingController.h"
2827

29-
#if PARSE_IOS_ONLY
28+
#if !TARGET_OS_WATCH
29+
#import "PFInstallationPrivate.h"
30+
#if TARGET_OS_IOS
3031
#import "PFProduct+Private.h"
3132
#endif
33+
#endif
3234

3335
#import "PFCategoryLoader.h"
3436

0 commit comments

Comments
 (0)