Merge pull request #7 from umjammer/0.8.4

0.8.4
umjammer · Mar 9, 2022 · 63437e7 · 63437e7
2 parents 8f3b69f + 0d70c7c
commit 63437e7
Show file tree

Hide file tree

Showing 71 changed files with 3,318 additions and 303 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -49,7 +49,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      run: mvn -B install --file pom.xml
+      run: mvn -B install --file pom.xml -DskipTest
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![GitHub Packages](https://github.com/umjammer/rococoa/actions/workflows/maven-publish.yml/badge.svg)](https://github.com/umjammer/rococoa/actions/workflows/maven-publish.yml)
+[![CodeQL](https://github.com/umjammer/rococoa/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/rococoa/actions/workflows/codeql-analysis.yml)
 
 #  Welcome to Rococoa
 
@@ -27,3 +28,10 @@ any other problems.
  * [Limitations](https://github.com/iterate-ch/rococoa/blob/wiki/Limitations.md)
  * [Help Wanted](https://github.com/iterate-ch/rococoa/blob/wiki/HelpWanted.md)
  * [How To](https://github.com/iterate-ch/rococoa/blob/wiki/HowTo.md)
+
+## TODO
+
+ * https://github.com/ibinti/bugvm
+ * http://cocoawithlove.com/2009/10/how-blocks-are-implemented-and.html
+ * http://www.opensource.apple.com/source/libclosure/libclosure-38/BlockImplementation.txt
+
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>org.rococoa</groupId>
   <artifactId>rococoa-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.8.3</version>
+  <version>0.8.4</version>
 
   <modules>
     <module>rococoa-auto</module>
@@ -203,6 +203,14 @@
         <artifactId>cglib</artifactId>
         <version>3.3.0</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -218,19 +226,16 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-commons</artifactId>
-      <version>1.6.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/rococoa-auto/pom.xml b/rococoa-auto/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.rococoa</groupId>
     <artifactId>rococoa-parent</artifactId>
-    <version>0.8.3</version>
+    <version>0.8.4</version>
   </parent>
 
   <name>Rococoa Autogenerated Cocoa Package</name>

diff --git a/rococoa-cocoa/pom.xml b/rococoa-cocoa/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.rococoa</groupId>
     <artifactId>rococoa-parent</artifactId>
-    <version>0.8.3</version>
+    <version>0.8.4</version>
   </parent>
 
   <name>Rococoa Cocoa Mappings</name>
@@ -23,7 +23,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M4</version>
+        <version>3.0.0-M5</version>
         <configuration>
           <forkMode>once</forkMode>
           <trimStackTrace>false</trimStackTrace>

diff --git a/rococoa-cocoa/src/main/java/org/rococoa/cocoa/appkit/AppKitLibrary.java b/rococoa-cocoa/src/main/java/org/rococoa/cocoa/appkit/AppKitLibrary.java
@@ -19,7 +19,10 @@
 
 package org.rococoa.cocoa.appkit;
 
+import java.util.Collections;
+
 import org.rococoa.cocoa.foundation.NSRect;
+import org.rococoa.internal.RococoaTypeMapper;
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;
@@ -28,9 +31,9 @@
  * @author paulloy
  */
 public interface AppKitLibrary extends Library {
-
-	public static final AppKitLibrary INSTANCE = (AppKitLibrary) Native.loadLibrary("AppKit", AppKitLibrary.class);
 
-	void NSRectFill (NSRect aRect);
+    public static final AppKitLibrary INSTANCE = Native.load(
+        "AppKit", AppKitLibrary.class, Collections.singletonMap(Library.OPTION_TYPE_MAPPER, new RococoaTypeMapper()));
 
+    void NSRectFill (NSRect aRect);
 }