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

Commits on Jul 13, 2017

  1. wrap with swift (SwiftPM 3.1)

    @rikner
    rikner committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    879ab7e View commit details
    Browse the repository at this point in the history

  2. header with renamed types

    @rikner
    rikner committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    3f658dc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2017

  1. adjust code to new header wip

    @rikner
    rikner committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    ba7725e View commit details
    Browse the repository at this point in the history

  2. Update for new header

    @ephemer
    ephemer committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    4b39e70 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. jni methods

    @rikner
    rikner committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    9482fb8 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2017

  1. add CallStaticVoidMethod, GetObjectArrayElement

    @rikner
    rikner committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    0b07b80 View commit details
    Browse the repository at this point in the history

  2. wip on JNIMethods, public JavaParameterConvertible, javaStaticMethod,

    @rikner
    rikner committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    51195a5 View commit details
    Browse the repository at this point in the history

  3. move build.sh

    @rikner
    rikner committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    703f9ef View commit details
    Browse the repository at this point in the history

  4. update xcodeproj files

    @rikner
    rikner committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    fdd435e View commit details
    Browse the repository at this point in the history

  5. Add a bunch of stuff for JNI method calling

    @ephemer
    ephemer committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    9cbb896 View commit details
    Browse the repository at this point in the history

  6. do not import Dispatch in SwiftJNI

    @rikner
    rikner committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    9f4a9f6 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2017

  1. Remove debugging prints

    @cshg
    cshg committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    c0820ab View commit details
    Browse the repository at this point in the history

  2. Add if os android to print code

    @cshg
    cshg committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    d76490b View commit details
    Browse the repository at this point in the history

  3. add CallStaticBooleanMethod

    @rikner
    rikner committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    b377926 View commit details
    Browse the repository at this point in the history

  4. split and cleanup code JNIMethods code

    @rikner
    rikner committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    8337f38 View commit details
    Browse the repository at this point in the history

  5. add build script

    @rikner
    rikner committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    4fb07aa View commit details
    Browse the repository at this point in the history

  6. add GetStrings

    @rikner
    rikner committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    f804d5b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'methodChanges' into devel

    @rikner
    rikner committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    5410d77 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2017

  1. overload callStatic to call void method, make returnType parameter in… 

    … methodSignature() optional
    @rikner
    rikner committed Jul 20, 2017
    Configuration menu
    Copy the full SHA
    9227b25 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. Clean up

    @ephemer
    ephemer committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    566be2d View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2017

  1. Add / correct the last header annotations in jni.h

    @ephemer
    ephemer committed Jul 25, 2017
    Configuration menu
    Copy the full SHA
    dcd2311 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2017

  1. Merge branch 'devel' into methodChanges-swift4

    @ephemer
    ephemer committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    499eefc View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. Rename to JNI

    @ephemer
    ephemer committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    64a2600 View commit details
    Browse the repository at this point in the history

  2. Clean up JNIMethods

    @ephemer
    ephemer committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    8996ab6 View commit details
    Browse the repository at this point in the history

  3. Remove methodSignature(returnType: JavaObjectClassName)

    @ephemer
    ephemer committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    4ed9f9b View commit details
    Browse the repository at this point in the history

  4. Remove JavaObjectClassName

    @ephemer
    ephemer committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    5314cee View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. implemented generic GetStaticField method

    @rikner
    rikner committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    fa12416 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Add more type conformances (Double, Int) to JavaParameterConvertible 

    - add JavaParameterConvertible.fromMethod() to complement .fromStaticMethod()
- add JNIObject type to help constructing java objects from Swift and calling their methods
    @ephemer
    ephemer committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    4b18b6c View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Merge pull request #5 from SwiftAndroid/methodChanges-swift4 

    Further improvements
    @rikner
    rikner authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    5cabd15 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'devel' into staticField

    @rikner
    rikner committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    faa9061 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. add GetByteArrayRegion and SetByteArrayRegion

    @rikner
    rikner committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    d4bb403 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. Use original GetMethodID with Class in JNIObject constructor

    @cshg
    cshg committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    b8a4ca4 View commit details
    Browse the repository at this point in the history

  2. implemented generic GetStaticField method

    @rikner
    rikner committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    25c407c View commit details
    Browse the repository at this point in the history

  3. add GetByteArrayRegion and SetByteArrayRegion

    @rikner
    rikner committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    79eaf04 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. implement GetField and GetObjectArrayElement

    @rikner
    rikner committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    05e4d2f View commit details
    Browse the repository at this point in the history

  2. add fromStaticField to Double

    @rikner
    rikner committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    d34ec93 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'byteArray' into staticField

    @rikner
    rikner committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    7d49147 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'staticField' into GetField

    @rikner
    rikner committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    bf4d3e1 View commit details
    Browse the repository at this point in the history

  5. use bitPattern to construct UInt8 from JavaByte

    @rikner
    rikner committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    572cfb2 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. GetStatic<Type>Field methods throw, use JNI_TRUE

    @rikner
    rikner committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    ba97ba3 View commit details
    Browse the repository at this point in the history

  2. replace StaticFieldError.InvalidParameters with FieldIDNotFound

    @rikner
    rikner committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    abe8af8 View commit details
    Browse the repository at this point in the history

  3. cleanup not used error; change message of assertionFailure in JavaObj… 

    …ect.init
    @rikner
    rikner committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    7388d54 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. Merge pull request #6 from SwiftAndroid/staticField 

    GetStaticField
    @rikner
    rikner authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    01e4b7f View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2017

  1. Merge branch 'devel' into GetField

    @rikner
    rikner committed Aug 19, 2017
    Configuration menu
    Copy the full SHA
    156fb78 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2017

  1. JNIObject init throws

    @rikner
    rikner committed Aug 20, 2017
    Configuration menu
    Copy the full SHA
    1b58781 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2017

  1. Merge branch 'devel' into GetField

    @rikner
    rikner committed Aug 21, 2017
    Configuration menu
    Copy the full SHA
    99c444e View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2017

  1. Delete local objectClass ref in GetMethodID for object

    @cshg
    cshg committed Aug 22, 2017
    Configuration menu
    Copy the full SHA
    e97246e View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. implement Feedback

    @rikner
    rikner committed Aug 25, 2017
    6 Configuration menu
    Copy the full SHA
    2babba9 View commit details
    Browse the repository at this point in the history

  2. correct order of parameters for fromField()

    @rikner
    rikner committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    1acd061 View commit details
    Browse the repository at this point in the history

  3. correct order of parameters for fromStaticField

    @rikner
    rikner committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    c1f7009 View commit details
    Browse the repository at this point in the history

  4. rename jfieldID to JavaFieldID (#8)

    @rikner @ephemer
    rikner authored and ephemer committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    1d2e782 View commit details
    Browse the repository at this point in the history

  5. FindClass throws

    @rikner
    rikner committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    548d23b View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. update comment about bitPattern constructor in GetByteArrayRegion

    @rikner
    rikner committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    60ed9cb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from SwiftAndroid/GetField 

    Get Field from JavaObject
    @rikner
    rikner authored Sep 19, 2017
    Configuration menu
    Copy the full SHA
    955bf59 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. check for threadStatus instead of threadStatus.bigEndian

    @rikner
    rikner committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    d4032fe View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2017

  1. conform JavaObject to JavaParameterConvertible

    @rikner
    rikner committed Nov 24, 2017
    Configuration menu
    Copy the full SHA
    ca6ba6f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2017

  1. fix JavaObject.asJNIParameterString

    @rikner
    rikner committed Nov 27, 2017
    Configuration menu
    Copy the full SHA
    a19b3e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

  1. asJNIParameterString always as let

    @rikner
    rikner committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    5112554 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from SwiftAndroid/javaobject-convertible 

    Conform JavaObject to JavaParameterConvertible
    @rikner
    rikner authored Dec 6, 2017
    Configuration menu
    Copy the full SHA
    882bca2 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Don't use deprecated Swift.String APIs

    @ephemer
    ephemer committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    574fe6a View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2017

  1. Add JavaContext struct

    @ephemer
    ephemer committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    fb1cc56 View commit details
    Browse the repository at this point in the history

  2. Use Foundation to do string replacement

    @ephemer
    ephemer committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    edbba2f View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Restructure splitting many methods into separate files

    @ephemer
    ephemer committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    49b4390 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2018

  1. Update JNI String functions

    @ephemer
    ephemer committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    7ca8143 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Add missing files to Xcode project

    @ephemer
    ephemer committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    9bc4afd View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2018

  1. Split up conformances for JavaParameterConvertible

    @ephemer
    ephemer committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    d92a27a View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. [Breaking Change] Use the real main queue with Johnno's toolchain 

    This should be temporary until we get the libdispatch build working again.
    @ephemer
    ephemer committed May 15, 2018
    Configuration menu
    Copy the full SHA
    0cee578 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. make JavaLong aka Int64 conform to JavaParameterConvertible (#11) 

    * allow passing Int64 aka JavaFloat through JNI

* fix function signature and cleanup
    @michaelknoch @ephemer
    michaelknoch authored and ephemer committed May 25, 2018
    Configuration menu
    Copy the full SHA
    25a5140 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. "Build" JNI for Mac only (testing)

    @ephemer
    ephemer committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    7053cb0 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. implement JavaInt conformance to JavaParameterConvertible (#12) 

    * breaking change: Int does no longer conform to JavaParameterConvertible, use JavaInt instead

* cleanup
    @michaelknoch @ephemer
    michaelknoch authored and ephemer committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    a2b9c15 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. make GetIntArrayRegion return array of Int32

    @michaelknoch
    michaelknoch committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    128c155 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Use c calling convention

    @ephemer
    ephemer committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    dc2d8ff View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. workaround SwiftPM bug

    @michaelknoch
    michaelknoch committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    41ee464 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2019

  1. allows static method calls on JNIObject (#14) 

    * allow calling static methods on JNIObjects

* reindent

* deprecate init with explicit className

* implement private classInstances cache

* use static getter for classinstances
    @michaelknoch
    michaelknoch authored Aug 22, 2019
    Configuration menu
    Copy the full SHA
    83c9859 View commit details
    Browse the repository at this point in the history

  2. prevent CallObjectMethod from crashing (#15)

    @michaelknoch @ephemer
    michaelknoch authored and ephemer committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    1a4cf54 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. Swift5 (#16) 

    * 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]>
    @michaelknoch @ephemer
    michaelknoch and ephemer authored Jan 14, 2020
    Configuration menu
    Copy the full SHA
    a765442 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. implement JNIObject.getField(), fix threading bug (#17) 

    implement JNIObject.getField()
make methodSignature() and asJavaParameters() public
fix threading bug in JNIObject.javaClass
    @rikner
    rikner authored Oct 15, 2020
    Configuration menu
    Copy the full SHA
    33d2997 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. API Enhancements: JNI.GetDirectBufferAddress() and JNIObject.getField… 

    …() (#18)
    @rikner
    rikner authored Mar 15, 2021
    Configuration menu
    Copy the full SHA
    bf6249d View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Remove dependency on Foundation / CoreFoundation

    @ephemer
    ephemer committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    450e0ba View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. Add JavaParameterConvertible conformance to JNIObject

    @ephemer
    ephemer committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    73895cf View commit details
    Browse the repository at this point in the history

  2. Define isMainThread in Swift due to issues with building C in CMake

    @ephemer
    ephemer committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    b94cd31 View commit details
    Browse the repository at this point in the history

  3. Fix Mac build

    @ephemer
    ephemer committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    c11778f View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. Remove unused import of Dispatch and some commented-out code

    @ephemer
    ephemer committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    1ac9032 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Fix isMainThread for Darwin

    @ephemer
    ephemer committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    894237c View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. Optionally allow building as a part of a static library that defines … 

    …another JNI_OnLoad function

Use -DSTATIC_SWIFT_STDLIB
    @ephemer
    ephemer committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    f03a5a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. add Int to convertible primitives

    @rikner
    rikner committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    a9e8f3e View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. update macos deployment target to 10.15 (#19) 

    * update macos deployment target to 12.0

* downgrade to 10.15
    @michaelknoch
    michaelknoch authored Apr 28, 2023
    Configuration menu
    Copy the full SHA
    d977baa View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. SetByteArrayRegion: pass Array instead BufferPointer

    @rikner
    rikner committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    71ed24c View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Swift 6 compatibility

    @ephemer
    ephemer committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7960871 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Remove custom jni.h, use original from NDK

    @ephemer
    ephemer committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    681af66 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Cleanup Package.swift and remove Xcode proj (#20) 

    * xcode project: remove CJNI target

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

* unconditionally import Android

* cleanup
    @rikner
    rikner authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    fb5255e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Align JNIObject.call[Static] with jni.call[Static] method signatures

    @ephemer
    ephemer committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    5dd8f6c View commit details
    Browse the repository at this point in the history

  2. Add public JavaBoolean.true/.false definitions. Add BooleanArray methods

    @ephemer
    ephemer committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    ac833a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Add Sendable conformance (WIP)

    @ephemer
    ephemer committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    3d0a1c6 View commit details
    Browse the repository at this point in the history