Skip to content

Commit

Permalink
Merge branch 'cloudkit-xcode13-beta1' of github.com:mandel-macaque/xa…
Browse files Browse the repository at this point in the history 
…marin-macios into cloudkit-xcode13-beta1
  • Loading branch information
@mandel-macaque
mandel-macaque committed Jun 16, 2021
2 parents f435b02 + e89fc18 commit 8ea5c62
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/CloudKit/Enums.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public enum CKAccountStatus : long {
Available = 1,
Restricted = 2,
NoAccount = 3,
[Mac(12,0), iOS(15,0), TV(15,0), MacCatalyst(15,0)]
[Mac (12,0), iOS (15,0), TV (15,0), MacCatalyst (15,0)]
TemporarilyUnavailable = 4,
}

Expand Down Expand Up @@ -132,7 +132,7 @@ public enum CKRecordZoneCapabilities : ulong {
Atomic = 1 << 1,
[iOS (10,0), TV (10,0), Mac (10,12)]
Sharing = 1 << 2,
[Mac(12,0), iOS(15,0), TV(15,0)]
[Mac (12,0), iOS (15,0), TV (15,0)]
ZoneWideSharing = 1 << 3,

}
Expand Down
56 changes: 28 additions & 28 deletions src/cloudkit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ interface CKShareMetadata : NSCopying, NSSecureCoding
[NullAllowed, Export ("rootRecord", ArgumentSemantic.Strong)]
CKRecord RootRecord { get; }

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[NullAllowed, Export ("hierarchicalRootRecordID", ArgumentSemantic.Copy)]
CKRecordID HierarchicalRootRecordId { get; }
}
Expand All @@ -138,7 +138,7 @@ interface CKShare
[DesignatedInitializer]
IntPtr Constructor (CKRecord rootRecord, CKRecordID shareID);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("initWithRecordZoneID:")]
[DesignatedInitializer]
IntPtr Constructor (CKRecordZoneID recordZoneId);
Expand Down Expand Up @@ -472,7 +472,7 @@ interface CKErrorFields {
[Field ("CKErrorRetryAfterKey")]
NSString ErrorRetryAfterKey { get; }

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Field ("CKErrorUserDidResetEncryptedDataKey")]
NSString UserDidResetEncryptedDataKey { get; }
}
Expand Down Expand Up @@ -593,7 +593,7 @@ CKFetchRecordChangesHandler AllChangesReported {
[iOS (10,0), Watch (3,0), TV (10,0), Mac (10,12)]
delegate void CKFetchRecordZoneChangesFetchCompletedHandler (CKRecordZoneID recordZoneID, CKServerChangeToken serverChangeToken, NSData clientChangeTokenData, bool moreComing, NSError recordZoneError);

[iOS (15,0), Watch (8,0), TV (15,0), Mac (12,0)]
[iOS (15,0), Watch (8,0), TV (15,0), Mac (12,0), MacCatalyst (15,0)]
delegate void CKFetchRecordZoneChangesRecordWasChangedHandler (CKRecordID recordId, CKRecord record, NSError error);

[iOS (10,0), Watch (3,0), TV (10,0), Mac (10,12)]
Expand Down Expand Up @@ -655,7 +655,7 @@ interface CKFetchRecordZoneChangesOperation
Action<NSError> ChangesCompleted { get; set; }

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("recordWasChangedBlock", ArgumentSemantic.Copy)]
CKFetchRecordZoneChangesRecordWasChangedHandler RecordWasChangedHandler { get; set; }
}
Expand Down Expand Up @@ -744,7 +744,7 @@ CKFetchRecordsCompletedHandler Completed {
[iOS (8,0), Mac (10,10)]
delegate void CKRecordZoneCompleteHandler (NSDictionary recordZonesByZoneId, NSError operationError);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKRecordZonePerRecordZoneCompletionHandler (CKRecordZoneID recordZoneId, CKRecordZone recordZone, NSError error);

[iOS (8,0), Watch (3,0), TV (10,0), Mac (10,10)]
Expand Down Expand Up @@ -775,7 +775,7 @@ CKRecordZoneCompleteHandler Completed {
CKFetchRecordZonesOperation FetchAllRecordZonesOperation ();

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perRecordZoneCompletionBlock", ArgumentSemantic.Copy)]
CKRecordZonePerRecordZoneCompletionHandler PerRecordZoneCompletionHandler { get; set; }
}
Expand All @@ -784,7 +784,7 @@ CKRecordZoneCompleteHandler Completed {
[iOS (8,0), Mac (10,10)]
delegate void CKFetchSubscriptionsCompleteHandler (NSDictionary subscriptionsBySubscriptionId, NSError operationError);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKFetchSubscriptionsPerSubscriptionCompletionHandler (NSString subscriptionId, CKSubscription subscription, NSError error);

[iOS (8,0), Mac (10,10)]
Expand Down Expand Up @@ -816,7 +816,7 @@ CKFetchSubscriptionsCompleteHandler Completed {
CKFetchSubscriptionsOperation FetchAllSubscriptionsOperation ();

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perSubscriptionCompletionBlock", ArgumentSemantic.Copy)]
CKFetchSubscriptionsPerSubscriptionCompletionHandler PerSubscriptionCompletionHandler { get; set; }
}
Expand Down Expand Up @@ -894,10 +894,10 @@ Action<NSError> Completed {
[iOS (8,0), Mac (10,10), Watch (3,0)]
delegate void CKModifyRecordsOperationHandler (CKRecord [] savedRecords, CKRecordID [] deletedRecordIds, NSError operationError);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKModifyRecordsOperationPerRecordSaveHandler (CKRecordID recordId, CKRecord record, NSError error);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKModifyRecordsOperationPerRecordDeleteHandler (CKRecordID recordId, NSError error);

[iOS (8,0), Watch (3,0), TV (10,0), Mac (10,10)]
Expand Down Expand Up @@ -957,12 +957,12 @@ CKModifyRecordsOperationHandler Completed {
bool Atomic { get; set; }

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perRecordSaveBlock", ArgumentSemantic.Copy)]
CKModifyRecordsOperationPerRecordSaveHandler PerRecordSaveHandler { get; set; }

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perRecordDeleteBlock", ArgumentSemantic.Copy)]
CKModifyRecordsOperationPerRecordDeleteHandler PerRecordDeleteHandler { get; set; }

Expand All @@ -971,10 +971,10 @@ CKModifyRecordsOperationHandler Completed {
[iOS (8,0), Mac (10,10)]
delegate void CKModifyRecordZonesHandler (CKRecordZone [] savedRecordZones, CKRecordZoneID [] deletedRecordZoneIds, NSError operationError);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKModifyRecordZonesPerRecordZoneSaveHandler (CKRecordZoneID zoneId, CKRecordZone zone, NSError error);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKModifyRecordZonesPerRecordZoneDeleteHandler (CKRecordZoneID zoneId, NSError error);

[iOS (8,0), Watch (3,0), TV (10,0), Mac (10,10)]
Expand Down Expand Up @@ -1005,23 +1005,23 @@ CKModifyRecordZonesHandler Completed {
}

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perRecordZoneSaveBlock", ArgumentSemantic.Copy)]
CKModifyRecordZonesPerRecordZoneSaveHandler PerRecordZoneSaveHandler { get; set; }

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perRecordZoneDeleteBlock", ArgumentSemantic.Copy)]
CKModifyRecordZonesPerRecordZoneDeleteHandler PerRecordZoneDeleteHandler { get; set; }
}

[iOS (8,0), Mac (10,10)]
delegate void CKModifySubscriptionsHandler (CKSubscription [] savedSubscriptions, string [] deletedSubscriptionIds, NSError operationError);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKModifySubscriptionsPerSubscriptionSaveHandler (NSString subscriptionId, CKSubscription subscription, NSError error);

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKModifySubscriptionsPerSubscriptionDeleteHandler (NSString subscriptionId, NSError error);

[iOS (8,0), Mac (10,10)]
Expand Down Expand Up @@ -1053,12 +1053,12 @@ CKModifySubscriptionsHandler Completed {
}

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perSubscriptionSaveBlock", ArgumentSemantic.Copy)]
CKModifySubscriptionsPerSubscriptionSaveHandler PerSubscriptionSaveHandler { get; set; }

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("perSubscriptionDeleteBlock", ArgumentSemantic.Copy)]
CKModifySubscriptionsPerSubscriptionDeleteHandler PerSubscriptionDeleteHandler { get; set; }
}
Expand Down Expand Up @@ -1357,7 +1357,7 @@ interface CKQuery : NSSecureCoding, NSCopying {
NSSortDescriptor [] SortDescriptors { get; set; }
}

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
delegate void CKQueryOperationRecordMatchedHandler (CKRecordID recordId, CKRecord record, NSError error);

[iOS (8,0), Watch (3,0), TV (10,0), Mac (10,10)]
Expand Down Expand Up @@ -1416,7 +1416,7 @@ Action<CKQueryCursor, NSError> Completed {
}

[NullAllowed]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("recordMatchedBlock", ArgumentSemantic.Copy)]
CKQueryOperationRecordMatchedHandler RecordMatchedHandler { get; set; }
}
Expand Down Expand Up @@ -1453,7 +1453,7 @@ interface CKRecord : NSSecureCoding, NSCopying {
[Field ("CKRecordTypeShare")]
NSString TypeShare { get; }

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Field ("CKRecordNameZoneWideShare")]
NSString NameZoneWideShare { get; }

Expand Down Expand Up @@ -1577,7 +1577,7 @@ interface CKRecordZone : NSSecureCoding, NSCopying {
[Export ("defaultRecordZone")]
CKRecordZone DefaultRecordZone ();

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[NullAllowed, Export ("share", ArgumentSemantic.Copy)]
CKReference Share { get; }
}
Expand Down Expand Up @@ -1887,7 +1887,7 @@ interface CKDiscoverAllUserIdentitiesOperation
Action<NSError> Completed { get; set; }
}

[iOS (15,0), Watch (8,0), TV (15,0), Mac (12,0)]
[iOS (15,0), Watch (8,0), TV (15,0), Mac (12,0), MacCatalyst (15,0)]
delegate void CKFetchShareParticipantsOperationPerShareParticipantCompletionHandler (CKUserIdentityLookupInfo identityLookupInfo, CKShareParticipant participant, NSError error);

[iOS (10,0), Watch (3,0), TV (10,0), Mac (10,12)]
Expand Down Expand Up @@ -1918,7 +1918,7 @@ interface CKFetchShareParticipantsOperation
Action<NSError> Completed { get; set; }

[NullAllowed]
[iOS (15,0), Watch (8,0), TV (15,0), Mac (12,0), MacCatalyst(15,0)]
[iOS (15,0), Watch (8,0), TV (15,0), Mac (12,0), MacCatalyst (15,0)]
[Export ("perShareParticipantCompletionBlock", ArgumentSemantic.Copy)]
CKFetchShareParticipantsOperationPerShareParticipantCompletionHandler PerShareParticipantCompletionBlock { get; set; }
}
Expand Down Expand Up @@ -2022,7 +2022,7 @@ interface CKFetchDatabaseChangesOperation
[NullAllowed, Export ("fetchDatabaseChangesCompletionBlock", ArgumentSemantic.Copy)]
CKFetchDatabaseChangesCompletionHandler ChangesCompleted { get; set; }

[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst(15,0)]
[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[NullAllowed, Export ("recordZoneWithIDWasDeletedDueToUserEncryptedDataResetBlock", ArgumentSemantic.Copy)]
Action<CKRecordZoneID> RecordZoneWithIdWasDeletedDueToUserEncryptedDataReset { get; set; }
}
Expand Down

0 comments on commit 8ea5c62

Please sign in to comment.