Merge branch 'master' of https://github.com/MobiDevelop/robovm

TheFaceCore · Dec 2, 2016 · ae43824 · ae43824
2 parents 5cba55a + 70bcb61
commit ae43824
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/photos/PHAssetResourceRequestOptions.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/photos/PHAssetResourceRequestOptions.java
@@ -57,9 +57,9 @@ public PHAssetResourceRequestOptions() {}
     @Property(selector = "setNetworkAccessAllowed:")
     public native void setNetworkAccessAllowed(boolean v);
     @Property(selector = "progressHandler")
-    public native VoidBlock1<Double> getProgressHandler();
+    public native @Block VoidBlock1<Double> getProgressHandler();
     @Property(selector = "setProgressHandler:")
-    public native void setProgressHandler(VoidBlock1<Double> v);
+    public native void setProgressHandler(@Block VoidBlock1<Double> v);
     /*</properties>*/
     /*<members>*//*</members>*/
     /*<methods>*/

diff --git a/plugins/maven/maven-resolver/src/test/java/org/robovm/maven/resolver/RoboVMResolverTest.java b/plugins/maven/maven-resolver/src/test/java/org/robovm/maven/resolver/RoboVMResolverTest.java
@@ -29,7 +29,7 @@
 public class RoboVMResolverTest {
 
     File m2Repo = new File(System.getProperty("user.home"), ".m2/repository");
-    File distAlpha2Dir = new File(m2Repo, "com/mobidevelop/robovm/robovm-dist/2.2.0-SNAPSHOT/unpacked/robovm-2.2.0-SNAPSHOT");
+    File distAlpha2Dir = new File(m2Repo, "com/mobidevelop/robovm/robovm-dist/2.2.1-SNAPSHOT/unpacked/robovm-2.2.1-SNAPSHOT");
 
     @Before
     public void setup() throws Exception {
@@ -41,7 +41,7 @@ public void setup() throws Exception {
     @Test
     public void testResolveAndUnpackRoboVMDistArtifact() throws Exception {
         RoboVMResolver resolver = new RoboVMResolver();
-        File dir = resolver.resolveAndUnpackRoboVMDistArtifact("2.2.0-SNAPSHOT");
+        File dir = resolver.resolveAndUnpackRoboVMDistArtifact("2.2.1-SNAPSHOT");
         assertEquals(distAlpha2Dir, dir);
         assertTrue(new File(dir, "bin/ios-sim").canExecute());