Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ members = [
"ndk",
"ndk-sys",
]

[patch.crates-io]
jni = { git = "https://github.com/jni-rs/jni-rs" }
1 change: 1 addition & 0 deletions ndk-sys/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- **Breaking:** Regenerate against NDK `25.2.9519653` with `rust-bindgen 0.66.0`. (#324, #370)
- Add `font`, `font_matcher`, `system_fonts` bindings. (#397)
- Add `sync` feature for linking against `libsync.so`. (#423)
- **Breaking:** Bump `jni-sys` dependency to 0.4. (#433)

# 0.4.1 (2022-11-23)

Expand Down
2 changes: 1 addition & 1 deletion ndk-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository = "https://github.com/rust-mobile/ndk"
rust-version = "1.60"

[dependencies]
jni-sys = "0.3.0"
jni-sys = "0.4.0"

[features]
test = []
Expand Down
1 change: 1 addition & 0 deletions ndk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
- Add bindings for `ASharedMemory`. (#427)
- hardware_buffer: Add `id()` to retrieve a system-wide unique identifier for a `HardwareBuffer`. (#428)
- **Breaking:** bitmap: Strip `Android` prefix from structs and enums, and `Bitmap` from `Result`. (#430)
- **Breaking:** Bump `jni-sys` dependency to `0.4` and `jni` to `0.22`. (#433)
- **Breaking:** `raw-window-handle 0.5` support is now behind an _optional_ `rwh_05` crate feature and `raw-window-handle` `0.4` and `0.6` support is provided via the new `rwh_04` and (default-enabled) `rwh_06` crate features. (#434)
- **Breaking:** looper: Provide `event` value to file descriptor poll callback. (#435)
- **Breaking:** `HardwareBufferFormat` is no longer exported from `hardware_buffer` and `native_window`, and can only be reached through the `hardware_buffer_format` module. (#436)
Expand Down
3 changes: 2 additions & 1 deletion ndk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test = ["ffi/test", "jni", "all"]

[dependencies]
bitflags = "2.2"
jni-sys = "0.3"
jni-sys = "0.4"
log = "0.4.6"
num_enum = "0.7"
rwh_04 = { package = "raw-window-handle", version = "0.4", optional = true }
Expand All @@ -44,6 +44,7 @@ rwh_06 = { package = "raw-window-handle", version = "0.6", optional = true }
thiserror = "1.0.23"

[dependencies.jni]
# version = "0.22"
version = "0.21"
optional = true

Expand Down