Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge devel into master #13

Open
wants to merge 94 commits into
base: master
Choose a base branch
from
Open

Merge devel into master #13

wants to merge 94 commits into from

Conversation

ephemer
Copy link
Member

@ephemer ephemer commented Feb 21, 2019

On the outside it may seem like this repo is inactive- that isn't the case, just that most development in the last years has happened in the devel branch -> let's put it into master so people are up to date with the latest developments

rikner and others added 30 commits July 13, 2017 16:59
@rikner
wrap with swift (SwiftPM 3.1)
879ab7e
@rikner
header with renamed types
3f658dc
@rikner
adjust code to new header wip
ba7725e
@ephemer
Update for new header
4b39e70
@rikner
jni methods
9482fb8
@rikner
add CallStaticVoidMethod, GetObjectArrayElement
0b07b80
@rikner
wip on JNIMethods, public JavaParameterConvertible, javaStaticMethod,
51195a5
@rikner
move build.sh
703f9ef
@rikner
update xcodeproj files
fdd435e
@ephemer
Add a bunch of stuff for JNI method calling
9cbb896
@rikner
do not import Dispatch in SwiftJNI
9f4a9f6
@cshg
Remove debugging prints
c0820ab
@cshg
Add if os android to print code
d76490b
@rikner
add CallStaticBooleanMethod
b377926
@rikner
split and cleanup code JNIMethods code
8337f38
@rikner
add build script
4fb07aa
@rikner
add GetStrings
f804d5b
@rikner
Merge branch 'methodChanges' into devel
5410d77
@rikner
overload callStatic to call void method, make returnType parameter in…
9227b25 
… methodSignature() optional
@ephemer
Clean up
566be2d
@ephemer
Add / correct the last header annotations in jni.h
dcd2311
@ephemer
Merge branch 'devel' into methodChanges-swift4
499eefc
@ephemer
Rename to JNI
64a2600
@ephemer
Clean up JNIMethods
8996ab6
@ephemer
Remove methodSignature(returnType: JavaObjectClassName)
4ed9f9b
@ephemer
Remove JavaObjectClassName
5314cee
@rikner
implemented generic GetStaticField method
fa12416
@ephemer
Add more type conformances (Double, Int) to JavaParameterConvertible
4b18b6c 
- add JavaParameterConvertible.fromMethod() to complement .fromStaticMethod()
- add JNIObject type to help constructing java objects from Swift and calling their methods
@rikner
Merge pull request #5 from SwiftAndroid/methodChanges-swift4
5cabd15 
Further improvements
@rikner
Merge branch 'devel' into staticField
faa9061
ephemer and others added 30 commits January 23, 2018 16:28
@ephemer
Add missing files to Xcode project
9bc4afd
@ephemer
Split up conformances for JavaParameterConvertible
d92a27a
@ephemer
[Breaking Change] Use the real main queue with Johnno's toolchain
0cee578 
This should be temporary until we get the libdispatch build working again.
@michaelknoch @ephemer
make JavaLong aka Int64 conform to JavaParameterConvertible (#11)
25a5140 
* allow passing Int64 aka JavaFloat through JNI

* fix function signature and cleanup
@ephemer
"Build" JNI for Mac only (testing)
7053cb0
@michaelknoch @ephemer
implement JavaInt conformance to JavaParameterConvertible (#12)
a2b9c15 
* breaking change: Int does no longer conform to JavaParameterConvertible, use JavaInt instead

* cleanup
@michaelknoch
make GetIntArrayRegion return array of Int32
128c155
@ephemer
Use c calling convention
dc2d8ff
@michaelknoch
workaround SwiftPM bug
41ee464
@michaelknoch
allows static method calls on JNIObject (#14)
83c9859 
* allow calling static methods on JNIObjects

* reindent

* deprecate init with explicit className

* implement private classInstances cache

* use static getter for classinstances
@michaelknoch @ephemer
prevent CallObjectMethod from crashing (#15)
1a4cf54
@michaelknoch @ephemer
Swift5 (#16)
a765442 
* Update for Swift5

* Comment out johnno hack (fixes crash at runtime)

* Remove unneeded soname

* set CMAKE_Swift_MODULE_DIRECTORY

Co-authored-by: Geordie J <[email protected]>
@rikner
implement JNIObject.getField(), fix threading bug (#17)
33d2997 
implement JNIObject.getField()
make methodSignature() and asJavaParameters() public
fix threading bug in JNIObject.javaClass
@rikner
API Enhancements: JNI.GetDirectBufferAddress() and JNIObject.getField…
bf6249d 
…() (#18)
@ephemer
Remove dependency on Foundation / CoreFoundation
450e0ba
@ephemer
Add JavaParameterConvertible conformance to JNIObject
73895cf
@ephemer
Define isMainThread in Swift due to issues with building C in CMake
b94cd31
@ephemer
Fix Mac build
c11778f
@ephemer
Remove unused import of Dispatch and some commented-out code
1ac9032
@ephemer
Fix isMainThread for Darwin
894237c
@ephemer
Optionally allow building as a part of a static library that defines …
f03a5a1 
…another JNI_OnLoad function

Use -DSTATIC_SWIFT_STDLIB
@rikner
add Int to convertible primitives
a9e8f3e
@michaelknoch
update macos deployment target to 10.15 (#19)
d977baa 
* update macos deployment target to 12.0

* downgrade to 10.15
@rikner
SetByteArrayRegion: pass Array instead BufferPointer
71ed24c
@ephemer
Swift 6 compatibility
7960871
@ephemer
Remove custom jni.h, use original from NDK
681af66
@rikner
Cleanup Package.swift and remove Xcode proj (#20)
fb5255e 
* xcode project: remove CJNI target

* remove xcode project and and CJNI target from Package.swift

* unconditionally import Android

* cleanup
@ephemer
Align JNIObject.call[Static] with jni.call[Static] method signatures
5dd8f6c
@ephemer
Add public JavaBoolean.true/.false definitions. Add BooleanArray methods
ac833a7
@ephemer
Add Sendable conformance (WIP)
3d0a1c6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ephemer @rikner @cshg @michaelknoch