Skip to content

build: update async-nats #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 25, 2024
Merged
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
84 changes: 71 additions & 13 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ wrpc-cli = { workspace = true, optional = true }
wrpc-runtime-wasmtime = { workspace = true, optional = true }
wrpc-transport = { workspace = true }
wrpc-transport-nats = { workspace = true, features = [
"async-nats-0_37",
"async-nats-0_38",
], optional = true }
wrpc-transport-quic = { workspace = true, optional = true }
wrpc-transport-web = { workspace = true, optional = true }
Expand Down Expand Up @@ -120,7 +120,7 @@ wrpc-transport = { workspace = true, features = ["net"] }

[workspace.dependencies]
anyhow = { version = "1", default-features = false }
async-nats = { version = "0.37", default-features = false }
async-nats = { version = "0.38", default-features = false }
axum = { version = "0.7", default-features = false }
bitflags = { version = "2", default-features = false }
bytes = { version = "1", default-features = false }
Expand Down Expand Up @@ -171,12 +171,12 @@ wit-bindgen-wrpc-rust = { version = "0.9", default-features = false, path = "./c
wit-bindgen-wrpc-rust-macro = { version = "0.9", default-features = false, path = "./crates/wit-bindgen-rust-macro" }
wit-component = { version = "0.219", default-features = false }
wit-parser = { version = "0.219", default-features = false }
wrpc-cli = { version = "0.4", path = "./crates/cli", default-features = false }
wrpc-cli = { version = "0.5", path = "./crates/cli", default-features = false }
wrpc-introspect = { version = "0.6", default-features = false, path = "./crates/introspect" }
wrpc-runtime-wasmtime = { version = "0.25", path = "./crates/runtime-wasmtime", default-features = false }
wrpc-test = { path = "./crates/test", default-features = false }
wrpc-transport = { version = "0.28.3", path = "./crates/transport", default-features = false }
wrpc-transport-nats = { version = "0.27.1", path = "./crates/transport-nats", default-features = false }
wrpc-transport-nats = { version = "0.28", path = "./crates/transport-nats", default-features = false }
wrpc-transport-quic = { version = "0.4", path = "./crates/transport-quic", default-features = false }
wrpc-transport-web = { version = "0.1", path = "./crates/transport-web", default-features = false }
wrpc-wasi-keyvalue = { version = "0.1.1", path = "./crates/wasi-keyvalue", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wrpc-cli"
version = "0.4.0"
version = "0.5.0"
description = "wRPC CLI utilities"

authors.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions crates/transport-nats/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wrpc-transport-nats"
version = "0.27.1"
version = "0.28.0"
description = "wRPC NATS transport"

authors.workspace = true
Expand All @@ -10,10 +10,13 @@ license.workspace = true
repository.workspace = true

[features]
default = ["async-nats-0_37"]
default = ["async-nats-0_38"]

[dependencies]
anyhow = { workspace = true, features = ["std"] }
async-nats-0_38 = { package = "async-nats", version = "0.38", default-features = false, features = [
"ring",
], optional = true }
async-nats-0_37 = { package = "async-nats", version = "0.37", default-features = false, features = [
"ring",
], optional = true }
Expand Down
15 changes: 12 additions & 3 deletions crates/transport-nats/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,22 @@
#![allow(clippy::type_complexity)]

#[cfg(any(
not(any(feature = "async-nats-0_37", feature = "async-nats-0_36")),
all(feature = "async-nats-0_37", feature = "async-nats-0_36")
not(any(
feature = "async-nats-0_38",
feature = "async-nats-0_37",
feature = "async-nats-0_36",
)),
all(feature = "async-nats-0_38", feature = "async-nats-0_37"),
all(feature = "async-nats-0_38", feature = "async-nats-0_36"),
all(feature = "async-nats-0_37", feature = "async-nats-0_36"),
))]
compile_error!(
"Either feature \"async-nats-0_37\" or \"async-nats-0_36\" must be enabled for this crate."
"Either feature \"async-nats-0_38\", \"async-nats-0_37\" or \"async-nats-0_36\" must be enabled for this crate."
);

#[cfg(feature = "async-nats-0_38")]
use async_nats_0_38 as async_nats;

#[cfg(feature = "async-nats-0_37")]
use async_nats_0_37 as async_nats;

Expand Down
2 changes: 1 addition & 1 deletion crates/wasmtime-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ wasmtime-wasi = { workspace = true }
wasmtime-wasi-http = { workspace = true }
wit-component = { workspace = true }
wrpc-cli = { workspace = true, features = ["nats"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
wrpc-transport = { workspace = true, features = ["net"] }
wrpc-runtime-wasmtime = { workspace = true }
2 changes: 1 addition & 1 deletion examples/rust/hello-nats-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ tokio = { workspace = true, features = ["rt-multi-thread"] }
tracing-subscriber = { workspace = true, features = ["ansi", "fmt"] }
url = { workspace = true }
wit-bindgen-wrpc = { workspace = true }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
2 changes: 1 addition & 1 deletion examples/rust/hello-nats-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["ansi", "fmt"] }
url = { workspace = true }
wit-bindgen-wrpc = { workspace = true }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
2 changes: 1 addition & 1 deletion examples/rust/streams-nats-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ tracing-subscriber = { workspace = true, features = [
] }
url = { workspace = true }
wit-bindgen-wrpc = { workspace = true }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
2 changes: 1 addition & 1 deletion examples/rust/streams-nats-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ tracing-subscriber = { workspace = true, features = [
] }
url = { workspace = true }
wit-bindgen-wrpc = { workspace = true }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
2 changes: 1 addition & 1 deletion examples/rust/wasi-keyvalue-nats-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ tracing-subscriber = { workspace = true, features = [
"fmt",
] }
url = { workspace = true }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
wrpc-wasi-keyvalue = { workspace = true }
2 changes: 1 addition & 1 deletion examples/rust/wasi-keyvalue-nats-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ tracing-subscriber = { workspace = true, features = [
] }
url = { workspace = true }
wrpc-transport = { workspace = true }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
wrpc-wasi-keyvalue = { workspace = true }
wrpc-wasi-keyvalue-mem = { workspace = true }
2 changes: 1 addition & 1 deletion examples/web/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ url = { workspace = true }
uuid = { workspace = true, features = ["std", "v7"] }
wit-bindgen-wrpc = { workspace = true }
wrpc-transport = { workspace = true, features = ["net"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_37"] }
wrpc-transport-nats = { workspace = true, features = ["async-nats-0_38"] }
wrpc-transport-quic = { workspace = true }
wrpc-transport-web = { workspace = true }
wrpc-wasi-keyvalue = { workspace = true }
Expand Down
Loading