Fix NSDictionary generics in blocks.

robovm · Aug 4, 2015 · 68756b3 · 68756b3
1 parent e6d8855
commit 68756b3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/cocoatouch/src/main/bro-gen/foundation.yaml b/cocoatouch/src/main/bro-gen/foundation.yaml
@@ -868,12 +868,10 @@ classes:
             '+dictionaryWithContentsOfFile:':
                 name: read
                 visibility: protected
-                return_type:
-                    NSDictionary<?, ?>
+                return_type: 'NSDictionary<?, ?>'
             '+dictionaryWithContentsOfURL:':
                 name: read
-                return_type:
-                    NSDictionary<?, ?>
+                return_type: 'NSDictionary<?, ?>'
             '-initWithDictionary:':
                 name: init
                 visibility: protected

diff --git a/cocoatouch/src/main/bro-gen/photos.yaml b/cocoatouch/src/main/bro-gen/photos.yaml
@@ -214,7 +214,7 @@ classes:
     PHImageRequestOptions: # DONE
         properties:
             'progressHandler':
-                type: '@Block VoidBlock4<Double, NSError, BooleanPtr, NSDictionary>'
+                type: '@Block VoidBlock4<Double, NSError, BooleanPtr, NSDictionary<?, ?>>'
     PHObject: {} # DONE
     PHAsset: # DONE
         properties:

diff --git a/cocoatouch/src/main/bro-gen/uikit.yaml b/cocoatouch/src/main/bro-gen/uikit.yaml
@@ -3229,7 +3229,7 @@ protocols:
                 name: handleWatchKitExtensionRequest
                 parameters:
                     reply:
-                        type: '@Block VoidBlock1<NSDictionary>'
+                        type: '@Block VoidBlock1<NSDictionary<?, ?>>'
     UIBarPositioning: {} # DONE
     UIBarPositioningDelegate: # DONE
         methods:

diff --git a/cocoatouch/src/main/java/org/robovm/apple/photos/PHImageRequestOptions.java b/cocoatouch/src/main/java/org/robovm/apple/photos/PHImageRequestOptions.java
@@ -77,9 +77,9 @@ public PHImageRequestOptions() {}
     @Property(selector = "setSynchronous:")
     public native void setSynchronous(boolean v);
     @Property(selector = "progressHandler")
-    public native @Block VoidBlock4<Double, NSError, BooleanPtr, NSDictionary> getProgressHandler();
+    public native @Block VoidBlock4<Double, NSError, BooleanPtr, NSDictionary<?, ?>> getProgressHandler();
     @Property(selector = "setProgressHandler:")
-    public native void setProgressHandler(@Block VoidBlock4<Double, NSError, BooleanPtr, NSDictionary> v);
+    public native void setProgressHandler(@Block VoidBlock4<Double, NSError, BooleanPtr, NSDictionary<?, ?>> v);
     /*</properties>*/
     /*<members>*//*</members>*/
     /*<methods>*/

diff --git a/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationDelegate.java b/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationDelegate.java
@@ -152,7 +152,7 @@
      * @since Available in iOS 8.2 and later.
      */
     @Method(selector = "application:handleWatchKitExtensionRequest:reply:")
-    void handleWatchKitExtensionRequest(UIApplication application, NSDictionary userInfo, @Block VoidBlock1<NSDictionary> reply);
+    void handleWatchKitExtensionRequest(UIApplication application, NSDictionary userInfo, @Block VoidBlock1<NSDictionary<?, ?>> reply);
     /**
      * @since Available in iOS 4.0 and later.
      */

diff --git a/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationDelegateAdapter.java b/cocoatouch/src/main/java/org/robovm/apple/uikit/UIApplicationDelegateAdapter.java
@@ -173,7 +173,7 @@ public void handleEventsForBackgroundURLSession(UIApplication application, Strin
      * @since Available in iOS 8.2 and later.
      */
     @NotImplemented("application:handleWatchKitExtensionRequest:reply:")
-    public void handleWatchKitExtensionRequest(UIApplication application, NSDictionary userInfo, @Block VoidBlock1<NSDictionary> reply) {}
+    public void handleWatchKitExtensionRequest(UIApplication application, NSDictionary userInfo, @Block VoidBlock1<NSDictionary<?, ?>> reply) {}
     /**
      * @since Available in iOS 4.0 and later.
      */