[UIKit] Update bindings to Xcode 12 Beta 2 #8992

dalexsoto · 2020-07-02T23:28:54Z

We are still missing some APIs that can't be bound in this PR, the following task items are not necessarily needed to merge this PR but will need to be completed by Xcode 12 final:

Our generator cannot create block trampolines with generic NSObject subclasses. Filled issue [generator] Support for generic classes in our block trampolines #8993
- Enable UICollectionViewDiffableDataSourceSectionSnapshotHandlers<ItemType> commented properties.
- Enable UICollectionViewDiffableDataSourceReorderingHandlers<SectionType, ItemType> commented properties.
~~UTType from UniformTypeIdentifiers framework is not bound yet:~~
- Enable UIDocumentPickerViewController constructors when UTType is bound.
- Enable UIDocumentBrowserViewController.ctor when UTType is bound.
- Enable UIDocumentBrowserViewController.ContentTypesForRecentDocuments when UTType is bound.
NSOrderedCollectionDifference from Foundation is not bound yet:
- Enable NSDiffableDataSourceSectionTransaction<SectionIdentifierType, ItemIdentifierType>.Difference
- Enable NSDiffableDataSourceTransaction<SectionIdentifierType, ItemIdentifierType>.Difference
Expose Intents framework to tvOS
- Expose UIApplicationDelegate.GetHandlerForIntent to tvOS
[NoWatch, NoTV, NoiOS] ?
- Check future availability on UICollectionView.ContextMenuInteraction [NoWatch, NoTV, NoiOS]
- Check future availability on UISceneActivationRequestOptions.CollectionJoinBehavior [NoWatch, NoTV, NoiOS]

The above items are now part of #8943

mandel-macaque · 2020-07-03T00:25:38Z

src/UIKit/UICellAccessory.cs

+		[MonoPInvokeCallback (typeof (DUICellAccessoryPosition))]
+		static unsafe nuint Invoke (IntPtr block, IntPtr accessories) {
+			var descriptor = (BlockLiteral *) block;
+			var del = (UICellAccessoryPosition) (descriptor->Target);
+			nuint retval = del (NSArray.ArrayFromHandle<UICellAccessory> (accessories));
+			return retval;
+		}


I believe you can use BlockLiteralRef and avoid it from being unsafe, something like:

static unsafe nuint Invoke (ref BlockLiteral block, IntPtr accessories)

mandel-macaque · 2020-07-03T00:25:51Z

src/UIKit/UICellAccessory.cs

+		public unsafe NIDUICellAccessoryPosition (BlockLiteral *block) : base (block)
+		{
+			invoker = block->GetDelegateForBlock<DUICellAccessoryPosition> ();
+		}


Same, can we use ref?

that's a copy/paste of generated code and, to remain optimizable, it should follow the exact same pattern

mandel-macaque · 2020-07-03T00:26:56Z

src/UIKit/UICellAccessory.cs

+			var del = (UICellAccessoryPosition) GetExistingManagedDelegate (block);
+			return del ?? new NIDUICellAccessoryPosition ((BlockLiteral *) block).Invoke;


Move unsafe inside with an unsafe block:

Suggested change

var del = (UICellAccessoryPosition) GetExistingManagedDelegate (block);

return del ?? new NIDUICellAccessoryPosition ((BlockLiteral *) block).Invoke;

var del = (UICellAccessoryPosition) GetExistingManagedDelegate (block);

unsafe {

return del ?? new NIDUICellAccessoryPosition ((BlockLiteral *) block).Invoke;

}

mandel-macaque · 2020-07-03T00:27:25Z

src/UIKit/UICellAccessory.cs

+		}
+
+		[BindingImpl (BindingImplOptions.Optimizable)]
+		unsafe nuint Invoke (UICellAccessory [] accessories)


In unsafe needed?

Nope sorry, missed that one cleaning the code produced by the generator

mandel-macaque · 2020-07-03T00:27:52Z

src/UIKit/UIConfigurationColorTransformer.cs

+		static internal readonly DUIConfigurationColorTransformerHandler Handler = Invoke;
+
+		[MonoPInvokeCallback (typeof (DUIConfigurationColorTransformerHandler))]
+		static unsafe IntPtr Invoke (IntPtr block, IntPtr color) {


ref BlockLiteral? We get unsafe out.

mandel-macaque · 2020-07-03T00:28:49Z

src/UIKit/UIConfigurationColorTransformer.cs

+		}
+
+		[BindingImpl (BindingImplOptions.Optimizable)]
+		unsafe UIColor Invoke (UIColor color)


Do we need the unsafe?

mandel-macaque · 2020-07-03T00:31:40Z

src/appkit.cs

+		NSLayoutConstraint ConstraintEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);
+
+		[Mac (10,16)]
+		[Export ("constraintGreaterThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]
+		NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);
+
+		[Mac (10,16)]
+		[Export ("constraintLessThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]
+		NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);


I understand the naming.. but is so verbose! do we need, I'd do:

Suggested change

NSLayoutConstraint ConstraintEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintGreaterThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintLessThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

NSLayoutConstraint EqualToSystemSpaceAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintGreaterThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint GreaterThanOrEqualToSystemSpaceAfterAncho (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintLessThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint LessThanOrEqualToSystemSpaceAfterAncho (NSLayoutXAxisAnchor anchor, nfloat multiplier);

Unfortunately we can't do that, maybe for XAMCORE_4_0. This code exist on iOS too using the same names so we can increase code sharing between the platforms.

see:

xamarin-macios/src/uikit.cs

Lines 377 to 387 in 4ed6833

[TV (11,0), iOS (11,0)]

[Export ("constraintEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint ConstraintEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[TV (11,0), iOS (11,0)]

[Export ("constraintGreaterThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[TV (11,0), iOS (11,0)]

[Export ("constraintLessThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]

NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

mandel-macaque · 2020-07-03T00:33:01Z

src/appkit.cs

+
+		[Mac (10,16)]
+		[Export ("constraintEqualToSystemSpacingBelowAnchor:multiplier:")]
+		NSLayoutConstraint ConstraintEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);
+
+		[Mac (10,16)]
+		[Export ("constraintGreaterThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]
+		NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);
+
+		[Mac (10,16)]
+		[Export ("constraintLessThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]
+		NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);


Same, super verbose:

Suggested change

[Mac (10,16)]

[Export ("constraintEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint ConstraintEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintGreaterThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintLessThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint EqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintGreaterThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint GreaterThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[Mac (10,16)]

[Export ("constraintLessThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint LessThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

Same we can't :(

xamarin-macios/src/uikit.cs

Lines 401 to 411 in 4ed6833

[TV (11,0), iOS (11,0)]

[Export ("constraintEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint ConstraintEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[TV (11,0), iOS (11,0)]

[Export ("constraintGreaterThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

[TV (11,0), iOS (11,0)]

[Export ("constraintLessThanOrEqualToSystemSpacingBelowAnchor:multiplier:")]

NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingBelowAnchor (NSLayoutYAxisAnchor anchor, nfloat multiplier);

mandel-macaque · 2020-07-03T00:34:05Z

src/uikit.cs

+
+		[iOS (14,0)]
+		[Export ("updateVisibleMenuWithBlock:")]
+		void UpdateVisibleMenu (Func<UIMenu, UIMenu> handler);


Shall we use a delegate with names of what UIMenu first and UIMenu second are?

We could but we gain not much from that, what you get in the parameter is the visible menu and the method is already called UpdateVisibleMenu and the return is well a menu too :/

mandel-macaque · 2020-07-03T00:36:04Z

src/uikit.cs

-	    [Export ("updateSearchResultsForSearchController:")]
-	    void UpdateSearchResultsForSearchController (UISearchController searchController);
+		[Export ("updateSearchResultsForSearchController:")]
+		void UpdateSearchResultsForSearchController (UISearchController searchController);


Do we need 'ForSearchController'?

We can't change it, it would be a breaking change :) this is not new, looks like I fixed indentation

monojenkins · 2020-07-03T01:16:38Z

Build success
✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)
✅ Test run succeeded

src/UIKit/UICellAccessory.cs

src/uikit.cs

src/UIKit/UICellAccessory.cs

rolfbjarne · 2020-07-03T08:49:23Z

src/UIKit/UICellAccessory.cs

+		[Watch (7,0), TV (14,0), iOS (14,0)]
+		[return: DelegateProxy (typeof (SDUICellAccessoryPosition))]
+		[BindingImpl (BindingImplOptions.Optimizable)]
+		public static UICellAccessoryPosition GetPositionBeforeAccessory (Type accessoryType) => GetPositionBeforeAccessory (new Class (accessoryType));


src/UIKit/UICellAccessory.cs

rolfbjarne · 2020-07-03T08:54:18Z

src/UIKit/UICellAccessory.cs

+	internal delegate nuint DUICellAccessoryPosition (IntPtr block, IntPtr accessories);
+
+	//
+	// This class bridges native block invocations that call into C#


I wonder how complicated it would be to implement support for generating the supporting code for blocks by adding support in the generator for a [GenerateBlockCode] attribute to delegates:

[GenerateBlockCode] delegate nuint UICellAccessoryPosition (UICellAccessory [] accessories);

Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

monojenkins · 2020-07-03T18:11:59Z

Build success
✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)
✅ Test run succeeded

src/UIKit/UICellAccessory.cs

src/UIKit/UIEnums.cs

src/uikit.cs

…available on that platform

…o use GetHandle helper

monojenkins · 2020-07-07T16:10:14Z

Build failure
✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)
🔥 Test run failed 🔥

Test results

7 tests failed, 86 tests passed.

Failed tests

xammac tests/Mac Modern/Debug: BuildFailure
xammac tests/Mac Modern/Release: BuildFailure
xammac tests/Mac Modern/Release: BuildFailure
monotouch-test/watchOS 32-bits - simulator/Debug: BuildFailure
monotouch-test/watchOS 32-bits - simulator/Debug (LinkSdk): BuildFailure
monotouch-test/watchOS 32-bits - simulator/Debug (static registrar): BuildFailure
monotouch-test/watchOS 32-bits - simulator/Release (all optimizations): BuildFailure

spouliot · 2020-07-08T02:33:48Z

build

monojenkins · 2020-07-08T04:14:01Z

Build success
✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)
✅ Test run succeeded

monojenkins · 2020-07-09T15:47:21Z

Build failure
❌ Build failed or was aborted

✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)

dalexsoto

Looks good to me 👍 thanks for taking this over @spouliot

monojenkins · 2020-07-09T17:40:27Z

Build failure
✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)
🔥 Test run failed 🔥

Test results

1 tests failed, 92 tests passed.

Failed tests

link all/iOS Unified 32-bits - simulator/Debug: Failed

spouliot · 2020-07-09T18:30:47Z

test failure is a known, random issue -> https://github.com/xamarin/maccore/issues/1083

tests/monotouch-test/UIKit/CellAccessoryTest.cs

src/uikit.cs

Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

spouliot · 2020-07-10T15:00:23Z

Java NullPointerException in log :(

spouliot · 2020-07-10T15:00:30Z

build

monojenkins · 2020-07-10T16:58:07Z

Build success
✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)
✅ Test run succeeded

[UIKit] Update bindings to Xcode 12 Beta 1

f64dfd4

dalexsoto added this to the xcode12 milestone Jul 2, 2020

dalexsoto requested review from rolfbjarne and spouliot July 2, 2020 23:28

dalexsoto requested a review from chamons as a code owner July 2, 2020 23:28

spouliot mentioned this pull request Jul 2, 2020

Xcode 12 final audit checklist #8943

Open

46 tasks

mandel-macaque requested changes Jul 3, 2020

View reviewed changes

rolfbjarne requested changes Jul 3, 2020

View reviewed changes

Apply suggestions from code review

b894cf1

Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

spouliot suggested changes Jul 6, 2020

View reviewed changes

src/UIKit/UICellAccessory.cs Outdated Show resolved Hide resolved

src/UIKit/UIEnums.cs Show resolved Hide resolved

spouliot self-assigned this Jul 6, 2020

spouliot reviewed Jul 6, 2020

View reviewed changes

src/uikit.cs Outdated Show resolved Hide resolved

Sebastien Pouliot added 4 commits July 7, 2020 09:48

[uikit] Remove [Watch (7,0)] from UICellAccessory as the type is not …

9ac7152

…available on that platform

[uikit] Remove extra unsafe from UIConfigurationColorTransformer. Als…

7413434

…o use GetHandle helper

[uikit] Apply feedback, including my own

377e0d8

[tests] Add UIKit tests for manual bindings

3506f45

[tests] Fix build on watchOS and macOS

c9b2f02

Sebastien Pouliot added 2 commits July 9, 2020 09:45

Merge branch 'xcode12' into xcode12-UIKit-b1

53ca5e9

Update for beta 2

2151001

spouliot changed the title ~~[UIKit] Update bindings to Xcode 12 Beta 1~~ [UIKit] Update bindings to Xcode 12 Beta 2 Jul 9, 2020

spouliot approved these changes Jul 9, 2020

View reviewed changes

dalexsoto commented Jul 9, 2020

View reviewed changes

rolfbjarne mentioned this pull request Jul 10, 2020

Add support for delegates in FieldAttribute #9055

Open

rolfbjarne approved these changes Jul 10, 2020

View reviewed changes

tests/monotouch-test/UIKit/CellAccessoryTest.cs Outdated Show resolved Hide resolved

src/uikit.cs Show resolved Hide resolved

mandel-macaque approved these changes Jul 10, 2020

View reviewed changes

Update tests/monotouch-test/UIKit/CellAccessoryTest.cs

0708927

Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

spouliot merged commit 802bd4e into xamarin:xcode12 Jul 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[UIKit] Update bindings to Xcode 12 Beta 2 #8992

[UIKit] Update bindings to Xcode 12 Beta 2 #8992

dalexsoto commented Jul 2, 2020 •

edited by spouliot

Loading

mandel-macaque Jul 3, 2020

mandel-macaque Jul 3, 2020

spouliot Jul 6, 2020

mandel-macaque Jul 3, 2020

mandel-macaque Jul 3, 2020

dalexsoto Jul 3, 2020

mandel-macaque Jul 3, 2020

mandel-macaque Jul 3, 2020

mandel-macaque Jul 3, 2020

dalexsoto Jul 3, 2020 •

edited

Loading

mandel-macaque Jul 3, 2020

dalexsoto Jul 3, 2020

mandel-macaque Jul 3, 2020

dalexsoto Jul 3, 2020

mandel-macaque Jul 3, 2020

dalexsoto Jul 3, 2020

monojenkins commented Jul 3, 2020

rolfbjarne Jul 3, 2020

rolfbjarne Jul 3, 2020

monojenkins commented Jul 3, 2020

monojenkins commented Jul 7, 2020

Failed tests

spouliot commented Jul 8, 2020

monojenkins commented Jul 8, 2020

monojenkins commented Jul 9, 2020

dalexsoto left a comment

monojenkins commented Jul 9, 2020

Failed tests

spouliot commented Jul 9, 2020

spouliot commented Jul 10, 2020

spouliot commented Jul 10, 2020

monojenkins commented Jul 10, 2020

		var del = (UICellAccessoryPosition) GetExistingManagedDelegate (block);
		return del ?? new NIDUICellAccessoryPosition ((BlockLiteral *) block).Invoke;

	[TV (11,0), iOS (11,0)]
	[Export ("constraintEqualToSystemSpacingAfterAnchor:multiplier:")]
	NSLayoutConstraint ConstraintEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

	[TV (11,0), iOS (11,0)]
	[Export ("constraintGreaterThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]
	NSLayoutConstraint ConstraintGreaterThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

	[TV (11,0), iOS (11,0)]
	[Export ("constraintLessThanOrEqualToSystemSpacingAfterAnchor:multiplier:")]
	NSLayoutConstraint ConstraintLessThanOrEqualToSystemSpacingAfterAnchor (NSLayoutXAxisAnchor anchor, nfloat multiplier);

[UIKit] Update bindings to Xcode 12 Beta 2 #8992

[UIKit] Update bindings to Xcode 12 Beta 2 #8992

Conversation

dalexsoto commented Jul 2, 2020 • edited by spouliot Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dalexsoto Jul 3, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

monojenkins commented Jul 3, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

monojenkins commented Jul 3, 2020

monojenkins commented Jul 7, 2020

Test results

Failed tests

spouliot commented Jul 8, 2020

monojenkins commented Jul 8, 2020

monojenkins commented Jul 9, 2020

dalexsoto left a comment

Choose a reason for hiding this comment

monojenkins commented Jul 9, 2020

Test results

Failed tests

spouliot commented Jul 9, 2020

spouliot commented Jul 10, 2020

spouliot commented Jul 10, 2020

monojenkins commented Jul 10, 2020

dalexsoto commented Jul 2, 2020 •

edited by spouliot

Loading

dalexsoto Jul 3, 2020 •

edited

Loading