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

[homekit] Update for Xcode 9 beta 5 #2492

Merged
merged 1 commit into from
Aug 15, 2017
Merged

[homekit] Update for Xcode 9 beta 5 #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 15 additions & 18 deletions src/HomeKit/HMEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,24 +1271,21 @@ public enum HMHomeHubState : nuint {
}

[Watch (4,0), TV (11,0), iOS (11,0)]
public enum HMPresenceType {

[Field ("HMPresenceTypeCurrentUserAtHome")]
CurrentUserAtHome,

[Field ("HMPresenceTypeCurrentUserNotAtHome")]
CurrentUserNotAtHome,

[Field ("HMPresenceTypeAnyUserAtHome")]
AnyUserAtHome,

[Field ("HMPresenceTypeNoUserAtHome")]
NoUserAtHome,

[Field ("HMPresenceTypeUsersAtHome")]
UsersAtHome,
[Native]
public enum HMPresenceEventType : nuint {
EveryEntry = 1,
EveryExit = 2,
FirstEntry = 3,
LastExit = 4,
AtHome = FirstEntry,
NotAtHome = LastExit,
}

[Field ("HMPresenceTypeUsersNotAtHome")]
UsersNotAtHome,
[Watch (4,0), TV (11,0), iOS (11,0)]
[Native]
public enum HMPresenceEventUserType : nuint {
CurrentUser = 1,
HomeUsers = 2,
CustomUsers = 3,
}
}
17 changes: 0 additions & 17 deletions src/HomeKit/HMMutablePresenceEvent.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/HomeKit/HMPresenceEvent.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/frameworks.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,9 +816,7 @@ HOMEKIT_SOURCES = \
HomeKit/HMCharacteristicProperties.cs \
HomeKit/HMEventTrigger.cs \
HomeKit/HMHome.cs \
HomeKit/HMPresenceEvent.cs \
HomeKit/HMSignificantTimeEvent.cs \
HomeKit/HMMutablePresenceEvent.cs \
HomeKit/HMMutableSignificantTimeEvent.cs \
HomeKit/HMService.cs \

Expand Down
38 changes: 10 additions & 28 deletions src/homekit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,6 @@ interface HMEventTrigger {
[NoWatch]
[iOS (11,0)]
[Export ("initWithName:events:endEvents:recurrences:predicate:")]
[DesignatedInitializer]
IntPtr Constructor (string name, HMEvent[] events, [NullAllowed] HMEvent[] endEvents, [NullAllowed] NSDateComponents[] recurrences, [NullAllowed] NSPredicate predicate);

[Export ("events", ArgumentSemantic.Copy)]
Expand Down Expand Up @@ -1675,20 +1674,14 @@ interface HMNumberRange {
[DisableDefaultCtor]
interface HMPresenceEvent : NSMutableCopying {

[Internal]
[Export ("initWithPresenceType:")]
IntPtr Constructor (NSString presenceType);

[Wrap ("this (HMPresenceTypeExtensions.GetConstant (presenceType))")]
IntPtr Constructor (HMPresenceType presenceType);
[Export ("initWithPresenceEventType:presenceUserType:")]
IntPtr Constructor (HMPresenceEventType presenceEventType, HMPresenceEventUserType presenceUserType);

[Internal]
[Export ("presenceType")]
NSString _PresenceType { get; [NotImplemented] set; }
[Export ("presenceEventType")]
HMPresenceEventType PresenceEventType { get; [NotImplemented] set; }

// FIXME: Bug https://bugzilla.xamarin.com/show_bug.cgi?id=57870
// [Wrap ("HMPresenceTypeExtensions.GetValue (_PresenceType)")]
// HMPresenceType PresenceType { get; [NotImplemented] set; }
[Export ("presenceUserType")]
HMPresenceEventUserType PresenceUserType { get; [NotImplemented] set; }

[Field ("HMPresenceKeyPath")]
NSString KeyPath { get; }
Expand All @@ -1699,22 +1692,11 @@ interface HMPresenceEvent : NSMutableCopying {
[DisableDefaultCtor]
interface HMMutablePresenceEvent {

[Internal]
[Export ("initWithPresenceType:")]
IntPtr Constructor (NSString presenceType);

[Wrap ("this (HMPresenceTypeExtensions.GetConstant (presenceType))")]
IntPtr Constructor (HMPresenceType presenceType);

[Internal]
[Override]
[Export ("presenceType")]
NSString _PresenceType { get; set; }
[Export ("presenceEventType", ArgumentSemantic.Assign)]
HMPresenceEventType PresenceEventType { get; /* Radar 33883958: https://trello.com/c/TIlzWzrL*/ [NotImplemented] set; }

// FIXME: Bug https://bugzilla.xamarin.com/show_bug.cgi?id=57870
// [Override]
// [Wrap ("HMPresenceTypeExtensions.GetValue (_PresenceType)")]
// HMPresenceType PresenceType { get; set; }
[Export ("presenceUserType", ArgumentSemantic.Assign)]
HMPresenceEventUserType PresenceUserType { get; /* Radar 33883958: https://trello.com/c/TIlzWzrL*/ [NotImplemented] set; }
}

[Watch (4,0), TV (11,0), iOS (11,0)]
Expand Down
43 changes: 0 additions & 43 deletions tests/monotouch-test/HomeKit/HMMutablePresenceEventTest.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions tests/monotouch-test/HomeKit/HMPresenceEventTest.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tests/monotouch-test/monotouch-test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,9 +652,7 @@
<Compile Include="CoreText\CTParagraphStyleTests.cs" />
<Compile Include="CoreData\NSQueryGenerationTokenTest.cs" />
<Compile Include="EventKit\EKUIBundleTest.cs" />
<Compile Include="HomeKit\HMMutablePresenceEventTest.cs" />
<Compile Include="HomeKit\HMMutableSignificantTimeEventTest.cs" />
<Compile Include="HomeKit\HMPresenceEventTest.cs" />
<Compile Include="HomeKit\HMSignificantTimeEventTest.cs" />
<Compile Include="UIKit\UIDragDropSessionExtensionsTest.cs" />
<Compile Include="SpriteKit\SKTransformNodeTest.cs" />
Expand Down