Skip to content

Commit

Permalink
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)
Browse files Browse the repository at this point in the history
  • Loading branch information
tj-devel709 committed Jul 13, 2021
1 parent 78e2251 commit ecd8dcc
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 40 deletions.
5 changes: 5 additions & 0 deletions src/GameKit/GameKit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public enum GKError : long {
FriendListDescriptionMissing = 100,
FriendListRestricted = 101,
FriendListDenied = 102,
FriendRequestNotAvailable = 103,
}

[Native]
Expand Down Expand Up @@ -261,6 +262,8 @@ public enum GKGameCenterViewControllerState : long {
LocalPlayerProfile = 3,
[iOS (14,0)][TV (14,0)]
Dashboard = 4,
[iOS (15,0), Mac (12,0), MacCatalyst (15,0), TV (15,0), NoWatch]
LocalPlayerFriendsList = 5,
}

// NSInteger -> GKMatchmaker.h
Expand Down Expand Up @@ -343,6 +346,8 @@ public enum GKMatchmakingMode : long
Default = 0,
NearbyOnly = 1,
AutomatchOnly = 2,
[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
InviteOnly = 3,
}

[Watch (7,4), TV (14,5), Mac (11,3), iOS (14,5)]
Expand Down
21 changes: 21 additions & 0 deletions src/gamekit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#else
using UIKit;
using NSViewController = Foundation.NSObject;
using NSWindow = Foundation.NSObject;
#endif

namespace GameKit {
Expand Down Expand Up @@ -853,6 +854,18 @@ interface GKLocalPlayer
Action<NSViewController, NSError> AuthenticateHandler { get; set; }
#endif

[NoWatch, NoTV, Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("isPresentingFriendRequestViewController")]
bool IsPresentingFriendRequestViewController { get; }

[NoWatch, NoTV, NoMac, iOS (15,0), NoMacCatalyst]
[Export ("presentFriendRequestCreatorFromViewController:error:")]
bool PresentFriendRequestCreator (UIViewController viewController, [NullAllowed] out NSError error);

[NoWatch, NoTV, NoiOS, Mac (12,0), NoMacCatalyst]
[Export ("presentFriendRequestCreatorFromWindow:error:")]
bool PresentFriendRequestCreator ([NullAllowed] NSWindow window, [NullAllowed] out NSError error);

[iOS (7,0)][Mac (10,10)] // Mismarked in header, 17613142
[Export ("loadDefaultLeaderboardIdentifierWithCompletionHandler:")]
[Async]
Expand Down Expand Up @@ -1429,6 +1442,10 @@ interface GKMatchmakerViewController
[TV (14,0), Mac (11,0), iOS (14,0)]
[Export ("matchmakingMode", ArgumentSemantic.Assign)]
GKMatchmakingMode MatchmakingMode { get; set; }

[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("canStartWithMinimumPlayers")]
bool CanStartWithMinimumPlayers { get; set; }
}

[NoWatch]
Expand Down Expand Up @@ -2082,6 +2099,10 @@ interface GKTurnBasedMatchmakerViewController : UIAppearance
[Export ("showExistingMatches", ArgumentSemantic.Assign)]
bool ShowExistingMatches { get; set; }

[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("matchmakingMode", ArgumentSemantic.Assign)]
GKMatchmakingMode MatchmakingMode { get; set; }

[Export ("initWithMatchRequest:")]
IntPtr Constructor (GKMatchRequest request);

Expand Down
9 changes: 9 additions & 0 deletions tests/xtro-sharpie/MacCatalyst-GameKit.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@
!missing-selector! GKFriendRequestComposeViewControllerGKFriendRequestComposeViewController::setComposeViewDelegate: not bound
!missing-selector! GKFriendRequestComposeViewControllerGKFriendRequestComposeViewController::setMessage: not bound
!missing-type! GKFriendRequestComposeViewController not bound

# Deprecated
!incorrect-protocol-member! GKMatchmakerViewControllerDelegate::matchmakerViewController:didFindPlayers: is OPTIONAL and should NOT be abstract
!incorrect-protocol-member! GKTurnBasedMatchmakerViewControllerDelegate::turnBasedMatchmakerViewController:didFindMatch: is OPTIONAL and should NOT be abstract
!incorrect-protocol-member! GKTurnBasedMatchmakerViewControllerDelegate::turnBasedMatchmakerViewController:playerQuitForMatch: is OPTIONAL and should NOT be abstract

# Are only available for TvOS
!missing-selector! GKAccessPoint::isFocused not bound
!missing-selector! GKAccessPoint::setFocused: not bound
14 changes: 0 additions & 14 deletions tests/xtro-sharpie/MacCatalyst-GameKit.todo

This file was deleted.

9 changes: 0 additions & 9 deletions tests/xtro-sharpie/iOS-GameKit.todo

This file was deleted.

9 changes: 0 additions & 9 deletions tests/xtro-sharpie/macOS-GameKit.todo

This file was deleted.

7 changes: 0 additions & 7 deletions tests/xtro-sharpie/tvOS-GameKit.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/watchOS-GameKit.todo

This file was deleted.

8 comments on commit ecd8dcc

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ [CI Build] Tests passed on Build. ✅

Tests passed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)

Packages generated

View packages

🎉 All 221 tests passed 🎉

Pipeline on Agent XAMBOT-1027.BigSur'
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 Tests failed catastrophically on VSTS: device tests tvOS 🔥

Not enough free space in the host.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Catalina (10.15) ✅

Tests passed

All tests on macOS X Mac Catalina (10.15) passed.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Mojave (10.14) ✅

Tests passed

All tests on macOS X Mac Mojave (10.14) passed.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac High Sierra (10.13) ✅

Tests passed

All tests on macOS X Mac High Sierra (10.13) passed.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[GameKit] Updates for Xcode13 Beta 1-2 (#12091)

Please sign in to comment.