From 4a64f116dc108cb9334a84c6cdd94fe190aa2d46 Mon Sep 17 00:00:00 2001 From: Orion Kindel Date: Wed, 5 Apr 2023 10:23:28 -0700 Subject: [PATCH] chore: update readme, update toad-jni, pin jni --- README.md | 9 +++++---- glue/Cargo.lock | 4 ++-- glue/Cargo.toml | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0d1df2d..85f8be6 100644 --- a/README.md +++ b/README.md @@ -61,11 +61,11 @@ general abstractions that are useful for this project and may be useful to other This includes things like _"high-level rust struct for `java.util.ArrayList` doing nice things like implementing [`Iterator`](https://doc.rust-lang.org/nightly/core/iter/trait.Iterator.html)."_ -Separately is a rust project in this repository, `./toad-java-glue-rs/`. +Separately is a rust project in this repository, `./glue/`. This is *not* a published crate and is instead source code for a shared library specifically to implement native java methods in this java project. -Development tips specific to the glue lib can be found in `./toad-java-glue-rs/README.md`. +Development tips specific to the glue lib can be found in `./glue/README.md`. #### Developing - Build the sbt command `compile` (`sbt compile` or `compile` in the `sbt` shell) @@ -73,9 +73,10 @@ is the only required build step for this project. `sbt compile` can be broken into the following steps: 1. run `javac` to generate C headers for java files with `native` function requirements - 1. dump the headers into `./toad-java-glue-rs/target/debug/` + 1. dump the headers into `./target/native/debug/` - _(dual purpose; a native interface available to manually cross-check against the hard rust implementation, as well as providing an interface to the built library artifact)_ - 1. run `cargo build` within `./toad-java-glue-rs/` + 1. run `cargo build` within `./glue/` (builds to `./target/native/`) + 1. run `cargo test` within `./glue/` 1. build java & scala sources to `./target/` ### Tests diff --git a/glue/Cargo.lock b/glue/Cargo.lock index 97dd692..4b6a3d8 100644 --- a/glue/Cargo.lock +++ b/glue/Cargo.lock @@ -578,9 +578,9 @@ dependencies = [ [[package]] name = "toad-jni" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211cccf8f1dce2768a85b6f42b1d232542ecb616584bc9915da1cfc50c3d3d1" +checksum = "ff5fbc1fb554ad85160c74d6c6db551f164b79917c89509037477ad308d2b4ac" dependencies = [ "jni", "toad-array 0.5.0", diff --git a/glue/Cargo.toml b/glue/Cargo.toml index 82f5a9c..7b7ba67 100644 --- a/glue/Cargo.toml +++ b/glue/Cargo.toml @@ -8,8 +8,8 @@ publish = false crate_type = ["cdylib"] [dependencies] -jni = "*" +jni = "0.21.1" toad = "0.17.2" -toad-jni = "0.4.0" +toad-jni = "0.4.1" toad-msg = "0.18.1" tinyvec = {version = "1.5", default_features = false, features = ["rustc_1_55"]}