Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/8.0.1xx] [NerabyInteraction] Add support for xcode 15. #19315

Merged
merged 3 commits into from
Oct 24, 2023
Merged

[release/8.0.1xx] [NerabyInteraction] Add support for xcode 15. #19315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e252b1
[NerabyInteraction] Add support for xcode 15.
mandel-macaque Oct 19, 2023
011a5d3
Auto-format source code
Oct 19, 2023
a53c9c2
Update src/nearbyinteraction.cs
mandel-macaque Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/NearbyInteraction/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public enum NIErrorCode : long {
UserDidNotAllow = -5884,
AccessoryPeerDeviceUnavailable = -5882,
InvalidARConfiguration = -5883,
IncompatiblePeerDevice = -5881,
ActiveExtendedDistanceSessionsLimitExceeded = -5880,
}

[Watch (8, 0), NoTV, NoMac, iOS (14, 0)]
Expand Down
17 changes: 16 additions & 1 deletion src/nearbyinteraction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ interface NIConfiguration : NSCopying, NSSecureCoding { }
[MacCatalyst (14, 0)]
[BaseType (typeof (NSObject))]
[DisableDefaultCtor]
interface NIDiscoveryToken : NSCopying, NSSecureCoding { }
interface NIDiscoveryToken : NSCopying, NSSecureCoding {
[Watch (10, 0), NoTV, NoMac, iOS (17, 0), MacCatalyst (17, 0)]
[Export ("deviceCapabilities", ArgumentSemantic.Copy)]
INIDeviceCapability DeviceCapabilities { get; }
}

[Watch (8, 0), NoTV, NoMac, iOS (14, 0)]
[MacCatalyst (14, 0)]
Expand All @@ -57,6 +61,10 @@ interface NINearbyPeerConfiguration {
[NoWatch, iOS (16, 0), MacCatalyst (16, 0), NoTV, NoMac]
[Export ("cameraAssistanceEnabled")]
bool CameraAssistanceEnabled { [Bind ("isCameraAssistanceEnabled")] get; set; }

[Watch (10, 0), NoTV, NoMac, iOS (17, 0), MacCatalyst (17, 0)]
[Export ("extendedDistanceMeasurementEnabled")]
bool ExtendedDistanceMeasurementEnabled { [Bind ("isExtendedDistanceMeasurementEnabled")] get; set; }
}

[Watch (8, 0), NoTV, NoMac, iOS (14, 0)]
Expand Down Expand Up @@ -231,6 +239,13 @@ interface NIDeviceCapability {
[Abstract]
[Export ("supportsCameraAssistance")]
bool SupportsCameraAssistance { get; }

[Watch (10, 0), NoTV, NoMac, iOS (17, 0), MacCatalyst (17, 0)]
#if XAMCORE_5_0
[Abstract]
#endif
[Export ("supportsExtendedDistanceMeasurement")]
bool SupportsExtendedDistanceMeasurement { get; }
}

[Watch (9, 0), NoTV, NoMac, iOS (16, 0), MacCatalyst (16, 0)]
Expand Down
1 change: 1 addition & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-NearbyInteraction.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!incorrect-protocol-member! NIDeviceCapability::supportsExtendedDistanceMeasurement is REQUIRED and should be abstract
6 changes: 0 additions & 6 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-NearbyInteraction.todo
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/xtro-sharpie/iOS-NearbyInteraction.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!incorrect-protocol-member! NIDeviceCapability::supportsExtendedDistanceMeasurement is REQUIRED and should be abstract
6 changes: 0 additions & 6 deletions tests/xtro-sharpie/iOS-NearbyInteraction.todo
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/xtro-sharpie/watchOS-NearbyInteraction.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!incorrect-protocol-member! NIDeviceCapability::supportsExtendedDistanceMeasurement is REQUIRED and should be abstract
6 changes: 0 additions & 6 deletions tests/xtro-sharpie/watchOS-NearbyInteraction.todo
View file
Open in desktop

This file was deleted.