Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bump version
dkocher authored and umjammer committed Oct 20, 2022
1 parent a623746 commit 3d47947
Showing 10 changed files with 31 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@ name: Java CI with Maven

on:
push:
branches: [ master ]
branches: [ develop ]
pull_request:
branches: [ master ]
branches: [ develop ]

jobs:
build:
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -31,7 +31,8 @@ implementation of Objective-C interfaces in Java.

## Limitation

* float
* obj-c class's method call with float argument don't work
* i found [the reason](https://github.com/java-native-access/jna/issues/463#issuecomment-1286015013)
* block

## TODO
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -216,7 +216,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.9.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
2 changes: 1 addition & 1 deletion rococoa-auto/pom.xml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<parent>
<groupId>org.rococoa</groupId>
<artifactId>rococoa-parent</artifactId>
<version>0.8.4</version>
<version>0.8.5-SNAPSHOT</version>
</parent>

<name>Rococoa Autogenerated Cocoa Package</name>
2 changes: 1 addition & 1 deletion rococoa-cocoa/pom.xml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<parent>
<groupId>org.rococoa</groupId>
<artifactId>rococoa-parent</artifactId>
<version>0.8.4</version>
<version>0.8.5-SNAPSHOT</version>
</parent>

<name>Rococoa Cocoa Mappings</name>
2 changes: 1 addition & 1 deletion rococoa-contrib/pom.xml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<parent>
<groupId>org.rococoa</groupId>
<artifactId>rococoa-parent</artifactId>
<version>0.8.4</version>
<version>0.8.5-SNAPSHOT</version>
</parent>

<name>Rococoa Contrib</name>
21 changes: 15 additions & 6 deletions rococoa-core/pom.xml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rococoa</groupId>
<artifactId>rococoa-parent</artifactId>
<version>0.8.4</version>
<version>0.8.5-SNAPSHOT</version>
</parent>

<name>Rococoa Core</name>
@@ -119,11 +119,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<configuration>
<excludes>
<!-- Brain-dead plugin just looks for *Test* and so finds support
classes -->
<exclude>**/TestStruct*.java</exclude>
</excludes>
<forkMode>once</forkMode>
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -208,6 +203,13 @@
</plugins>
</build>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>net.java.dev.jna</groupId>
@@ -217,5 +219,12 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>

<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-commons</artifactId>
<version>1.1.6</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -75,13 +75,16 @@ class MsgSendHandler implements InvocationHandler {
public final static boolean PPC = System.getProperty("os.arch").trim().equalsIgnoreCase("ppc");

private final static Method OBJC_MSGSEND;
private final static Method OBJC_MSGSEND_FPRET;
private final static Method OBJC_MSGSEND_VAR_ARGS;
private final static Method OBJC_MSGSEND_STRET;

static {
try {
OBJC_MSGSEND = MsgSendLibrary.class.getDeclaredMethod("objc_msgSend",
ID.class, Selector.class, Object[].class);
OBJC_MSGSEND_FPRET = MsgSendLibrary.class.getDeclaredMethod("objc_msgSend_fpret",
ID.class, Selector.class, Object[].class);
OBJC_MSGSEND_VAR_ARGS = MsgSendLibrary.class.getDeclaredMethod("objc_msgSend",
ID.class, Selector.class, Object.class, Object[].class);
OBJC_MSGSEND_STRET = MsgSendLibrary.class.getDeclaredMethod("objc_msgSend_stret",
@@ -92,6 +95,7 @@ class MsgSendHandler implements InvocationHandler {
}

private final MethodFunctionPair objc_msgSend_stret_Pair;
private final Pair<Method, Function> objc_msgSend_fpret_Pair;
private final MethodFunctionPair objc_msgSend_varArgs_Pair;
private final MethodFunctionPair objc_msgSend_Pair;

@@ -100,6 +104,8 @@ class MsgSendHandler implements InvocationHandler {
public MsgSendHandler(final NativeLibrary lib) {
this.objc_msgSend_Pair = new MethodFunctionPair(AARCH64 ? null : OBJC_MSGSEND,
lib.getFunction("objc_msgSend"));
this.objc_msgSend_fpret_Pair = new MethodFunctionPair(OBJC_MSGSEND_FPRET,
lib.getFunction("objc_msgSend_fpret"));
this.objc_msgSend_varArgs_Pair = new MethodFunctionPair(OBJC_MSGSEND_VAR_ARGS,
lib.getFunction("objc_msgSend"));
this.objc_msgSend_stret_Pair = new MethodFunctionPair(OBJC_MSGSEND_STRET,
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@ public interface MsgSendLibrary extends Library {

// We don't call these directly, but through syntheticSendMessage
Object objc_msgSend(ID receiver, Selector selector, Object... args);
Structure objc_msgSend_fpret(ID receiver, Selector selector, Object... args);
Object objc_msgSend(ID receiver, Selector selector, Object arg, Object... args);
Structure objc_msgSend_stret(ID receiver, Selector selector, Object... args);
}
2 changes: 1 addition & 1 deletion rococoa-functionaltest/pom.xml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rococoa</groupId>
<artifactId>rococoa-parent</artifactId>
<version>0.8.3-SNAPSHOT</version>
<version>0.8.5-SNAPSHOT</version>
</parent>

<name>Rococoa Functional Test</name>

0 comments on commit 3d47947

Please sign in to comment.