From 00657c64aa2d85423c03c5eca0eaf715155e7db5 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Fri, 20 Dec 2024 00:11:17 +0000 Subject: [PATCH] build: Sync Cargo lockfile with Zenoh's --- zenoh-jni/Cargo.lock | 96 +++++++++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 27 deletions(-) diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index 96736838..113b9275 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -1567,6 +1567,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "regex" version = "1.10.6" @@ -2189,6 +2209,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tls-listener" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1d8809f604e448c7bc53a5a0e4c2a0a20ba44cb1fb407314c8eeccb92127f9" +dependencies = [ + "futures-util", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-rustls", +] + [[package]] name = "token-cell" version = "1.5.0" @@ -2855,7 +2888,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "ahash", "async-trait", @@ -2871,6 +2904,7 @@ dependencies = [ "petgraph", "phf", "rand", + "ref-cast", "rustc_version", "serde", "serde_json", @@ -2901,7 +2935,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "zenoh-collections", ] @@ -2909,7 +2943,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "tracing", "uhlc", @@ -2920,12 +2954,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "json5", "num_cpus", @@ -2937,6 +2971,7 @@ dependencies = [ "uhlc", "validated_struct", "zenoh-core", + "zenoh-keyexpr", "zenoh-macros", "zenoh-protocol", "zenoh-result", @@ -2946,7 +2981,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "lazy_static", "tokio", @@ -2957,7 +2992,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "aes", "hmac", @@ -2970,8 +3005,9 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ + "async-trait", "bincode", "flume 0.11.0", "futures", @@ -2979,6 +3015,7 @@ dependencies = [ "serde", "tokio", "tracing", + "uhlc", "zenoh", "zenoh-macros", "zenoh-util", @@ -2987,7 +3024,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -3001,7 +3038,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3018,7 +3055,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "flume 0.11.0", @@ -3026,6 +3063,7 @@ dependencies = [ "rustls", "rustls-webpki", "serde", + "time", "tokio", "tokio-util", "tracing", @@ -3041,7 +3079,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "base64 0.22.1", @@ -3051,6 +3089,7 @@ dependencies = [ "rustls-pki-types", "rustls-webpki", "secrecy", + "time", "tokio", "tokio-util", "tracing", @@ -3061,29 +3100,30 @@ dependencies = [ "zenoh-link-commons", "zenoh-protocol", "zenoh-result", + "zenoh-util", ] [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "socket2", "tokio", "tokio-util", "tracing", + "zenoh-config", "zenoh-core", "zenoh-link-commons", "zenoh-protocol", "zenoh-result", - "zenoh-util", ] [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "base64 0.22.1", @@ -3093,6 +3133,8 @@ dependencies = [ "rustls-webpki", "secrecy", "socket2", + "time", + "tls-listener", "tokio", "tokio-rustls", "tokio-util", @@ -3110,7 +3152,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "socket2", @@ -3129,7 +3171,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "nix", @@ -3147,7 +3189,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "futures-util", @@ -3167,7 +3209,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "proc-macro2", "quote", @@ -3178,7 +3220,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "git-version", "libloading", @@ -3194,7 +3236,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "const_format", "rand", @@ -3208,7 +3250,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "anyhow", ] @@ -3216,7 +3258,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "lazy_static", "ron", @@ -3229,7 +3271,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "event-listener", "futures", @@ -3242,7 +3284,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "futures", "tokio", @@ -3255,7 +3297,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "crossbeam-utils", @@ -3288,7 +3330,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1a4a295098cf4c8d65b252883e9692b8c4dd7d1b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9640d2245204ebcb2ed3f424a5178f832315df7b" dependencies = [ "async-trait", "const_format",