diff --git a/src/CloudKit/Enums.cs b/src/CloudKit/Enums.cs index 405366aef194..1bb79f1b6dd9 100644 --- a/src/CloudKit/Enums.cs +++ b/src/CloudKit/Enums.cs @@ -141,7 +141,7 @@ public enum CKReferenceAction : ulong { } // NSInteger -> CKSubscription.h - [NoWatch] + [Watch (6,0)] [iOS (8,0)] [Mac (10, 10)] [Native] @@ -210,7 +210,7 @@ public enum CKShareParticipantType : long PublicUser = 4, } - [NoWatch] + [Watch (6,0)] [iOS (10,0), Mac(10,12)] [Native] public enum CKQuerySubscriptionOptions : ulong diff --git a/src/cloudkit.cs b/src/cloudkit.cs index d0f7998af322..088ff35607ea 100644 --- a/src/cloudkit.cs +++ b/src/cloudkit.cs @@ -393,22 +393,22 @@ interface CKDatabase { void DeleteRecordZone (CKRecordZoneID zoneId, Action completionHandler); [Export ("fetchSubscriptionWithID:completionHandler:")] - [NoWatch] + [Watch (6,0)] [Async] void FetchSubscription (string subscriptionId, Action completionHandler); - [NoWatch] + [Watch (6,0)] [Export ("fetchAllSubscriptionsWithCompletionHandler:")] [Async] void FetchAllSubscriptions (Action completionHandler); - [NoWatch] + [Watch (6,0)] [Export ("saveSubscription:completionHandler:")] [Async] void SaveSubscription (CKSubscription subscription, Action completionHandler); [Export ("deleteSubscriptionWithID:completionHandler:")] - [NoWatch] + [Watch (6,0)] [Async] void DeleteSubscription (string subscriptionID, CKDatabaseDeleteSubscriptionHandler completionHandler); } @@ -832,7 +832,7 @@ CKRecordZoneCompleteHandler Completed { delegate void CKFetchSubscriptionsCompleteHandler (NSDictionary subscriptionsBySubscriptionId, NSError operationError); [iOS (8,0), Mac (10,10, onlyOn64 : true)] - [NoWatch] + [Watch (6,0)] [BaseType (typeof (CKDatabaseOperation))] [DisableDefaultCtor] // designated interface CKFetchSubscriptionsOperation { @@ -1020,7 +1020,7 @@ CKModifyRecordZonesHandler Completed { delegate void CKModifySubscriptionsHandler (CKSubscription [] savedSubscriptions, string [] deletedSubscriptionIds, NSError operationError); [iOS (8,0), Mac (10,10, onlyOn64 : true)] - [NoWatch] + [Watch (6,0)] [BaseType (typeof (CKDatabaseOperation))] [DisableDefaultCtor] // designated interface CKModifySubscriptionsOperation { @@ -1584,7 +1584,7 @@ interface CKReference : NSSecureCoding, NSCopying, CKRecordValue { CKRecordID RecordId { get; } } - [NoWatch] + [Watch (6,0)] [iOS (10,0)][TV (10,0), Mac (10,12, onlyOn64 : true)] [DisableDefaultCtor] [BaseType (typeof(CKSubscription))] @@ -1610,7 +1610,7 @@ interface CKQuerySubscription : NSSecureCoding, NSCopying CKQuerySubscriptionOptions SubscriptionOptions { get; } } - [NoWatch] + [Watch (6,0)] [iOS (10,0)][TV (10,0), Mac (10,12, onlyOn64 : true)] [DisableDefaultCtor] [BaseType (typeof(CKSubscription))] @@ -1631,7 +1631,7 @@ interface CKRecordZoneSubscription : NSSecureCoding, NSCopying string RecordType { get; set; } } - [NoWatch] + [Watch (6,0)] [iOS (10,0)][TV (10,0), Mac (10,12, onlyOn64 : true)] [BaseType (typeof(CKSubscription))] interface CKDatabaseSubscription : NSSecureCoding, NSCopying @@ -1644,27 +1644,31 @@ interface CKDatabaseSubscription : NSSecureCoding, NSCopying string RecordType { get; set; } } - [NoWatch] + [Watch (6,0)] [iOS (8,0), Mac (10,10, onlyOn64 : true)] [DisableDefaultCtor] // objc_exception_throw on [CKSubscription init] [BaseType (typeof (NSObject))] interface CKSubscription : NSSecureCoding, NSCopying { + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscription'.")] [Export ("initWithRecordType:predicate:options:")] IntPtr Constructor (string recordType, NSPredicate predicate, CKSubscriptionOptions subscriptionOptions); + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscription'.")] [Export ("initWithRecordType:predicate:subscriptionID:options:")] IntPtr Constructor (string recordType, NSPredicate predicate, string subscriptionId, CKSubscriptionOptions subscriptionOptions); + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKRecordZoneSubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKRecordZoneSubscription'.")] [Export ("initWithZoneID:options:")] IntPtr Constructor (CKRecordZoneID zoneId, CKSubscriptionOptions subscriptionOptions); + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKRecordZoneSubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKRecordZoneSubscription'.")] [Export ("initWithZoneID:subscriptionID:options:")] @@ -1675,33 +1679,37 @@ interface CKSubscription : NSSecureCoding, NSCopying { [Export ("subscriptionType", ArgumentSemantic.UnsafeUnretained)] CKSubscriptionType SubscriptionType { get; } - + + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscription'.")] [Export ("recordType")] string RecordType { get; } + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscription'.")] [Export ("predicate", ArgumentSemantic.Copy)] NSPredicate Predicate { get; } + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscriptionOptions'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscriptionOptions'.")] [Export ("subscriptionOptions", ArgumentSemantic.UnsafeUnretained)] CKSubscriptionOptions SubscriptionOptions { get; } - [TV (10,0)] + [TV (10,0), Watch (6,0)] [Export ("notificationInfo", ArgumentSemantic.Copy)] CKNotificationInfo NotificationInfo { get; set; } + [NoWatch] [Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKRecordZoneSubscription'.")] [Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKRecordZoneSubscription'.")] [Export ("zoneID", ArgumentSemantic.Copy)] CKRecordZoneID ZoneID { get; set; } } - [NoWatch] + [Watch (6,0)] [iOS (8,0)][TV (10,0), Mac (10,10, onlyOn64 : true)] [BaseType (typeof (NSObject))] interface CKNotificationInfo : NSSecureCoding, NSCopying, NSCoding { diff --git a/tests/xtro-sharpie/watchOS-CloudKit.ignore b/tests/xtro-sharpie/watchOS-CloudKit.ignore index 15148b962eae..ba0d523d52bf 100644 --- a/tests/xtro-sharpie/watchOS-CloudKit.ignore +++ b/tests/xtro-sharpie/watchOS-CloudKit.ignore @@ -46,3 +46,6 @@ !missing-selector! CKModifyRecordsOperation::init not bound !missing-selector! CKModifyRecordZonesOperation::init not bound !missing-selector! CKQueryOperation::init not bound + +## Types (and members) added and deprecated in the same version (watchOS 6,0) +!missing-selector! CKSubscription::recordType not bound \ No newline at end of file diff --git a/tests/xtro-sharpie/watchOS-CloudKit.todo b/tests/xtro-sharpie/watchOS-CloudKit.todo deleted file mode 100644 index bcd18424101e..000000000000 --- a/tests/xtro-sharpie/watchOS-CloudKit.todo +++ /dev/null @@ -1,85 +0,0 @@ -!missing-enum! CKQuerySubscriptionOptions not bound -!missing-enum! CKSubscriptionType not bound -!missing-selector! +CKFetchSubscriptionsOperation::fetchAllSubscriptionsOperation not bound -!missing-selector! CKDatabase::deleteSubscriptionWithID:completionHandler: not bound -!missing-selector! CKDatabase::fetchAllSubscriptionsWithCompletionHandler: not bound -!missing-selector! CKDatabase::fetchSubscriptionWithID:completionHandler: not bound -!missing-selector! CKDatabase::saveSubscription:completionHandler: not bound -!missing-selector! CKDatabaseSubscription::init not bound -!missing-selector! CKDatabaseSubscription::initWithSubscriptionID: not bound -!missing-selector! CKDatabaseSubscription::recordType not bound -!missing-selector! CKDatabaseSubscription::setRecordType: not bound -!missing-selector! CKFetchSubscriptionsOperation::fetchSubscriptionCompletionBlock not bound -!missing-selector! CKFetchSubscriptionsOperation::init not bound -!missing-selector! CKFetchSubscriptionsOperation::initWithSubscriptionIDs: not bound -!missing-selector! CKFetchSubscriptionsOperation::setFetchSubscriptionCompletionBlock: not bound -!missing-selector! CKFetchSubscriptionsOperation::setSubscriptionIDs: not bound -!missing-selector! CKFetchSubscriptionsOperation::subscriptionIDs not bound -!missing-selector! CKModifySubscriptionsOperation::init not bound -!missing-selector! CKModifySubscriptionsOperation::initWithSubscriptionsToSave:subscriptionIDsToDelete: not bound -!missing-selector! CKModifySubscriptionsOperation::modifySubscriptionsCompletionBlock not bound -!missing-selector! CKModifySubscriptionsOperation::setModifySubscriptionsCompletionBlock: not bound -!missing-selector! CKModifySubscriptionsOperation::setSubscriptionIDsToDelete: not bound -!missing-selector! CKModifySubscriptionsOperation::setSubscriptionsToSave: not bound -!missing-selector! CKModifySubscriptionsOperation::subscriptionIDsToDelete not bound -!missing-selector! CKModifySubscriptionsOperation::subscriptionsToSave not bound -!missing-selector! CKNotificationInfo::alertActionLocalizationKey not bound -!missing-selector! CKNotificationInfo::alertBody not bound -!missing-selector! CKNotificationInfo::alertLaunchImage not bound -!missing-selector! CKNotificationInfo::alertLocalizationArgs not bound -!missing-selector! CKNotificationInfo::alertLocalizationKey not bound -!missing-selector! CKNotificationInfo::category not bound -!missing-selector! CKNotificationInfo::collapseIDKey not bound -!missing-selector! CKNotificationInfo::desiredKeys not bound -!missing-selector! CKNotificationInfo::setAlertActionLocalizationKey: not bound -!missing-selector! CKNotificationInfo::setAlertBody: not bound -!missing-selector! CKNotificationInfo::setAlertLaunchImage: not bound -!missing-selector! CKNotificationInfo::setAlertLocalizationArgs: not bound -!missing-selector! CKNotificationInfo::setAlertLocalizationKey: not bound -!missing-selector! CKNotificationInfo::setCategory: not bound -!missing-selector! CKNotificationInfo::setCollapseIDKey: not bound -!missing-selector! CKNotificationInfo::setDesiredKeys: not bound -!missing-selector! CKNotificationInfo::setShouldBadge: not bound -!missing-selector! CKNotificationInfo::setShouldSendContentAvailable: not bound -!missing-selector! CKNotificationInfo::setShouldSendMutableContent: not bound -!missing-selector! CKNotificationInfo::setSoundName: not bound -!missing-selector! CKNotificationInfo::setSubtitle: not bound -!missing-selector! CKNotificationInfo::setSubtitleLocalizationArgs: not bound -!missing-selector! CKNotificationInfo::setSubtitleLocalizationKey: not bound -!missing-selector! CKNotificationInfo::setTitle: not bound -!missing-selector! CKNotificationInfo::setTitleLocalizationArgs: not bound -!missing-selector! CKNotificationInfo::setTitleLocalizationKey: not bound -!missing-selector! CKNotificationInfo::shouldBadge not bound -!missing-selector! CKNotificationInfo::shouldSendContentAvailable not bound -!missing-selector! CKNotificationInfo::shouldSendMutableContent not bound -!missing-selector! CKNotificationInfo::soundName not bound -!missing-selector! CKNotificationInfo::subtitle not bound -!missing-selector! CKNotificationInfo::subtitleLocalizationArgs not bound -!missing-selector! CKNotificationInfo::subtitleLocalizationKey not bound -!missing-selector! CKNotificationInfo::title not bound -!missing-selector! CKNotificationInfo::titleLocalizationArgs not bound -!missing-selector! CKNotificationInfo::titleLocalizationKey not bound -!missing-selector! CKQuerySubscription::initWithRecordType:predicate:options: not bound -!missing-selector! CKQuerySubscription::initWithRecordType:predicate:subscriptionID:options: not bound -!missing-selector! CKQuerySubscription::predicate not bound -!missing-selector! CKQuerySubscription::querySubscriptionOptions not bound -!missing-selector! CKQuerySubscription::recordType not bound -!missing-selector! CKQuerySubscription::setZoneID: not bound -!missing-selector! CKQuerySubscription::zoneID not bound -!missing-selector! CKRecordZoneSubscription::initWithZoneID: not bound -!missing-selector! CKRecordZoneSubscription::initWithZoneID:subscriptionID: not bound -!missing-selector! CKRecordZoneSubscription::recordType not bound -!missing-selector! CKRecordZoneSubscription::setRecordType: not bound -!missing-selector! CKRecordZoneSubscription::zoneID not bound -!missing-selector! CKSubscription::notificationInfo not bound -!missing-selector! CKSubscription::recordType not bound -!missing-selector! CKSubscription::setNotificationInfo: not bound -!missing-selector! CKSubscription::subscriptionID not bound -!missing-selector! CKSubscription::subscriptionType not bound -!missing-type! CKDatabaseSubscription not bound -!missing-type! CKFetchSubscriptionsOperation not bound -!missing-type! CKModifySubscriptionsOperation not bound -!missing-type! CKNotificationInfo not bound -!missing-type! CKQuerySubscription not bound -!missing-type! CKRecordZoneSubscription not bound -!missing-type! CKSubscription not bound