From 9c20b15babbaa08b07dc8dd089e768a8a62f10dc Mon Sep 17 00:00:00 2001 From: dkimitsa Date: Mon, 6 Nov 2023 10:26:04 +0200 Subject: [PATCH] * ios17 bindings: post-processing run, with latest Bro-gen changes --- compiler/cocoatouch/src/main/bro-gen/coredata.yaml | 4 ++++ compiler/cocoatouch/src/main/bro-gen/matter.yaml | 5 ++++- .../apple/addressbook/ABPersonImageFormat.java | 6 ++++-- .../java/org/robovm/apple/coreml/MLCustomLayer.java | 2 +- .../robovm/apple/coreml/MLCustomLayerAdapter.java | 2 +- .../apple/fileprovider/NSFileProviderManager.java | 6 +++--- .../robovm/apple/metal/MTLComputePipelineState.java | 2 +- .../org/robovm/apple/metal/MTLLinkedFunctions.java | 12 ++++++------ .../metal/MTLRenderPipelineFunctionsDescriptor.java | 12 ++++++------ .../apple/metal/MTLStitchedLibraryDescriptor.java | 4 ++-- .../org/robovm/apple/metalkit/MTKTextureLoader.java | 10 +++++----- .../apple/uikit/UIApplicationShortcutItem.java | 8 ++++---- .../uikit/UIMutableApplicationShortcutItem.java | 6 +++--- 13 files changed, 44 insertions(+), 35 deletions(-) diff --git a/compiler/cocoatouch/src/main/bro-gen/coredata.yaml b/compiler/cocoatouch/src/main/bro-gen/coredata.yaml index 95b5197ce..21543f3be 100755 --- a/compiler/cocoatouch/src/main/bro-gen/coredata.yaml +++ b/compiler/cocoatouch/src/main/bro-gen/coredata.yaml @@ -897,6 +897,10 @@ protocols: name: getSectionIndexTitle '-controller:didChangeContentWithSnapshot:': name: didChangeContent + parameters: + snapshot: + type: NSDiffableDataSourceSnapshot # as its declared in UIKit and template parameters are not picked from cursor_obj_c_class_ref + '-controller:didChangeContentWithDifference:': name: didChangeContent NSFetchedResultsSectionInfo: # DONE diff --git a/compiler/cocoatouch/src/main/bro-gen/matter.yaml b/compiler/cocoatouch/src/main/bro-gen/matter.yaml index 9b6e95667..2e0d00305 100755 --- a/compiler/cocoatouch/src/main/bro-gen/matter.yaml +++ b/compiler/cocoatouch/src/main/bro-gen/matter.yaml @@ -5,7 +5,10 @@ framework: Matter clang_args: [ '-x', 'objective-c' ] headers: - /System/Library/Frameworks/Matter.framework/Headers/Matter.h -exclude_deprecated: true + +# drop anything that is deprecated in version 17.0 and below +min_usable_version: 17.0 + private_typedefs: NSCopying: NSObject diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/addressbook/ABPersonImageFormat.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/addressbook/ABPersonImageFormat.java index a37d69de0..92b3e7c24 100755 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/addressbook/ABPersonImageFormat.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/addressbook/ABPersonImageFormat.java @@ -32,9 +32,11 @@ /**/ /**/ - +/** + * @deprecated Deprecated in iOS 9.0. + */ /**/ -/**//**/ +/**/@Deprecated/**/ public enum /**/ABPersonImageFormat/**/ implements ValuedEnum { /**/ Thumbnail(0L), diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayer.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayer.java index f042d2a35..44ceb57d8 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayer.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayer.java @@ -60,7 +60,7 @@ @Method(selector = "evaluateOnCPUWithInputs:outputs:error:") boolean evaluateOnCPU(NSArray inputs, NSArray outputs, NSError.NSErrorPtr error); @Method(selector = "encodeToCommandBuffer:inputs:outputs:error:") - boolean encodeToCommandBuffer(org.robovm.apple.metal.MTLCommandBuffer commandBuffer, NSArray inputs, NSArray outputs, NSError.NSErrorPtr error); + boolean encodeToCommandBuffer(org.robovm.apple.metal.MTLCommandBuffer commandBuffer, NSArray inputs, NSArray outputs, NSError.NSErrorPtr error); /**/ /**/ /**/ diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayerAdapter.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayerAdapter.java index 4fe664200..21d27790e 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayerAdapter.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/coreml/MLCustomLayerAdapter.java @@ -60,6 +60,6 @@ @NotImplemented("evaluateOnCPUWithInputs:outputs:error:") public boolean evaluateOnCPU(NSArray inputs, NSArray outputs, NSError.NSErrorPtr error) { return false; } @NotImplemented("encodeToCommandBuffer:inputs:outputs:error:") - public boolean encodeToCommandBuffer(org.robovm.apple.metal.MTLCommandBuffer commandBuffer, NSArray inputs, NSArray outputs, NSError.NSErrorPtr error) { return false; } + public boolean encodeToCommandBuffer(org.robovm.apple.metal.MTLCommandBuffer commandBuffer, NSArray inputs, NSArray outputs, NSError.NSErrorPtr error) { return false; } /**/ } diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/fileprovider/NSFileProviderManager.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/fileprovider/NSFileProviderManager.java index 6c6603834..e729a3f71 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/fileprovider/NSFileProviderManager.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/fileprovider/NSFileProviderManager.java @@ -250,9 +250,9 @@ public NSArray listAvailableTestingOperations() throws NSErrorException { /** * @since Available in iOS 16.0 and later. */ - public NSDictionary runTestingOperations(NSArray operations) throws NSErrorException { + public NSDictionary runTestingOperations(NSArray operations) throws NSErrorException { NSError.NSErrorPtr ptr = new NSError.NSErrorPtr(); - NSDictionary result = runTestingOperations(operations, ptr); + NSDictionary result = runTestingOperations(operations, ptr); if (ptr.get() != null) { throw new NSErrorException(ptr.get()); } return result; } @@ -260,6 +260,6 @@ public NSArray listAvailableTestingOperations() throws NSErrorException { * @since Available in iOS 16.0 and later. */ @Method(selector = "runTestingOperations:error:") - private native NSDictionary runTestingOperations(NSArray operations, NSError.NSErrorPtr error); + private native NSDictionary runTestingOperations(NSArray operations, NSError.NSErrorPtr error); /**/ } diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLComputePipelineState.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLComputePipelineState.java index e696226ba..61733c3d1 100755 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLComputePipelineState.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLComputePipelineState.java @@ -89,7 +89,7 @@ * @since Available in iOS 14.0 and later. */ @Method(selector = "newComputePipelineStateWithAdditionalBinaryFunctions:error:") - public native MTLComputePipelineState newComputePipelineState(NSArray functions, NSError.NSErrorPtr error); + public native MTLComputePipelineState newComputePipelineState(NSArray functions, NSError.NSErrorPtr error); /** * @since Available in iOS 14.0 and later. */ diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLLinkedFunctions.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLLinkedFunctions.java index 5b813a03c..eb75169aa 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLLinkedFunctions.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLLinkedFunctions.java @@ -51,19 +51,19 @@ public MTLLinkedFunctions() {} /**/ /**/ @Property(selector = "functions") - public native NSArray getFunctions(); + public native NSArray getFunctions(); @Property(selector = "setFunctions:") - public native void setFunctions(NSArray v); + public native void setFunctions(NSArray v); /** * @since Available in iOS 14.0 and later. */ @Property(selector = "binaryFunctions") - public native NSArray getBinaryFunctions(); + public native NSArray getBinaryFunctions(); /** * @since Available in iOS 14.0 and later. */ @Property(selector = "setBinaryFunctions:") - public native void setBinaryFunctions(NSArray v); + public native void setBinaryFunctions(NSArray v); @Property(selector = "groups") public native NSDictionary getGroups(); @Property(selector = "setGroups:") @@ -72,12 +72,12 @@ public MTLLinkedFunctions() {} * @since Available in iOS 15.0 and later. */ @Property(selector = "privateFunctions") - public native NSArray getPrivateFunctions(); + public native NSArray getPrivateFunctions(); /** * @since Available in iOS 15.0 and later. */ @Property(selector = "setPrivateFunctions:") - public native void setPrivateFunctions(NSArray v); + public native void setPrivateFunctions(NSArray v); /**/ /**//**/ /**/ diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLRenderPipelineFunctionsDescriptor.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLRenderPipelineFunctionsDescriptor.java index 610d29ad8..61f01cb3d 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLRenderPipelineFunctionsDescriptor.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLRenderPipelineFunctionsDescriptor.java @@ -51,17 +51,17 @@ public MTLRenderPipelineFunctionsDescriptor() {} /**/ /**/ @Property(selector = "vertexAdditionalBinaryFunctions") - public native NSArray getVertexAdditionalBinaryFunctions(); + public native NSArray getVertexAdditionalBinaryFunctions(); @Property(selector = "setVertexAdditionalBinaryFunctions:") - public native void setVertexAdditionalBinaryFunctions(NSArray v); + public native void setVertexAdditionalBinaryFunctions(NSArray v); @Property(selector = "fragmentAdditionalBinaryFunctions") - public native NSArray getFragmentAdditionalBinaryFunctions(); + public native NSArray getFragmentAdditionalBinaryFunctions(); @Property(selector = "setFragmentAdditionalBinaryFunctions:") - public native void setFragmentAdditionalBinaryFunctions(NSArray v); + public native void setFragmentAdditionalBinaryFunctions(NSArray v); @Property(selector = "tileAdditionalBinaryFunctions") - public native NSArray getTileAdditionalBinaryFunctions(); + public native NSArray getTileAdditionalBinaryFunctions(); @Property(selector = "setTileAdditionalBinaryFunctions:") - public native void setTileAdditionalBinaryFunctions(NSArray v); + public native void setTileAdditionalBinaryFunctions(NSArray v); /**/ /**//**/ /**/ diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLStitchedLibraryDescriptor.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLStitchedLibraryDescriptor.java index 3b5246e49..0aebea5ca 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLStitchedLibraryDescriptor.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/metal/MTLStitchedLibraryDescriptor.java @@ -55,9 +55,9 @@ public MTLStitchedLibraryDescriptor() {} @Property(selector = "setFunctionGraphs:") public native void setFunctionGraphs(NSArray v); @Property(selector = "functions") - public native NSArray getFunctions(); + public native NSArray getFunctions(); @Property(selector = "setFunctions:") - public native void setFunctions(NSArray v); + public native void setFunctions(NSArray v); /**/ /**//**/ /**/ diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/metalkit/MTKTextureLoader.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/metalkit/MTKTextureLoader.java index 0bcd98d58..bb22e9767 100755 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/metalkit/MTKTextureLoader.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/metalkit/MTKTextureLoader.java @@ -74,12 +74,12 @@ protected MTKTextureLoader() {} * @since Available in iOS 10.0 and later. */ @Method(selector = "newTexturesWithContentsOfURLs:options:completionHandler:") - public native void newTexture(NSArray URLs, MTKTextureLoaderOptions options, @Block VoidBlock2, NSError> completionHandler); + public native void newTexture(NSArray URLs, MTKTextureLoaderOptions options, @Block VoidBlock2, NSError> completionHandler); /** * @since Available in iOS 10.0 and later. */ @Method(selector = "newTexturesWithNames:scaleFactor:bundle:options:completionHandler:") - public native void newTexture(NSArray names, @MachineSizedFloat double scaleFactor, NSBundle bundle, MTKTextureLoaderOptions options, @Block VoidBlock2, NSError> completionHandler); + public native void newTexture(NSArray names, @MachineSizedFloat double scaleFactor, NSBundle bundle, MTKTextureLoaderOptions options, @Block VoidBlock2, NSError> completionHandler); @Method(selector = "newTextureWithData:options:completionHandler:") public native void newTexture(NSData data, MTKTextureLoaderOptions options, @Block VoidBlock2 completionHandler); @Method(selector = "newTextureWithCGImage:options:completionHandler:") @@ -100,9 +100,9 @@ public MTLTexture newTexture(NSURL URL, MTKTextureLoaderOptions options) throws /** * @since Available in iOS 10.0 and later. */ - public NSArray newTextures(NSArray URLs, MTKTextureLoaderOptions options) throws NSErrorException { + public NSArray newTextures(NSArray URLs, MTKTextureLoaderOptions options) throws NSErrorException { NSError.NSErrorPtr ptr = new NSError.NSErrorPtr(); - NSArray result = newTextures(URLs, options, ptr); + NSArray result = newTextures(URLs, options, ptr); if (ptr.get() != null) { throw new NSErrorException(ptr.get()); } return result; } @@ -110,7 +110,7 @@ public NSArray newTextures(NSArray URLs, MTKTextureLoaderOptions optio * @since Available in iOS 10.0 and later. */ @Method(selector = "newTexturesWithContentsOfURLs:options:error:") - private native NSArray newTextures(NSArray URLs, MTKTextureLoaderOptions options, NSError.NSErrorPtr error); + private native NSArray newTextures(NSArray URLs, MTKTextureLoaderOptions options, NSError.NSErrorPtr error); public MTLTexture newTexture(NSData data, MTKTextureLoaderOptions options) throws NSErrorException { NSError.NSErrorPtr ptr = new NSError.NSErrorPtr(); MTLTexture result = newTexture(data, options, ptr); diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationShortcutItem.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationShortcutItem.java index 86c8a3094..fc2b1f6d1 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationShortcutItem.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationShortcutItem.java @@ -59,7 +59,7 @@ protected UIApplicationShortcutItem(Handle h, long handle) { super(h, handle); } protected UIApplicationShortcutItem(SkipInit skipInit) { super(skipInit); } @Method(selector = "initWithType:localizedTitle:localizedSubtitle:icon:userInfo:") - public UIApplicationShortcutItem(String type, String localizedTitle, String localizedSubtitle, UIApplicationShortcutIcon icon, NSDictionary userInfo) { super((SkipInit) null); initObject(init(type, localizedTitle, localizedSubtitle, icon, userInfo)); } + public UIApplicationShortcutItem(String type, String localizedTitle, String localizedSubtitle, UIApplicationShortcutIcon icon, NSDictionary userInfo) { super((SkipInit) null); initObject(init(type, localizedTitle, localizedSubtitle, icon, userInfo)); } @Method(selector = "initWithType:localizedTitle:") public UIApplicationShortcutItem(String type, String localizedTitle) { super((SkipInit) null); initObject(init(type, localizedTitle)); } /**/ @@ -73,7 +73,7 @@ @Property(selector = "icon") public native UIApplicationShortcutIcon getIcon(); @Property(selector = "userInfo") - public native NSDictionary getUserInfo(); + public native NSDictionary getUserInfo(); @Property(selector = "targetContentIdentifier") public native NSObject getTargetContentIdentifier(); /**/ @@ -93,13 +93,13 @@ public void setIcon(UIApplicationShortcutIcon v) { throw new UnsupportedOperationException("UIApplicationShortcutItem is immutable"); } - public void setUserInfo(NSDictionary v) { + public void setUserInfo(NSDictionary v) { throw new UnsupportedOperationException("UIApplicationShortcutItem is immutable"); } /**//**/ /**/ @Method(selector = "initWithType:localizedTitle:localizedSubtitle:icon:userInfo:") - protected native @Pointer long init(String type, String localizedTitle, String localizedSubtitle, UIApplicationShortcutIcon icon, NSDictionary userInfo); + protected native @Pointer long init(String type, String localizedTitle, String localizedSubtitle, UIApplicationShortcutIcon icon, NSDictionary userInfo); @Method(selector = "initWithType:localizedTitle:") protected native @Pointer long init(String type, String localizedTitle); /**/ diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIMutableApplicationShortcutItem.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIMutableApplicationShortcutItem.java index 4626950cb..7c1e55a9c 100644 --- a/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIMutableApplicationShortcutItem.java +++ b/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIMutableApplicationShortcutItem.java @@ -59,7 +59,7 @@ protected UIMutableApplicationShortcutItem(Handle h, long handle) { super(h, handle); } protected UIMutableApplicationShortcutItem(SkipInit skipInit) { super(skipInit); } @Method(selector = "initWithType:localizedTitle:localizedSubtitle:icon:userInfo:") - public UIMutableApplicationShortcutItem(String type, String localizedTitle, String localizedSubtitle, UIApplicationShortcutIcon icon, NSDictionary userInfo) { super(type, localizedTitle, localizedSubtitle, icon, userInfo); } + public UIMutableApplicationShortcutItem(String type, String localizedTitle, String localizedSubtitle, UIApplicationShortcutIcon icon, NSDictionary userInfo) { super(type, localizedTitle, localizedSubtitle, icon, userInfo); } @Method(selector = "initWithType:localizedTitle:") public UIMutableApplicationShortcutItem(String type, String localizedTitle) { super(type, localizedTitle); } /**/ @@ -81,9 +81,9 @@ @Property(selector = "setIcon:") public native void setIcon(UIApplicationShortcutIcon v); @Property(selector = "userInfo") - public native NSDictionary getUserInfo(); + public native NSDictionary getUserInfo(); @Property(selector = "setUserInfo:") - public native void setUserInfo(NSDictionary v); + public native void setUserInfo(NSDictionary v); @Property(selector = "targetContentIdentifier") public native NSObject getTargetContentIdentifier(); @Property(selector = "setTargetContentIdentifier:")