Skip to content

Commit 8b90a08

Browse files
shannahshannah
authored
Merge pull request shannah#12 from mojo2012/master
Fix for boolean return values encoded as `c`
2 parents 99ce7f1 + effa0cb commit 8b90a08

File tree

108 files changed

+1771
-4649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1771
-4649
lines changed

‎.classpath‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="java/src"/>
4-
<classpathentry kind="src" path="java/test"/>
5-
<classpathentry kind="src" path="samples/BringToFrontSample/src"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
74
<attributes>
8-
<attribute name="module" value="true"/>
5+
<attribute name="maven.pomderived" value="true"/>
96
</attributes>
107
</classpathentry>
11-
<classpathentry kind="lib" path="dist/jna-4.0.0.jar"/>
12-
<classpathentry kind="lib" path="dist/ObjCBridge.jar"/>
13-
<classpathentry kind="lib" path="java/lib/jna.jar"/>
14-
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
15-
<classpathentry kind="output" path="bin"/>
8+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
9+
<attributes>
10+
<attribute name="maven.pomderived" value="true"/>
11+
</attributes>
12+
</classpathentry>
13+
<classpathentry kind="src" output="target/classes" path="src/main/java">
14+
<attributes>
15+
<attribute name="optional" value="true"/>
16+
<attribute name="maven.pomderived" value="true"/>
17+
</attributes>
18+
</classpathentry>
19+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
20+
<attributes>
21+
<attribute name="test" value="true"/>
22+
<attribute name="optional" value="true"/>
23+
<attribute name="maven.pomderived" value="true"/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
27+
<attributes>
28+
<attribute name="test" value="true"/>
29+
<attribute name="maven.pomderived" value="true"/>
30+
</attributes>
31+
</classpathentry>
32+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
33+
<attributes>
34+
<attribute name="maven.pomderived" value="true"/>
35+
</attributes>
36+
</classpathentry>
37+
<classpathentry kind="output" path="target/classes"/>
1638
</classpath>

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@
66
.DS_Store
77
private
88
/bin/
9+
/target/
10+
libjcocoa.xcodeproj/project.xcworkspace/xcuserdata
11+
Build
12+
Index
13+
dist/Release/libjcocoa.dylib.dSYM
14+
dist

‎.project‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1521
<nature>org.eclipse.jdt.core.javanature</nature>
1622
</natures>
1723
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3+
org.eclipse.jdt.core.compiler.compliance=11
4+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
5+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
6+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
7+
org.eclipse.jdt.core.compiler.release=disabled
8+
org.eclipse.jdt.core.compiler.source=11

‎.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎README.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@ Apache 2.0 License
1010

1111
## Requirements
1212

13-
1. Java7 or Higher on OS X
13+
1. Java11 or Higher on OS X
1414
2. JNA
1515

1616
##Installation
1717

18-
1. Add [ObjCBridge.jar](https://github.com/shannah/Java-Objective-C-Bridge/blob/master/dist/ObjCBridge.jar?raw=true) and [jna.jar](https://github.com/shannah/Java-Objective-C-Bridge/blob/master/dist/jna-4.0.0.jar?raw=true) to your classpath.
19-
2. **Optional** - Add [libjcocoa.dylib](https://github.com/shannah/Java-Objective-C-Bridge/blob/master/dist/libjcocoa.dylib?raw=true) to your library path. It will first check to see if libjcocoa.dylib in in the library path. It is isn't, it will simply extract it to the temp directory and use that one.
18+
1. Check out the project and use `mvn clean install` (for debug builds) or `mvn clean install -Drelease=true` (for release builds) to build it
19+
2. include it as a maven depencency in your project:
20+
21+
```xml
22+
<groupId>io.spot-next</groupId>
23+
<artifactId>java-objectivec-bridge</artifactId>
24+
<version>1.0-SNAPSHOT</version>
25+
```
2026

2127
##Examples
2228

‎dist/ObjCBridge.jar‎

-105 KB
Binary file not shown.

‎dist/jna-4.0.0.jar‎

-893 KB
Binary file not shown.

‎dist/libjcocoa.dylib‎

-21.5 KB
Binary file not shown.

‎java/build.xml‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)