Skip to content

Commit

Permalink
[SpriteKit] Implement Xcode 16.0 beta 1-6 changes. (#21053)
Browse files Browse the repository at this point in the history
Note: there were no changes in beta 2, beta 3, beta 4, beta 5 or beta 6.
  • Loading branch information
rolfbjarne authored Aug 23, 2024
1 parent d5b5944 commit a4f9a50
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/spritekit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ interface SK3DNode {
partial interface SKNode : NSSecureCoding, NSCopying {
#elif IOS || TVOS
[BaseType (typeof (UIResponder))]
partial interface SKNode : NSSecureCoding, NSCopying, UIFocusItem {
partial interface SKNode : NSSecureCoding, NSCopying, UIFocusItem, UIFocusItemContainer, UICoordinateSpace {
#else // WATCHOS
[BaseType (typeof (NSObject))]
partial interface SKNode : NSSecureCoding, NSCopying {
Expand Down
2 changes: 2 additions & 0 deletions src/uikit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3553,6 +3553,7 @@ interface IUICoordinateSpace { }
[Abstract]
[NoWatch]
[MacCatalyst (13, 1)]
[NoMac]
interface UICoordinateSpace {
[Abstract]
[Export ("bounds")]
Expand Down Expand Up @@ -23409,6 +23410,7 @@ interface UIDocumentBrowserAction {
interface IUIFocusItemContainer { }
[iOS (12, 0), TV (12, 0), NoWatch]
[MacCatalyst (13, 1)]
[NoMac]
[Protocol]
interface UIFocusItemContainer {
[Abstract]
Expand Down
7 changes: 7 additions & 0 deletions tests/cecil-tests/Documentation.KnownFailures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46125,6 +46125,10 @@ M:SpriteKit.SKKeyframeSequence.Copy(Foundation.NSZone)
M:SpriteKit.SKKeyframeSequence.EncodeTo(Foundation.NSCoder)
M:SpriteKit.SKNode.Add(SpriteKit.SKNode)
M:SpriteKit.SKNode.AddNodes(SpriteKit.SKNode[])
M:SpriteKit.SKNode.ConvertPointFromCoordinateSpace(CoreGraphics.CGPoint,UIKit.IUICoordinateSpace)
M:SpriteKit.SKNode.ConvertPointToCoordinateSpace(CoreGraphics.CGPoint,UIKit.IUICoordinateSpace)
M:SpriteKit.SKNode.ConvertRectFromCoordinateSpace(CoreGraphics.CGRect,UIKit.IUICoordinateSpace)
M:SpriteKit.SKNode.ConvertRectToCoordinateSpace(CoreGraphics.CGRect,UIKit.IUICoordinateSpace)
M:SpriteKit.SKNode.Copy(Foundation.NSZone)
M:SpriteKit.SKNode.Create(System.String,Foundation.NSSet{ObjCRuntime.Class},Foundation.NSError@)
M:SpriteKit.SKNode.Create(System.String,System.Type[],Foundation.NSError@)
Expand All @@ -46134,6 +46138,7 @@ M:SpriteKit.SKNode.Dispose(System.Boolean)
M:SpriteKit.SKNode.EncodeTo(Foundation.NSCoder)
M:SpriteKit.SKNode.FromFile``1(System.String)
M:SpriteKit.SKNode.GetEnumerator
M:SpriteKit.SKNode.GetFocusItems(CoreGraphics.CGRect)
M:SpriteKit.SKNode.GetObstaclesFromNodeBounds(SpriteKit.SKNode[])
M:SpriteKit.SKNode.GetObstaclesFromNodePhysicsBodies(SpriteKit.SKNode[])
M:SpriteKit.SKNode.GetObstaclesFromSpriteTextures(SpriteKit.SKNode[],System.Single)
Expand Down Expand Up @@ -73860,7 +73865,9 @@ P:SpriteKit.SKEffectNode.WarpGeometry
P:SpriteKit.SKFieldNode.Enabled
P:SpriteKit.SKFieldNode.Exclusive
P:SpriteKit.SKLightNode.Enabled
P:SpriteKit.SKNode.Bounds
P:SpriteKit.SKNode.CanBecomeFocused
P:SpriteKit.SKNode.CoordinateSpace
P:SpriteKit.SKNode.FocusEffect
P:SpriteKit.SKNode.FocusGroupIdentifier
P:SpriteKit.SKNode.FocusGroupPriority
Expand Down
6 changes: 6 additions & 0 deletions tests/introspection/ApiProtocolTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,12 @@ protected virtual bool Skip (Type type, string protocolName)
if (type.Name == "NSTextAttachment")
return true;
break;
case "UIFocusItemContainer":
case "UICoordinateSpace":
// SKVideoNode started implementing UIFocusItemContainer and UICoordinateSpace in Xcode 16
if (type.Name == "SKVideoNode" && !TestRuntime.CheckXcodeVersion (16, 0))
return true;
break;
}
return false;
}
Expand Down
10 changes: 10 additions & 0 deletions tests/introspection/ApiSelectorTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,16 @@ protected virtual bool Skip (Type type, string selectorName)
if (!TestRuntime.CheckXcodeVersion (12, 0))
return true;
break;
case "convertPoint:fromCoordinateSpace:":
case "convertPoint:toCoordinateSpace:":
case "convertRect:fromCoordinateSpace:":
case "convertRect:toCoordinateSpace:":
case "focusItemsInRect:":
case "bounds":
case "coordinateSpace":
if (!TestRuntime.CheckXcodeVersion (16, 0))
return true;
break;
}
break;
case "INPriceRange":
Expand Down
24 changes: 24 additions & 0 deletions tests/introspection/iOS/iOSApiProtocolTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,30 @@ protected override bool Skip (Type type, string protocolName)
// Undocumented conformance (members were inlinded in 'UIViewController' before so all subtypes should conform)
case "UIStateRestoring":
return type.Name == "UIViewController" || type.IsSubclassOf (typeof (UIViewController));
#endif
#if __IOS__ || __TVOS__
case "UIFocusItemContainer":
case "UICoordinateSpace":
switch (type.Name) {
case "SK3DNode":
case "SKAudioNode":
case "SKCameraNode":
case "SKCropNode":
case "SKEffectNode":
case "SKEmitterNode":
case "SKFieldNode":
case "SKLabelNode":
case "SKLightNode":
case "SKNode":
case "SKReferenceNode":
case "SKScene":
case "SKShapeNode":
case "SKSpriteNode":
case "SKTileMapNode":
case "SKTransformNode":
return !TestRuntime.CheckXcodeVersion (16, 0);
}
break;
#endif
}
return base.Skip (type, protocolName);
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-SpriteKit.todo

This file was deleted.

2 changes: 0 additions & 2 deletions tests/xtro-sharpie/api-annotations-dotnet/tvOS-SpriteKit.todo

This file was deleted.

2 changes: 0 additions & 2 deletions tests/xtro-sharpie/iOS-SpriteKit.todo

This file was deleted.

2 changes: 0 additions & 2 deletions tests/xtro-sharpie/tvOS-SpriteKit.todo

This file was deleted.

9 comments on commit a4f9a50

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.