Skip to content

Commit c0197a1

Browse files
[xcode26.1] Update AccessorySetupKit to beta 1. (#23897)
--------- Co-authored-by: Alex Soto <alex@soto.dev>
1 parent 0a1c48d commit c0197a1

File tree

5 files changed

+83
-14
lines changed

5 files changed

+83
-14
lines changed

src/accessorysetupkit.cs

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public enum ASAccessoryEventType : long {
8787
AccessoryAdded = 30,
8888
AccessoryRemoved = 31,
8989
AccessoryChanged = 32,
90+
Discovered = 33,
9091
PickerDidPresent = 40,
9192
PickerDidDismiss = 50,
9293
PickerSetupBridging = 60,
@@ -156,9 +157,21 @@ interface ASAccessorySession {
156157
[iOS (26, 0)]
157158
[Export ("updateAuthorization:descriptor:completionHandler:")]
158159
void UpdateAuthorization (ASAccessory accessory, ASDiscoveryDescriptor descriptor, ASAccessorySessionUpdateAuthorizationHandler completionHandler);
160+
161+
[Async]
162+
[iOS (26, 1)]
163+
[Export ("updatePickerShowingDiscoveredDisplayItems:completionHandler:")]
164+
void UpdatePicker (ASDiscoveredDisplayItem [] showingDisplayItems, ASAccessorySessionUpdatePickerHandler completionHandler);
165+
166+
[Async]
167+
[iOS (26, 1)]
168+
[Export ("finishPickerDiscovery:")]
169+
void FinishPickerDiscovery (ASAccessorySessionFinishPickerDiscoveryHandler completionHandler);
159170
}
160171

161172
delegate void ASAccessorySessionUpdateAuthorizationHandler ([NullAllowed] NSError error);
173+
delegate void ASAccessorySessionUpdatePickerHandler ([NullAllowed] NSError error);
174+
delegate void ASAccessorySessionFinishPickerDiscoveryHandler ([NullAllowed] NSError error);
162175

163176
[BaseType (typeof (NSObject))]
164177
[iOS (18, 0)]
@@ -295,6 +308,10 @@ interface ASMigrationDisplayItem {
295308
[Export ("initWithName:productImage:descriptor:")]
296309
[DesignatedInitializer]
297310
NativeHandle Constructor (string name, UIImage productImage, ASDiscoveryDescriptor descriptor);
311+
312+
[iOS (26, 1)]
313+
[Export ("wifiAwarePairedDeviceID")]
314+
ulong WifiAwarePairedDeviceId { get; set; }
298315
}
299316

300317
[iOS (26, 0)]
@@ -328,6 +345,10 @@ interface ASPickerDisplaySettings {
328345

329346
[Export ("discoveryTimeout")]
330347
double DiscoveryTimeout { get; set; }
348+
349+
[iOS (26, 1)]
350+
[Export ("options", ArgumentSemantic.Assign)]
351+
ASPickerDisplaySettingsOptions Options { get; set; }
331352
}
332353

333354
[Static]
@@ -343,5 +364,40 @@ partial interface ASPickerDisplaySettingsDiscoveryTimeout {
343364
[iOS (26, 0)]
344365
[Field ("ASPickerDisplaySettingsDiscoveryTimeoutLong")]
345366
double Long { get; }
367+
368+
[iOS (26, 1)]
369+
[Field ("ASPickerDisplaySettingsDiscoveryTimeoutUnbounded")]
370+
double Unbounded { get; }
371+
}
372+
373+
[iOS (26, 1)]
374+
[BaseType (typeof (ASAccessory))]
375+
interface ASDiscoveredAccessory {
376+
[NullAllowed]
377+
[Wrap ("WeakBluetoothAdvertisementData")]
378+
CoreBluetooth.AdvertisementData BluetoothAdvertisementData { get; }
379+
380+
[NullAllowed, Export ("bluetoothAdvertisementData", ArgumentSemantic.Copy)]
381+
NSDictionary WeakBluetoothAdvertisementData { get; }
382+
383+
[Export ("bluetoothRSSI", ArgumentSemantic.Copy)]
384+
[BindAs (typeof (nint?))]
385+
NSNumber BluetoothRSSI { get; }
386+
}
387+
388+
[iOS (26, 1)]
389+
[BaseType (typeof (ASPickerDisplayItem))]
390+
[DisableDefaultCtor]
391+
interface ASDiscoveredDisplayItem {
392+
[Export ("initWithName:productImage:accessory:")]
393+
NativeHandle Constructor (string name, UIImage productImage, ASDiscoveredAccessory accessory);
394+
}
395+
396+
[iOS (26, 1)]
397+
[Flags]
398+
[Native]
399+
public enum ASPickerDisplaySettingsOptions : ulong {
400+
None = 0,
401+
FilterDiscoveryResults = (1uL << 0),
346402
}
347403
}

tests/cecil-tests/Documentation.KnownFailures.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ F:AccessorySetupKit.ASAccessoryEventType.AccessoryAdded
142142
F:AccessorySetupKit.ASAccessoryEventType.AccessoryChanged
143143
F:AccessorySetupKit.ASAccessoryEventType.AccessoryRemoved
144144
F:AccessorySetupKit.ASAccessoryEventType.Activated
145+
F:AccessorySetupKit.ASAccessoryEventType.Discovered
145146
F:AccessorySetupKit.ASAccessoryEventType.Invalidated
146147
F:AccessorySetupKit.ASAccessoryEventType.MigrationComplete
147148
F:AccessorySetupKit.ASAccessoryEventType.PickerDidDismiss
@@ -177,6 +178,8 @@ F:AccessorySetupKit.ASErrorCode.UserRestricted
177178
F:AccessorySetupKit.ASPickerDisplayItemSetupOptions.ConfirmAuthorization
178179
F:AccessorySetupKit.ASPickerDisplayItemSetupOptions.FinishInApp
179180
F:AccessorySetupKit.ASPickerDisplayItemSetupOptions.Rename
181+
F:AccessorySetupKit.ASPickerDisplaySettingsOptions.FilterDiscoveryResults
182+
F:AccessorySetupKit.ASPickerDisplaySettingsOptions.None
180183
F:AddressBook.ABPropertyType.MultiMask
181184
F:AdServices.AAAttributionErrorCode.InternalError
182185
F:AdServices.AAAttributionErrorCode.NetworkError
@@ -8140,11 +8143,13 @@ M:Accessibility.AXPrefers.HorizontalTextEnabled
81408143
M:Accessibility.AXPrefers.NonBlinkingTextInsertionIndicator
81418144
M:AccessorySetupKit.ASAccessorySession.FailAuthorizationAsync(AccessorySetupKit.ASAccessory)
81428145
M:AccessorySetupKit.ASAccessorySession.FinishAuthorizationAsync(AccessorySetupKit.ASAccessory,AccessorySetupKit.ASAccessorySettings)
8146+
M:AccessorySetupKit.ASAccessorySession.FinishPickerDiscoveryAsync
81438147
M:AccessorySetupKit.ASAccessorySession.RemoveAccessoryAsync(AccessorySetupKit.ASAccessory)
81448148
M:AccessorySetupKit.ASAccessorySession.RenameAccessoryAsync(AccessorySetupKit.ASAccessory,AccessorySetupKit.ASAccessoryRenameOptions)
81458149
M:AccessorySetupKit.ASAccessorySession.ShowPickerAsync
81468150
M:AccessorySetupKit.ASAccessorySession.ShowPickerAsync(AccessorySetupKit.ASPickerDisplayItem[])
81478151
M:AccessorySetupKit.ASAccessorySession.UpdateAuthorizationAsync(AccessorySetupKit.ASAccessory,AccessorySetupKit.ASDiscoveryDescriptor)
8152+
M:AccessorySetupKit.ASAccessorySession.UpdatePickerAsync(AccessorySetupKit.ASDiscoveredDisplayItem[])
81488153
M:Accounts.ACAccountStore.Dispose(System.Boolean)
81498154
M:AddressBook.ABAddressBook.add_ExternalChange(System.EventHandler{AddressBook.ExternalChangeEventArgs})
81508155
M:AddressBook.ABAddressBook.remove_ExternalChange(System.EventHandler{AddressBook.ExternalChangeEventArgs})
@@ -18132,6 +18137,7 @@ P:Accessibility.IAXCustomContentProvider.AccessibilityCustomContentHandler
1813218137
P:Accessibility.IAXDataAxisDescriptor.AttributedTitle
1813318138
P:Accessibility.IAXDataAxisDescriptor.Title
1813418139
P:Accessibility.IAXMathExpressionProvider.AccessibilityMathExpression
18140+
P:AccessorySetupKit.ASDiscoveredAccessory.BluetoothAdvertisementData
1813518141
P:AddressBook.ABMultiValue`1.Item(System.IntPtr)
1813618142
P:AppClip.APActivationPayload.Url
1813718143
P:AppKit.INSAccessibility.AccessibilityActivationPoint
@@ -24812,14 +24818,17 @@ T:Accessibility.ValueDescriptionProviderHandler
2481224818
T:AccessorySetupKit.ASAccessoryEventType
2481324819
T:AccessorySetupKit.ASAccessoryRenameOptions
2481424820
T:AccessorySetupKit.ASAccessorySessionCompletionHandler
24821+
T:AccessorySetupKit.ASAccessorySessionFinishPickerDiscoveryHandler
2481524822
T:AccessorySetupKit.ASAccessorySessionUpdateAuthorizationHandler
24823+
T:AccessorySetupKit.ASAccessorySessionUpdatePickerHandler
2481624824
T:AccessorySetupKit.ASAccessoryState
2481724825
T:AccessorySetupKit.ASAccessorySupportOptions
2481824826
T:AccessorySetupKit.ASDiscoveryDescriptorRange
2481924827
T:AccessorySetupKit.ASDiscoveryDescriptorWiFiAwareServiceRole
2482024828
T:AccessorySetupKit.ASErrorCode
2482124829
T:AccessorySetupKit.ASPickerDisplayItemSetupOptions
2482224830
T:AccessorySetupKit.ASPickerDisplaySettingsDiscoveryTimeout
24831+
T:AccessorySetupKit.ASPickerDisplaySettingsOptions
2482324832
T:Accounts.ACLinkedInKey
2482424833
T:AdServices.AAAttributionErrorCode
2482524834
T:AppClip.APActivationPayload

tests/introspection/ApiCtorInitTest.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,12 @@ protected virtual bool Match (ConstructorInfo ctor, Type type)
457457
var cstr = ctor.ToString ();
458458

459459
switch (type.Name) {
460+
case "ASDiscoveredDisplayItem":
461+
switch (cstr) {
462+
case "Void .ctor(System.String, UIKit.UIImage, AccessorySetupKit.ASDiscoveryDescriptor)": // NS_UNAVAILABLE
463+
return true;
464+
}
465+
break;
460466
case "MKTileOverlayRenderer":
461467
// NSInvalidArgumentEception Expected a MKTileOverlay
462468
// looks like Apple has not yet added a DI for this type, but it should be `initWithTileOverlay:`

tests/introspection/ApiProtocolTest.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ protected virtual bool Skip (Type type, string protocolName)
330330
case "ASPropertyCompareString":
331331
case "PKAddIdentityDocumentMetadata":
332332
return true;
333+
// Xcode 26.1 Conformance not in headers
334+
case "ASDiscoveredAccessory":
335+
case "ASDiscoveredDisplayItem":
336+
return true;
333337
}
334338
break;
335339
case "NSMutableCopying":
@@ -561,6 +565,10 @@ protected virtual bool Skip (Type type, string protocolName)
561565
case "ASPropertyCompareString":
562566
case "PKAddIdentityDocumentMetadata":
563567
return true;
568+
// Xcode 26.1 Conformance not in headers
569+
case "ASDiscoveredAccessory":
570+
case "ASDiscoveredDisplayItem":
571+
return true;
564572
}
565573
break;
566574
case "NSSecureCoding":
@@ -795,6 +803,10 @@ protected virtual bool Skip (Type type, string protocolName)
795803
case "ASPropertyCompareString":
796804
case "PKAddIdentityDocumentMetadata":
797805
return true;
806+
// Xcode 26.1 Conformance not in headers
807+
case "ASDiscoveredAccessory":
808+
case "ASDiscoveredDisplayItem":
809+
return true;
798810
}
799811
break;
800812
// conformance added in Xcode 8 (iOS 10 / macOS 10.12)

tests/xtro-sharpie/api-annotations-dotnet/iOS-AccessorySetupKit.todo

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)