From 573ce941a55591166ffc51c32525e36bb16b8aa0 Mon Sep 17 00:00:00 2001 From: Luca Cominardi Date: Fri, 30 Aug 2024 10:09:07 +0200 Subject: [PATCH] Point to eclipse-zenoh/zenoh branch=main --- Cargo.lock | 50 +++++++++++++++++++++++++------------------------- Cargo.toml | 4 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee983aa..c89095d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3962,7 +3962,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "ahash", "async-trait", @@ -4019,7 +4019,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "zenoh-collections", ] @@ -4027,7 +4027,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "serde", "tracing", @@ -4039,12 +4039,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "flume", "json5", @@ -4066,7 +4066,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-global-executor", "lazy_static", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4091,7 +4091,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "hashbrown", "keyed-set", @@ -4105,7 +4105,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "zenoh-config", @@ -4123,7 +4123,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "flume", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "base64 0.22.1", @@ -4179,7 +4179,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4198,7 +4198,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "base64 0.22.1", @@ -4229,7 +4229,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4250,7 +4250,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "futures", @@ -4270,7 +4270,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "futures-util", @@ -4291,7 +4291,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "proc-macro2", "quote", @@ -4302,7 +4302,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "libloading", "serde", @@ -4337,7 +4337,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "const_format", "rand 0.8.5", @@ -4352,7 +4352,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "anyhow", ] @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "futures", "lazy_static", @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "event-listener 5.3.1", "futures", @@ -4389,7 +4389,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "futures", "tokio", @@ -4402,7 +4402,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "crossbeam-utils", @@ -4436,7 +4436,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#926208cd2bd9a7ef59e6151ff17a99ce6b78edbd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7ff82cfd816fcf998a1a5b3582b04b9984260d88" dependencies = [ "async-trait", "const_format", diff --git a/Cargo.toml b/Cargo.toml index 51c2e60..1c74f34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,10 +49,10 @@ tide = "0.16.0" tokio = { version = "1.35.1", default-features = false } # Default features are disabled due to some crates' requirements tokio-stream = "0.1.15" tracing = "0.1" -zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = [ +zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ "unstable", "internal", "plugins" ] } -zenoh-plugin-trait = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", default-features = false } +zenoh-plugin-trait = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false } [build-dependencies] rustc_version = "0.4.0"