diff --git a/Cargo.lock b/Cargo.lock index cbff57eb15b..6f6c8f8a87f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -761,7 +761,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -1205,7 +1205,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.9", + "libloading", ] [[package]] @@ -1737,7 +1737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3aa12038120eb13347a6ae2ffab1d34efe78150125108627fd85044dd4d6ff1e" dependencies = [ "half", - "libloading 0.8.9", + "libloading", ] [[package]] @@ -4802,15 +4802,45 @@ dependencies = [ "cesu8", "cfg-if", "combine", - "java-locator", "jni-sys 0.3.1", - "libloading 0.7.4", "log", "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "java-locator", + "jni-macros", + "jni-sys 0.4.1", + "libloading", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.117", +] + [[package]] name = "jni-sys" version = "0.3.1" @@ -5508,16 +5538,6 @@ dependencies = [ "cc", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.9" @@ -6639,7 +6659,7 @@ checksum = "044b1fa4f259f4df9ad5078e587b208f5d288a25407575fcddb9face30c7c692" dependencies = [ "rand 0.9.2", "socket2", - "thiserror 1.0.69", + "thiserror 2.0.18", ] [[package]] @@ -6846,7 +6866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.11.0", + "itertools 0.14.0", "log", "multimap", "petgraph", @@ -6878,7 +6898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -7889,7 +7909,7 @@ checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" dependencies = [ "core-foundation 0.10.1", "core-foundation-sys", - "jni", + "jni 0.21.1", "log", "once_cell", "rustls", @@ -8303,6 +8323,16 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +[[package]] +name = "simd_cesu8" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simdutf8" version = "0.1.5" @@ -9970,7 +10000,7 @@ name = "vortex-cub" version = "0.1.0" dependencies = [ "bindgen", - "libloading 0.8.9", + "libloading", "paste", "vortex-array", "vortex-cuda-macros", @@ -10331,7 +10361,7 @@ dependencies = [ "arrow-ipc", "arrow-schema", "futures", - "jni", + "jni 0.22.4", "object_store", "parking_lot", "prost 0.14.3", @@ -10407,7 +10437,7 @@ name = "vortex-nvcomp" version = "0.1.0" dependencies = [ "bindgen", - "libloading 0.8.9", + "libloading", "liblzma", "reqwest 0.12.28", "tar", diff --git a/vortex-jni/Cargo.toml b/vortex-jni/Cargo.toml index d6901514b49..29ecf7e87dd 100644 --- a/vortex-jni/Cargo.toml +++ b/vortex-jni/Cargo.toml @@ -21,7 +21,7 @@ arrow-array = { workspace = true, features = ["ffi"] } arrow-ipc = { workspace = true } arrow-schema = { workspace = true } futures = { workspace = true } -jni = "0.21.1" +jni = "0.22.0" object_store = { workspace = true, features = ["aws", "azure", "gcp"] } parking_lot = { workspace = true } prost = { workspace = true } @@ -33,7 +33,7 @@ url = { workspace = true } vortex = { workspace = true, features = ["object_store", "files", "tokio"] } [dev-dependencies] -jni = { version = "0.21.1", features = ["invocation"] } +jni = { version = "0.22.0", features = ["invocation"] } [lib] crate-type = ["staticlib", "cdylib"]