Skip to content

Commit 252df85

Browse files
nlutsenkonlutsenko
committed
Merge pull request #440 from ParsePlatform/nlutsenko.tvos.push
Mark all PFPush* things as unavailable for tvOS.
2 parents def8305 + 47e6587 commit 252df85

File tree

12 files changed

+22
-15
lines changed

12 files changed

+22
-15
lines changed

‎Parse.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,6 @@
732732
815F22E71BD04D150054659F /* PFRESTQueryCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 815EE94519FAD12F0076FE5D /* PFRESTQueryCommand.m */; };
733733
815F22E81BD04D150054659F /* PFRESTSessionCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 8121457C1AA4A808000B23F5 /* PFRESTSessionCommand.m */; };
734734
815F22E91BD04D150054659F /* PFPropertyInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8148814D1B795CAC008763BF /* PFPropertyInfo.m */; };
735-
815F22EA1BD04D150054659F /* PFPush.m in Sources */ = {isa = PBXBuildFile; fileRef = 0925ABF213D791770095FEFA /* PFPush.m */; };
736735
815F22EB1BD04D150054659F /* PFMutableObjectState.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CB7F741B166FF500DC601D /* PFMutableObjectState.m */; };
737736
815F22ED1BD04D150054659F /* PFQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0925ABF413D791770095FEFA /* PFQuery.m */; };
738737
815F22EE1BD04D150054659F /* PFConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4AB51B0BF3E500A3D75B /* PFConfigController.m */; };
@@ -753,7 +752,6 @@
753752
815F22FD1BD04D150054659F /* PFRESTConfigCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 815EE92219F989380076FE5D /* PFRESTConfigCommand.m */; };
754753
815F22FE1BD04D150054659F /* PFQueryUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C7F48A1AF4110B007B5418 /* PFQueryUtilities.m */; };
755754
815F22FF1BD04D150054659F /* PFPaymentTransactionObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FCCA1B5038B7003841A2 /* PFPaymentTransactionObserver.m */; };
756-
815F23001BD04D150054659F /* PFRESTPushCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C9C9F619FEA89200D514C5 /* PFRESTPushCommand.m */; };
757755
815F23011BD04D150054659F /* PFOfflineObjectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FC6A1B50376D003841A2 /* PFOfflineObjectController.m */; };
758756
815F23021BD04D150054659F /* PFKeychainStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 81D0EE9819B0A2060000AE75 /* PFKeychainStore.m */; };
759757
815F23041BD04D150054659F /* PFQueryState.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C7F4AA1AF42BD9007B5418 /* PFQueryState.m */; };
@@ -894,7 +892,6 @@
894892
815F23901BD04D150054659F /* PFURLSessionJSONDataTaskDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BCB4C01B744626006659CB /* PFURLSessionJSONDataTaskDelegate.h */; };
895893
815F23911BD04D150054659F /* PFMutableUserState.h in Headers */ = {isa = PBXBuildFile; fileRef = 814BCDF51B4DF66500007B7F /* PFMutableUserState.h */; };
896894
815F23921BD04D150054659F /* PFRESTConfigCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 815EE92119F989380076FE5D /* PFRESTConfigCommand.h */; };
897-
815F23931BD04D150054659F /* PFRESTPushCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C9C9F519FEA89200D514C5 /* PFRESTPushCommand.h */; };
898895
815F23941BD04D150054659F /* PFObjectFileCodingLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E7A2231B6042BD006CB680 /* PFObjectFileCodingLogic.h */; };
899896
815F23951BD04D150054659F /* PFEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 81068EEF1AE0845D00A34D13 /* PFEncoder.h */; };
900897
815F23961BD04D150054659F /* PFQueryController.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B7AB61AF2FA4800D15FF5 /* PFQueryController.h */; };
@@ -4055,7 +4052,6 @@
40554052
815F23901BD04D150054659F /* PFURLSessionJSONDataTaskDelegate.h in Headers */,
40564053
815F23911BD04D150054659F /* PFMutableUserState.h in Headers */,
40574054
815F23921BD04D150054659F /* PFRESTConfigCommand.h in Headers */,
4058-
815F23931BD04D150054659F /* PFRESTPushCommand.h in Headers */,
40594055
815F23941BD04D150054659F /* PFObjectFileCodingLogic.h in Headers */,
40604056
815F23951BD04D150054659F /* PFEncoder.h in Headers */,
40614057
815F23961BD04D150054659F /* PFQueryController.h in Headers */,
@@ -5149,7 +5145,6 @@
51495145
815F22E71BD04D150054659F /* PFRESTQueryCommand.m in Sources */,
51505146
815F22E81BD04D150054659F /* PFRESTSessionCommand.m in Sources */,
51515147
815F22E91BD04D150054659F /* PFPropertyInfo.m in Sources */,
5152-
815F22EA1BD04D150054659F /* PFPush.m in Sources */,
51535148
815F22EB1BD04D150054659F /* PFMutableObjectState.m in Sources */,
51545149
815F22ED1BD04D150054659F /* PFQuery.m in Sources */,
51555150
815F22EE1BD04D150054659F /* PFConfigController.m in Sources */,
@@ -5170,7 +5165,6 @@
51705165
815F22FD1BD04D150054659F /* PFRESTConfigCommand.m in Sources */,
51715166
815F22FE1BD04D150054659F /* PFQueryUtilities.m in Sources */,
51725167
815F22FF1BD04D150054659F /* PFPaymentTransactionObserver.m in Sources */,
5173-
815F23001BD04D150054659F /* PFRESTPushCommand.m in Sources */,
51745168
815F23011BD04D150054659F /* PFOfflineObjectController.m in Sources */,
51755169
815F23021BD04D150054659F /* PFKeychainStore.m in Sources */,
51765170
815F23041BD04D150054659F /* PFQueryState.m in Sources */,

‎Parse/Internal/Commands/PFRESTPushCommand.h‎

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

1616
NS_ASSUME_NONNULL_BEGIN
1717

18-
PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
18+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
1919

2020
+ (instancetype)sendPushCommandWithPushState:(PFPushState *)state
2121
sessionToken:(nullable NSString *)sessionToken;

‎Parse/Internal/ParseManager.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ PFInstallationIdentifierStoreProvider>
3838
@property (nonatomic, copy, readonly) NSString *containingApplicationIdentifier;
3939

4040
@property (nonatomic, strong, readonly) PFCoreManager *coreManager;
41+
42+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
4143
@property (nonatomic, strong) PFPushManager *pushManager;
44+
#endif
4245

4346
@property (nonatomic, strong) PFAnalyticsController *analyticsController;
4447

‎Parse/Internal/ParseManager.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ @implementation ParseManager
6868
@synthesize keyValueCache = _keyValueCache;
6969
@synthesize coreManager = _coreManager;
7070
@synthesize analyticsController = _analyticsController;
71+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
7172
@synthesize pushManager = _pushManager;
73+
#endif
7274
#if TARGET_OS_IOS
7375
@synthesize purchaseController = _purchaseController;
7476
#endif
@@ -296,7 +298,7 @@ - (void)unloadCoreManager {
296298
});
297299
}
298300

299-
#if !TARGET_OS_WATCH
301+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
300302

301303
#pragma mark PushManager
302304

‎Parse/Internal/Push/ChannelsController/PFPushChannelsController.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-
PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
20+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
2121

2222
@property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> dataSource;
2323

‎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-
PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
20+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
2121

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

‎Parse/Internal/Push/Manager/PFPushManager.h‎

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

2020
NS_ASSUME_NONNULL_BEGIN
2121

22-
PF_WATCH_UNAVAILABLE @interface PFPushManager : NSObject
22+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushManager : NSObject
2323

2424
@property (nonatomic, weak, readonly) id<PFCommandRunnerProvider> commonDataSource;
2525
@property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> coreDataSource;

‎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-
PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
14+
PF_TV_UNAVAILABLE 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
NS_ASSUME_NONNULL_BEGIN
1919

20-
PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
20+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
2121

2222
@property (nullable, nonatomic, copy, readonly) NSSet *channels;
2323
@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-
PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
16+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
1717

1818
@end
1919

0 commit comments

Comments
 (0)