Skip to content

Commit 36979f6

Browse files
nlutsenkonlutsenko
committed
Merge pull request #328 from ParsePlatform/nlutsenko.watch.unavailable
Exclude PFProduct, PFPush internal things from watchOS target.
2 parents 4a4bc54 + d740768 commit 36979f6

File tree

12 files changed

+20
-24
lines changed

12 files changed

+20
-24
lines changed

‎Parse.xcodeproj/project.pbxproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@
7575
810155511BB3832700D7C7BD /* PFACLState.m in Sources */ = {isa = PBXBuildFile; fileRef = F51534F91B571E9100C49F56 /* PFACLState.m */; };
7676
810155521BB3832700D7C7BD /* PFRESTConfigCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 815EE92219F989380076FE5D /* PFRESTConfigCommand.m */; };
7777
810155531BB3832700D7C7BD /* PFQueryUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C7F48A1AF4110B007B5418 /* PFQueryUtilities.m */; };
78-
810155551BB3832700D7C7BD /* PFRESTPushCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C9C9F619FEA89200D514C5 /* PFRESTPushCommand.m */; };
7978
810155561BB3832700D7C7BD /* PFOfflineObjectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FC6A1B50376D003841A2 /* PFOfflineObjectController.m */; };
8079
810155571BB3832700D7C7BD /* PFKeychainStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 81D0EE9819B0A2060000AE75 /* PFKeychainStore.m */; };
81-
810155581BB3832700D7C7BD /* PFPushController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CB7F9F1B1800E400DC601D /* PFPushController.m */; };
8280
810155591BB3832700D7C7BD /* PFQueryState.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C7F4AA1AF42BD9007B5418 /* PFQueryState.m */; };
8381
8101555A1BB3832700D7C7BD /* PFSessionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8124C89E1B27BF0900758E00 /* PFSessionController.m */; };
8482
8101555C1BB3832700D7C7BD /* PFMutableFileState.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C7F4A11AF4220A007B5418 /* PFMutableFileState.m */; };
@@ -143,7 +141,6 @@
143141
8101559F1BB3832700D7C7BD /* PFPinningObjectStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 8124C8711B26B9E700758E00 /* PFPinningObjectStore.h */; };
144142
810155A01BB3832700D7C7BD /* PFMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 810B7D751A0291FF003C0909 /* PFMacros.h */; };
145143
810155A11BB3832700D7C7BD /* PFRESTAnalyticsCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BBE1331A0062B800622646 /* PFRESTAnalyticsCommand.h */; };
146-
810155A21BB3832700D7C7BD /* PFPushController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81CB7F9E1B1800E400DC601D /* PFPushController.h */; };
147144
810155A31BB3832700D7C7BD /* PFHTTPURLRequestConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 815EE93A19FA56D20076FE5D /* PFHTTPURLRequestConstructor.h */; };
148145
810155A41BB3832700D7C7BD /* PFDefaultACLController.h in Headers */ = {isa = PBXBuildFile; fileRef = F51535571B57573700C49F56 /* PFDefaultACLController.h */; };
149146
810155A51BB3832700D7C7BD /* PFACL.h in Headers */ = {isa = PBXBuildFile; fileRef = 64C47802147336C70092082F /* PFACL.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -205,7 +202,6 @@
205202
810155E41BB3832700D7C7BD /* PFURLSessionJSONDataTaskDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BCB4C01B744626006659CB /* PFURLSessionJSONDataTaskDelegate.h */; };
206203
810155E51BB3832700D7C7BD /* PFMutableUserState.h in Headers */ = {isa = PBXBuildFile; fileRef = 814BCDF51B4DF66500007B7F /* PFMutableUserState.h */; };
207204
810155E61BB3832700D7C7BD /* PFRESTConfigCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 815EE92119F989380076FE5D /* PFRESTConfigCommand.h */; };
208-
810155E71BB3832700D7C7BD /* PFRESTPushCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C9C9F519FEA89200D514C5 /* PFRESTPushCommand.h */; };
209205
810155E81BB3832700D7C7BD /* PFObjectFileCodingLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E7A2231B6042BD006CB680 /* PFObjectFileCodingLogic.h */; };
210206
810155E91BB3832700D7C7BD /* PFEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 81068EEF1AE0845D00A34D13 /* PFEncoder.h */; };
211207
810155EA1BB3832700D7C7BD /* PFQueryController.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B7AB61AF2FA4800D15FF5 /* PFQueryController.h */; };
@@ -259,7 +255,6 @@
259255
8101561E1BB3832700D7C7BD /* PFQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 0925ABF313D791770095FEFA /* PFQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
260256
8101561F1BB3832700D7C7BD /* PFQueryUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C7F4891AF4110B007B5418 /* PFQueryUtilities.h */; };
261257
810156201BB3832700D7C7BD /* PFQueryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8166FC961B50381B003841A2 /* PFQueryPrivate.h */; };
262-
810156211BB3832700D7C7BD /* PFPushState.h in Headers */ = {isa = PBXBuildFile; fileRef = 81CB7F8C1B1795C000DC601D /* PFPushState.h */; };
263258
810156221BB3832700D7C7BD /* PFCommandURLRequestConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02A61B5DE562003846EE /* PFCommandURLRequestConstructor.h */; };
264259
810156231BB3832700D7C7BD /* PFRESTQueryCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 815EE94419FAD12F0076FE5D /* PFRESTQueryCommand.h */; };
265260
810156241BB3832700D7C7BD /* PFACLState_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = F51534FA1B571E9100C49F56 /* PFACLState_Private.h */; };
@@ -3434,7 +3429,6 @@
34343429
8101559F1BB3832700D7C7BD /* PFPinningObjectStore.h in Headers */,
34353430
810155A01BB3832700D7C7BD /* PFMacros.h in Headers */,
34363431
810155A11BB3832700D7C7BD /* PFRESTAnalyticsCommand.h in Headers */,
3437-
810155A21BB3832700D7C7BD /* PFPushController.h in Headers */,
34383432
810155A31BB3832700D7C7BD /* PFHTTPURLRequestConstructor.h in Headers */,
34393433
810155A41BB3832700D7C7BD /* PFDefaultACLController.h in Headers */,
34403434
810155A51BB3832700D7C7BD /* PFACL.h in Headers */,
@@ -3496,7 +3490,6 @@
34963490
810155E41BB3832700D7C7BD /* PFURLSessionJSONDataTaskDelegate.h in Headers */,
34973491
810155E51BB3832700D7C7BD /* PFMutableUserState.h in Headers */,
34983492
810155E61BB3832700D7C7BD /* PFRESTConfigCommand.h in Headers */,
3499-
810155E71BB3832700D7C7BD /* PFRESTPushCommand.h in Headers */,
35003493
810155E81BB3832700D7C7BD /* PFObjectFileCodingLogic.h in Headers */,
35013494
810155E91BB3832700D7C7BD /* PFEncoder.h in Headers */,
35023495
810155EA1BB3832700D7C7BD /* PFQueryController.h in Headers */,
@@ -3550,7 +3543,6 @@
35503543
8101561E1BB3832700D7C7BD /* PFQuery.h in Headers */,
35513544
8101561F1BB3832700D7C7BD /* PFQueryUtilities.h in Headers */,
35523545
810156201BB3832700D7C7BD /* PFQueryPrivate.h in Headers */,
3553-
810156211BB3832700D7C7BD /* PFPushState.h in Headers */,
35543546
810156221BB3832700D7C7BD /* PFCommandURLRequestConstructor.h in Headers */,
35553547
810156231BB3832700D7C7BD /* PFRESTQueryCommand.h in Headers */,
35563548
810156241BB3832700D7C7BD /* PFACLState_Private.h in Headers */,
@@ -4387,10 +4379,8 @@
43874379
810155511BB3832700D7C7BD /* PFACLState.m in Sources */,
43884380
810155521BB3832700D7C7BD /* PFRESTConfigCommand.m in Sources */,
43894381
810155531BB3832700D7C7BD /* PFQueryUtilities.m in Sources */,
4390-
810155551BB3832700D7C7BD /* PFRESTPushCommand.m in Sources */,
43914382
810155561BB3832700D7C7BD /* PFOfflineObjectController.m in Sources */,
43924383
810155571BB3832700D7C7BD /* PFKeychainStore.m in Sources */,
4393-
810155581BB3832700D7C7BD /* PFPushController.m in Sources */,
43944384
810155591BB3832700D7C7BD /* PFQueryState.m in Sources */,
43954385
8101555A1BB3832700D7C7BD /* PFSessionController.m in Sources */,
43964386
8101555C1BB3832700D7C7BD /* PFMutableFileState.m in Sources */,

‎Parse/Internal/Commands/PFRESTPushCommand.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99

1010
#import "PFRESTCommand.h"
1111

12+
#import <Parse/PFConstants.h>
13+
1214
@class PFPushState;
1315

1416
NS_ASSUME_NONNULL_BEGIN
1517

16-
@interface PFRESTPushCommand : PFRESTCommand
18+
PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
1719

1820
+ (instancetype)sendPushCommandWithPushState:(PFPushState *)state
1921
sessionToken:(nullable NSString *)sessionToken;

‎Parse/Internal/ParseManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PFInstallationIdentifierStoreProvider>
4242

4343
@property (nonatomic, strong) PFAnalyticsController *analyticsController;
4444

45-
#if TARGET_OS_IPHONE
45+
#if TARGET_OS_IOS
4646
@property (nonatomic, strong) PFPurchaseController *purchaseController;
4747
#endif
4848

‎Parse/Internal/ParseManager.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#import "PFUser.h"
3030
#import "PFURLSessionCommandRunner.h"
3131

32-
#if TARGET_OS_IPHONE
32+
#if TARGET_OS_IOS
3333
#import "PFPurchaseController.h"
3434
#import "PFProduct.h"
3535
#endif
@@ -66,7 +66,7 @@ @implementation ParseManager
6666
@synthesize coreManager = _coreManager;
6767
@synthesize analyticsController = _analyticsController;
6868
@synthesize pushManager = _pushManager;
69-
#if TARGET_OS_IPHONE
69+
#if TARGET_OS_IOS
7070
@synthesize purchaseController = _purchaseController;
7171
#endif
7272

@@ -337,7 +337,7 @@ - (void)setAnalyticsController:(PFAnalyticsController *)analyticsController {
337337
});
338338
}
339339

340-
#if TARGET_OS_IPHONE
340+
#if TARGET_OS_IOS
341341

342342
#pragma mark PurchaseController
343343

@@ -434,7 +434,7 @@ - (void)_checkApplicationId {
434434

435435
- (void)_migrateSandboxDataToApplicationGroupContainerIfNeeded {
436436
// There is no need to migrate anything on OSX, since we are using globally available folder.
437-
#if TARGET_OS_IPHONE
437+
#if TARGET_OS_IOS
438438
// Do nothing if there is no application group container or containing application is specified.
439439
if (!self.applicationGroupIdentifier || self.containingApplicationIdentifier) {
440440
return;

‎Parse/Internal/Product/ProductsRequestHandler/PFProductsRequestHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@class BFTask PF_GENERIC(__covariant BFGenericType);
1616

17-
@interface PFProductsRequestResult : NSObject
17+
PF_WATCH_UNAVAILABLE @interface PFProductsRequestResult : NSObject
1818

1919
@property (nonatomic, copy, readonly) NSSet *validProducts;
2020
@property (nonatomic, copy, readonly) NSSet *invalidProductIdentifiers;

‎Parse/Internal/Purchase/Controller/PFPurchaseController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@class SKPaymentQueue;
2323
@class SKPaymentTransaction;
2424

25-
@interface PFPurchaseController : NSObject
25+
PF_WATCH_UNAVAILABLE @interface PFPurchaseController : NSObject
2626

2727
@property (nonatomic, strong, readonly) id<PFCommandRunning> commandRunner;
2828
@property (nonatomic, strong, readonly) PFFileManager *fileManager;

‎Parse/Internal/Purchase/PaymentTransactionObserver/PFPaymentTransactionObserver.h

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

13+
#import <Parse/PFConstants.h>
14+
1315
/*!
1416
* The PFPaymentTransactionObserver listens to the payment queue, processes a payment by running business logic,
1517
* and completes the transaction. It's a complex interaction and best explained as follows:
@@ -19,7 +21,7 @@
1921
* 4) when the business logic finishes, the observer completes the transaction. If the business logic does not finish, the transaction is not completed, which means the user does not get charged,
2022
* 5) after the transaction finishes, custom UI logic is run.
2123
*/
22-
@interface PFPaymentTransactionObserver : NSObject <SKPaymentTransactionObserver>
24+
PF_WATCH_UNAVAILABLE @interface PFPaymentTransactionObserver : NSObject <SKPaymentTransactionObserver>
2325

2426
- (void)handle:(NSString *)productIdentifier block:(void (^)(SKPaymentTransaction *))block;
2527
- (void)handle:(NSString *)productIdentifier runOnceBlock:(void (^)(NSError *))block;

‎Parse/Internal/Push/Controller/PFPushController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
NS_ASSUME_NONNULL_BEGIN
1919

20-
@interface PFPushController : NSObject
20+
PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
2121

2222
@property (nonatomic, strong, readonly) id<PFCommandRunning> commandRunner;
2323

‎Parse/Internal/Push/State/PFMutablePushState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
NS_ASSUME_NONNULL_BEGIN
1313

14-
@interface PFMutablePushState : PFPushState
14+
PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
1515

1616
@property (nullable, nonatomic, copy, readwrite) NSSet *channels;
1717
@property (nullable, nonatomic, copy, readwrite) PFQueryState *queryState;

‎Parse/Internal/Push/State/PFPushState.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99

1010
#import <Foundation/Foundation.h>
1111

12+
#import <Parse/PFConstants.h>
13+
1214
#import "PFBaseState.h"
1315

1416
@class PFQueryState;
1517

1618
NS_ASSUME_NONNULL_BEGIN
1719

18-
@interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
20+
PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
1921

2022
@property (nullable, nonatomic, copy, readonly) NSSet *channels;
2123
@property (nullable, nonatomic, copy, readonly) PFQueryState *queryState;

‎Parse/Internal/Push/Utilites/PFPushUtilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

16-
@interface PFPushUtilities : NSObject <PFPushInternalUtils>
16+
PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
1717

1818
@end
1919

‎Parse/PFProduct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PF_ASSUME_NONNULL_BEGIN
2323
2424
This class is currently for iOS only.
2525
*/
26-
@interface PFProduct : PFObject<PFSubclassing>
26+
PF_WATCH_UNAVAILABLE @interface PFProduct : PFObject<PFSubclassing>
2727

2828
///--------------------------------------
2929
/// @name Product-specific Properties

0 commit comments

Comments
 (0)