Skip to content

Commit

Permalink
chore: Merge release/1.2.0 into main (#319)
Browse files Browse the repository at this point in the history
chore: Merge release/1.2.0 into main
  • Loading branch information
eclipse-zenoh-bot authored Feb 3, 2025
2 parents 668974c + c03180e commit 1db5130
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 62 deletions.
134 changes: 80 additions & 54 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ edition = "2021"
homepage = "http://zenoh.io"
license = "EPL-2.0 OR Apache-2.0"
repository = "https://github.com/eclipse-zenoh/zenoh-plugin-mqtt"
version = "1.1.1"
version = "1.2.0"

[workspace.dependencies]
async-channel = "2.3.1"
Expand All @@ -48,22 +48,22 @@ serde = "1.0.210"
serde_json = "1.0.128"
tokio = { version = "1.40.0", default-features = false } # Default features are disabled due to some crates' requirements
tracing = "0.1"
zenoh = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
zenoh = { version = "1.2.0", features = [
"plugins",
"unstable",
"internal",
"internal_config",

] }
zenoh-config = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false }
zenoh-ext = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
zenoh-config = { version = "1.2.0", default-features = false }
zenoh-ext = { version = "1.2.0", features = [
"unstable",
] }
zenoh-plugin-mqtt = { version = "1.1.1", path = "zenoh-plugin-mqtt/", default-features = false }
zenoh-plugin-rest = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = [
zenoh-plugin-mqtt = { version = "1.2.0", path = "zenoh-plugin-mqtt/", default-features = false }
zenoh-plugin-rest = { version = "1.2.0", default-features = false, features = [
"static_plugin",
] }
zenoh-plugin-trait = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false }
zenoh-plugin-trait = { version = "1.2.0", default-features = false }


[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion zenoh-plugin-mqtt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ maintainer = "[email protected]"
copyright = "2017, 2020 ADLINK Technology Inc."
section = "net"
license-file = ["../LICENSE", "0"]
depends = "zenohd (=1.1.1)"
depends = "zenohd (=1.2.0)"

0 comments on commit 1db5130

Please sign in to comment.