Skip to content

Commit 69fad74

Browse files
committed
Merge pull request #441 from ParsePlatform/nlutsenko.tvos.installation
Disable PFInstallation for tvOS target.
2 parents 8404f27 + 122fa16 commit 69fad74

File tree

7 files changed

+7
-21
lines changed

7 files changed

+7
-21
lines changed

Parse.xcodeproj/project.pbxproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,6 @@
727727
815F22E21BD04D150054659F /* PFFileStagingController.m in Sources */ = {isa = PBXBuildFile; fileRef = F50E486D1B83ED270055094D /* PFFileStagingController.m */; };
728728
815F22E31BD04D150054659F /* PFSQLiteDatabaseController.m in Sources */ = {isa = PBXBuildFile; fileRef = F51D06331B792CF10044539E /* PFSQLiteDatabaseController.m */; };
729729
815F22E41BD04D150054659F /* PFFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 815960A01ABCA3B30069EBCC /* PFFileManager.m */; };
730-
815F22E51BD04D150054659F /* PFCurrentInstallationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CD66531B4DA5A70042FC0B /* PFCurrentInstallationController.m */; };
731730
815F22E61BD04D150054659F /* PFPinningEventuallyQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */; };
732731
815F22E71BD04D150054659F /* PFRESTQueryCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 815EE94519FAD12F0076FE5D /* PFRESTQueryCommand.m */; };
733732
815F22E81BD04D150054659F /* PFRESTSessionCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 8121457C1AA4A808000B23F5 /* PFRESTSessionCommand.m */; };
@@ -777,7 +776,6 @@
777776
815F23181BD04D150054659F /* PFObjectFileCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 812B62FF1B5F30D3009CEAA9 /* PFObjectFileCoder.m */; };
778777
815F23191BD04D150054659F /* PFInternalUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 09809FB21434F98C00EC3E74 /* PFInternalUtils.m */; };
779778
815F231A1BD04D150054659F /* PFCommandRunning.m in Sources */ = {isa = PBXBuildFile; fileRef = 818D586E1B5DA43800813989 /* PFCommandRunning.m */; };
780-
815F231B1BD04D150054659F /* PFInstallationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CD66591B4DA5BA0042FC0B /* PFInstallationController.m */; };
781779
815F231C1BD04D150054659F /* BFTask+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 8103FA34198FC190000BAE3F /* BFTask+Private.m */; };
782780
815F231D1BD04D150054659F /* PFEncoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 81068EF01AE0845D00A34D13 /* PFEncoder.m */; };
783781
815F231E1BD04D150054659F /* PFJSONSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 81951F151ACB90DA00E142EB /* PFJSONSerialization.m */; };
@@ -796,7 +794,6 @@
796794
815F232B1BD04D150054659F /* PFMultiProcessFileLockController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8148815F1B795CD4008763BF /* PFMultiProcessFileLockController.m */; };
797795
815F232C1BD04D150054659F /* PFURLConstructor.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BBE12E19FFCB3700622646 /* PFURLConstructor.m */; };
798796
815F232D1BD04D150054659F /* PFDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 919311D619AE5EB20008FF12 /* PFDecoder.m */; };
799-
815F232E1BD04D150054659F /* PFInstallation.m in Sources */ = {isa = PBXBuildFile; fileRef = 44B78E12157D21B000A5E97F /* PFInstallation.m */; };
800797
815F232F1BD04D150054659F /* PFBaseState.m in Sources */ = {isa = PBXBuildFile; fileRef = F586B34F1B1E3BD70082E3BD /* PFBaseState.m */; };
801798
815F23301BD04D150054659F /* PFEventuallyPin.m in Sources */ = {isa = PBXBuildFile; fileRef = 91115EF81A097AF30092D1C9 /* PFEventuallyPin.m */; };
802799
815F23311BD04D150054659F /* PFObjectSubclassingController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C42CD31B34F68C00C720D8 /* PFObjectSubclassingController.m */; };
@@ -847,7 +844,6 @@
847844
815F23631BD04D150054659F /* PFThreadsafety.h in Headers */ = {isa = PBXBuildFile; fileRef = 818D049919A3B84500BEE20F /* PFThreadsafety.h */; };
848845
815F23641BD04D150054659F /* PFRelationState_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E8DE231B2912BC00EEA594 /* PFRelationState_Private.h */; };
849846
815F23651BD04D150054659F /* ParseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 09EEA1351435143500E3A3FA /* ParseInternal.h */; };
850-
815F23661BD04D150054659F /* PFCurrentInstallationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81CD66521B4DA5A70042FC0B /* PFCurrentInstallationController.h */; };
851847
815F23671BD04D150054659F /* PFCoreDataProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 8124C8811B27542A00758E00 /* PFCoreDataProvider.h */; };
852848
815F23681BD04D150054659F /* ParseModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 81DDB90B199A3EC200B50F35 /* ParseModule.h */; };
853849
815F23691BD04D150054659F /* PFAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E2D5AF19DDAAB5009053A1 /* PFAssert.h */; };
@@ -875,7 +871,6 @@
875871
815F237F1BD04D150054659F /* PFOfflineObjectController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8166FC691B50376D003841A2 /* PFOfflineObjectController.h */; };
876872
815F23801BD04D150054659F /* PFPropertyInfo_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 814881501B795CAC008763BF /* PFPropertyInfo_Private.h */; };
877873
815F23811BD04D150054659F /* PFCommandCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1FDDCA14E1B1BD00A77007 /* PFCommandCache.h */; };
878-
815F23821BD04D150054659F /* PFInstallationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81CD66581B4DA5BA0042FC0B /* PFInstallationController.h */; };
879874
815F23831BD04D150054659F /* PFCommandCache_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 913B9F2C1A311FF40040247C /* PFCommandCache_Private.h */; };
880875
815F23841BD04D150054659F /* PFCommandResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9455DE15B8793F0037A86D /* PFCommandResult.h */; };
881876
815F23851BD04D150054659F /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
@@ -982,7 +977,6 @@
982977
815F23F01BD04D150054659F /* PFAnonymousUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 638CBBB415191435004F54E4 /* PFAnonymousUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
983978
815F23F11BD04D150054659F /* PFObjectLocalIdStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 818D6F121B3C8D1900F94C82 /* PFObjectLocalIdStore.h */; };
984979
815F23F21BD04D150054659F /* PFPropertyInfo_Runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 8148814E1B795CAC008763BF /* PFPropertyInfo_Runtime.h */; };
985-
815F23F31BD04D150054659F /* PFInstallationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8166FC821B503794003841A2 /* PFInstallationPrivate.h */; };
986980
815F23F41BD04D150054659F /* PFURLSessionDataTaskDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BCB4BD1B744626006659CB /* PFURLSessionDataTaskDelegate.h */; };
987981
815F23F51BD04D150054659F /* PFDateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 815618FE1A1F79AC0076504A /* PFDateFormatter.h */; };
988982
815F23F61BD04D150054659F /* PFCloudCodeController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81D843C71B012FBA007CEBCB /* PFCloudCodeController.h */; };
@@ -999,7 +993,6 @@
999993
815F24011BD04D150054659F /* PFAnonymousAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 8166FCD51B503914003841A2 /* PFAnonymousAuthenticationProvider.h */; };
1000994
815F24021BD04D150054659F /* PFQueryState.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C7F4A91AF42BD9007B5418 /* PFQueryState.h */; };
1001995
815F24031BD04D150054659F /* PFObjectFileCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B62FE1B5F30D3009CEAA9 /* PFObjectFileCoder.h */; };
1002-
815F24041BD04D150054659F /* PFInstallation.h in Headers */ = {isa = PBXBuildFile; fileRef = 44B78E11157D21B000A5E97F /* PFInstallation.h */; settings = {ATTRIBUTES = (Public, ); }; };
1003996
815F24051BD04D150054659F /* PFPurchase.h in Headers */ = {isa = PBXBuildFile; fileRef = 49FDE2EC158C138F00126F64 /* PFPurchase.h */; settings = {ATTRIBUTES = (Public, ); }; };
1004997
815F24061BD04D150054659F /* PFDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 81443B311A27838500F3FD17 /* PFDevice.h */; };
1005998
815F24071BD04D150054659F /* PFQueryState_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C7F4AB1AF42BD9007B5418 /* PFQueryState_Private.h */; };
@@ -4007,7 +4000,6 @@
40074000
815F23631BD04D150054659F /* PFThreadsafety.h in Headers */,
40084001
815F23641BD04D150054659F /* PFRelationState_Private.h in Headers */,
40094002
815F23651BD04D150054659F /* ParseInternal.h in Headers */,
4010-
815F23661BD04D150054659F /* PFCurrentInstallationController.h in Headers */,
40114003
815F23671BD04D150054659F /* PFCoreDataProvider.h in Headers */,
40124004
815F23681BD04D150054659F /* ParseModule.h in Headers */,
40134005
815F23691BD04D150054659F /* PFAssert.h in Headers */,
@@ -4035,7 +4027,6 @@
40354027
815F237F1BD04D150054659F /* PFOfflineObjectController.h in Headers */,
40364028
815F23801BD04D150054659F /* PFPropertyInfo_Private.h in Headers */,
40374029
815F23811BD04D150054659F /* PFCommandCache.h in Headers */,
4038-
815F23821BD04D150054659F /* PFInstallationController.h in Headers */,
40394030
815F23831BD04D150054659F /* PFCommandCache_Private.h in Headers */,
40404031
815F23841BD04D150054659F /* PFCommandResult.h in Headers */,
40414032
815F23851BD04D150054659F /* PFURLSession.h in Headers */,
@@ -4142,7 +4133,6 @@
41424133
815F23F01BD04D150054659F /* PFAnonymousUtils.h in Headers */,
41434134
815F23F11BD04D150054659F /* PFObjectLocalIdStore.h in Headers */,
41444135
815F23F21BD04D150054659F /* PFPropertyInfo_Runtime.h in Headers */,
4145-
815F23F31BD04D150054659F /* PFInstallationPrivate.h in Headers */,
41464136
815F23F41BD04D150054659F /* PFURLSessionDataTaskDelegate.h in Headers */,
41474137
815F23F51BD04D150054659F /* PFDateFormatter.h in Headers */,
41484138
815F23F61BD04D150054659F /* PFCloudCodeController.h in Headers */,
@@ -4159,7 +4149,6 @@
41594149
815F24011BD04D150054659F /* PFAnonymousAuthenticationProvider.h in Headers */,
41604150
815F24021BD04D150054659F /* PFQueryState.h in Headers */,
41614151
815F24031BD04D150054659F /* PFObjectFileCoder.h in Headers */,
4162-
815F24041BD04D150054659F /* PFInstallation.h in Headers */,
41634152
815F24051BD04D150054659F /* PFPurchase.h in Headers */,
41644153
815F24061BD04D150054659F /* PFDevice.h in Headers */,
41654154
815F24071BD04D150054659F /* PFQueryState_Private.h in Headers */,
@@ -5140,7 +5129,6 @@
51405129
815F22E21BD04D150054659F /* PFFileStagingController.m in Sources */,
51415130
815F22E31BD04D150054659F /* PFSQLiteDatabaseController.m in Sources */,
51425131
815F22E41BD04D150054659F /* PFFileManager.m in Sources */,
5143-
815F22E51BD04D150054659F /* PFCurrentInstallationController.m in Sources */,
51445132
815F22E61BD04D150054659F /* PFPinningEventuallyQueue.m in Sources */,
51455133
815F22E71BD04D150054659F /* PFRESTQueryCommand.m in Sources */,
51465134
815F22E81BD04D150054659F /* PFRESTSessionCommand.m in Sources */,
@@ -5190,7 +5178,6 @@
51905178
815F23181BD04D150054659F /* PFObjectFileCoder.m in Sources */,
51915179
815F23191BD04D150054659F /* PFInternalUtils.m in Sources */,
51925180
815F231A1BD04D150054659F /* PFCommandRunning.m in Sources */,
5193-
815F231B1BD04D150054659F /* PFInstallationController.m in Sources */,
51945181
815F231C1BD04D150054659F /* BFTask+Private.m in Sources */,
51955182
815F231D1BD04D150054659F /* PFEncoder.m in Sources */,
51965183
815F231E1BD04D150054659F /* PFJSONSerialization.m in Sources */,
@@ -5209,7 +5196,6 @@
52095196
815F232B1BD04D150054659F /* PFMultiProcessFileLockController.m in Sources */,
52105197
815F232C1BD04D150054659F /* PFURLConstructor.m in Sources */,
52115198
815F232D1BD04D150054659F /* PFDecoder.m in Sources */,
5212-
815F232E1BD04D150054659F /* PFInstallation.m in Sources */,
52135199
815F232F1BD04D150054659F /* PFBaseState.m in Sources */,
52145200
815F23301BD04D150054659F /* PFEventuallyPin.m in Sources */,
52155201
815F23311BD04D150054659F /* PFObjectSubclassingController.m in Sources */,

Parse/Internal/Installation/Controller/PFInstallationController.h

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

1515
NS_ASSUME_NONNULL_BEGIN
1616

17-
PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
17+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
1818

1919
@property (nonatomic, weak, readonly) id<PFObjectControllerProvider, PFCurrentInstallationControllerProvider> dataSource;
2020

Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern NSString *const PFCurrentInstallationPinName;
2222
@class BFTask PF_GENERIC(__covariant BFGenericType);
2323
@class PFInstallation;
2424

25-
PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
25+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
2626

2727
@property (nonatomic, weak, readonly) id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider> commonDataSource;
2828
@property (nonatomic, weak, readonly) id<PFObjectFilePersistenceControllerProvider> coreDataSource;

Parse/Internal/PFCoreManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ - (void)setSessionController:(PFSessionController *)sessionController {
342342
});
343343
}
344344

345-
#if !TARGET_OS_WATCH
345+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
346346

347347
///--------------------------------------
348348
#pragma mark - Current Installation Controller
@@ -400,7 +400,7 @@ - (void)setCurrentUserController:(PFCurrentUserController *)currentUserControlle
400400
});
401401
}
402402

403-
#if !TARGET_OS_WATCH
403+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
404404

405405
///--------------------------------------
406406
#pragma mark - Installation Controller

Parse/Internal/ParseManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ - (BFTask *)preloadDiskObjectsToMemoryAsync {
377377
@strongify(self);
378378
[PFUser currentUser];
379379
[PFConfig currentConfig];
380-
#if !TARGET_OS_WATCH
380+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
381381
[PFInstallation currentInstallation];
382382
#endif
383383

Parse/PFInstallation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PF_ASSUME_NONNULL_BEGIN
3333
the Parse cloud can be used to target push notifications.
3434
*/
3535

36-
PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
36+
PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
3737

3838
///--------------------------------------
3939
/// @name Accessing the Current Installation

Parse/Parse.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ + (void)setApplicationId:(NSString *)applicationId clientKey:(NSString *)clientK
7878
[subclassingController registerSubclass:[PFRole class]];
7979
[subclassingController registerSubclass:[PFPin class]];
8080
[subclassingController registerSubclass:[PFEventuallyPin class]];
81-
#if !TARGET_OS_WATCH
81+
#if !TARGET_OS_WATCH && !TARGET_OS_TV
8282
[subclassingController registerSubclass:[PFInstallation class]];
8383
#if TARGET_OS_IOS
8484
[subclassingController registerSubclass:[PFProduct class]];

0 commit comments

Comments
 (0)