Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Marta Mularczyk committed Jan 13, 2025
1 parent ea7d7f6 commit f7b14e0
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 39 deletions.
6 changes: 3 additions & 3 deletions mls-rs-codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ std = ["dep:thiserror"]

[dependencies]
mls-rs-codec-derive = { version = "0.1.1", path = "../mls-rs-codec-derive" }
thiserror = { version = "1.0.40", optional = true }
thiserror = { version = "2.0", optional = true }

[dev-dependencies]
assert_matches = "1.5.0"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "=0.2.87" }
wasm-bindgen = { version = "0.2" }

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mls_build_async)'] }
8 changes: 4 additions & 4 deletions mls-rs-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ last_resort_key_package_ext = []
mls-rs-codec = { version = "0.5", path = "../mls-rs-codec", default-features = false}
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
arbitrary = { version = "1", features = ["derive"], optional = true }
thiserror = { version = "1.0.40", optional = true }
thiserror = { version = "2.0", optional = true }
safer-ffi = { version = "0.1.7", default-features = false, optional = true }
safer-ffi-gen = { version = "0.9.2", default-features = false, optional = true }
maybe-async = "0.2.10"

serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
serde_json = { version = "^1.0", optional = true }
hex = { version = "^0.4.3", default-features = false, features = ["alloc"] }
itertools = { version = "0.12", optional = true }
itertools = { version = "0.14", optional = true }
serde_bytes = { version = "0.11", optional = true }

[target.'cfg(mls_build_async)'.dependencies]
Expand All @@ -44,10 +44,10 @@ async-trait = "0.1.74"
assert_matches = "1.5.0"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "=0.2.87" }
wasm-bindgen = { version = "0.2" }

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mls_build_async)', 'cfg(coverage_nightly)'] }
2 changes: 1 addition & 1 deletion mls-rs-crypto-awslc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ mls-rs-core = { path = "../mls-rs-core", version = "0.20.0" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "0.11.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "0.12.0" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", version = "0.13.0" }
thiserror = "1.0.40"
thiserror = "2.0"
zeroize = { version = "1", features = ["zeroize_derive"] }
maybe-async = "0.2.10"

Expand Down
2 changes: 1 addition & 1 deletion mls-rs-crypto-cryptokit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mls-rs-core = { path = "../mls-rs-core", version = "0.20.0", features = ["test_s
maybe-async = "0.2.10"
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.20.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "0.12.0" }
thiserror = { version = "1.0.63", optional = true }
thiserror = { version = "2.0", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }

[target.'cfg(mls_build_async)'.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions mls-rs-crypto-hpke/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test_utils = ["mls-rs-core/test_suite"]
[dependencies]
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.20.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "0.12.0" }
thiserror = { version = "1.0.40", optional = true }
thiserror = { version = "2.0", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
cfg-if = "^1"
maybe-async = "0.2.10"
Expand All @@ -26,12 +26,12 @@ maybe-async = "0.2.10"
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
assert_matches = "1.5.0"
mockall = "0.12"
mockall = "0.13"
hex = { version = "^0.4.3", features = ["serde"] }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", features = ["mock"], version = "0.12.0" }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }
getrandom = { version = "0.2", features = ["js"] }

[target.'cfg(mls_build_async)'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion mls-rs-crypto-openssl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mls-rs-core = { path = "../mls-rs-core", version = "0.20.0" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", optional = true, version = "0.13.0" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "0.11.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "0.12.0" }
thiserror = "1.0.40"
thiserror = "2.0"
zeroize = { version = "1", features = ["zeroize_derive"] }
maybe-async = "0.2.10"

Expand Down
4 changes: 2 additions & 2 deletions mls-rs-crypto-rustcrypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", default-features = false, version = "0.11.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "0.12.0" }

thiserror = { version = "1.0.40", optional = true }
thiserror = { version = "2.0", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }

# Random
Expand Down Expand Up @@ -77,7 +77,7 @@ mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", default-features = false,
async-trait = "0.1.74"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mls_build_async)'] }
2 changes: 1 addition & 1 deletion mls-rs-crypto-traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ default = ["std"]

[dependencies]
mls-rs-core = { path = "../mls-rs-core", version = "0.20.0", default-features = false }
mockall = { version = "^0.11", optional = true }
mockall = { version = "0.13", optional = true }
maybe-async = "0.2.10"

[target.'cfg(mls_build_async)'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion mls-rs-crypto-traits/src/dh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use alloc::vec::Vec;
use mockall::automock;

/// A trait that provides the required DH functions, as in RFC 9180,Section 4.1
#[cfg_attr(feature = "mock", automock(type Error = crate::mock::TestError;))]
#[cfg_attr(not(mls_build_async), maybe_async::must_be_sync)]
#[cfg_attr(feature = "mock", automock(type Error = crate::mock::TestError;))]
#[cfg_attr(all(target_arch = "wasm32", mls_build_async), maybe_async::must_be_async(?Send))]
#[cfg_attr(
all(not(target_arch = "wasm32"), mls_build_async),
Expand Down
10 changes: 5 additions & 5 deletions mls-rs-crypto-webcrypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ license = "Apache-2.0 OR MIT"
mls-rs-core = { path = "../mls-rs-core", default-features = false, features = ["std"], version = "0.20.0" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", default-features = false, features = ["std"], version = "0.11.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, features = ["std"], version = "0.12.0" }
thiserror = "1.0.40"
thiserror = "2.0"
zeroize = { version = "1", features = ["zeroize_derive"] }
maybe-async = "0.2.10"
async-trait = "0.1.74"
js-sys = "0.3.64"
wasm-bindgen = "=0.2.87"
wasm-bindgen-futures = "0.4.37"
js-sys = "0.3"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
serde-wasm-bindgen = "0.6"
serde = { version = "1.0", features = ["derive"] }
der = { version = "0.7.8", features = ["alloc", "derive", "oid"] }
Expand All @@ -27,7 +27,7 @@ const-oid = { version = "0.9", features = ["db"] }

[dev-dependencies]
mls-rs-core = { path = "../mls-rs-core", version = "0.20.0", features = ["test_suite"] }
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }
futures-test = "0.3.25"
serde_json = "^1.0"
hex = { version = "^0.4.3", features = ["serde"] }
Expand Down
8 changes: 4 additions & 4 deletions mls-rs-identity-x509/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ std = ["mls-rs-core/std", "dep:thiserror"]
[dependencies]
mls-rs-core = { path = "../mls-rs-core", default-features = false, features = ["x509"], version = "0.20.0" }
maybe-async = "0.2.10"
thiserror = { version = "1.0.40", optional = true }
thiserror = { version = "2.0", optional = true }

# Async mode dependencies
[target.'cfg(mls_build_async)'.dependencies]
async-trait = "0.1.74"

[dev-dependencies]
mockall = "0.12"
mockall = "0.13"
assert_matches = "1"
rand = "0.8"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }
getrandom = { version = "0.2", features = ["js"] }


[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "=0.2.87" }
wasm-bindgen = { version = "0.2" }

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mls_build_async)'] }
6 changes: 3 additions & 3 deletions mls-rs-provider-sqlite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ license = "Apache-2.0 OR MIT"

[dependencies]
mls-rs-core = { path = "../mls-rs-core", version = "0.20.0" }
thiserror = "1.0.40"
wasm-bindgen = { version = "=0.2.87", optional = true }
thiserror = "2.0"
wasm-bindgen = { version = "0.2", optional = true }
zeroize = { version = "1", features = ["zeroize_derive"] }
rusqlite = { version = "0.31", default-features = false }
rusqlite = { version = "0.32", default-features = false }
rand = "0.8"
hex = { version = "0.4" }
maybe-async = "0.2.10"
Expand Down
2 changes: 1 addition & 1 deletion mls-rs-uniffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ maybe-async = "0.2.10"
mls-rs = { version = "0.43.0", path = "../mls-rs" }
mls-rs-core = { version = "0.20.0", path = "../mls-rs-core" }
mls-rs-crypto-openssl = { version = "0.11.0", path = "../mls-rs-crypto-openssl" }
thiserror = "1.0.57"
thiserror = "2.0"
uniffi = { git = "https://github.com/mozilla/uniffi-rs/", rev = "eeb785c", version = "0.27.0" }

[target.'cfg(mls_build_async)'.dependencies]
Expand Down
10 changes: 5 additions & 5 deletions mls-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", default-features = false, version = "0.13.0", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
mls-rs-codec = { version = "0.5", path = "../mls-rs-codec", default-features = false}
thiserror = { version = "1.0.40", optional = true }
itertools = { version = "0.12.0", default-features = false, features = ["use_alloc"]}
thiserror = { version = "2.0", optional = true }
itertools = { version = "0.14", default-features = false, features = ["use_alloc"]}
cfg-if = "1"
debug_tree = { version = "0.4.0", optional = true }
spin = { version = "0.9.8", default-features = false, features = ["mutex", "spin_mutex"] }
Expand All @@ -81,7 +81,7 @@ async-trait = "0.1.74"

[target.'cfg(not(target_has_atomic = "ptr"))'.dependencies]
portable-atomic = { version = "1.5.1", default-features = false, features = ["critical-section"] }
portable-atomic-util = { version = "0.1.2", default-features = false, features = ["alloc"] }
portable-atomic-util = { version = "0.2", default-features = false, features = ["alloc"] }
spin = { version = "0.9.8", default-features = false, features = ["portable_atomic"] }

[target.'cfg(mls_build_async)'.dev-dependencies]
Expand All @@ -96,12 +96,12 @@ serde = { version = "1.0", default-features = false, features = ["alloc", "deriv
hex = { version = "^0.4.3", default-features = false, features = ["serde", "alloc"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "=0.2.87" }
wasm-bindgen = { version = "0.2" }
getrandom = { version = "0.2", features = ["js", "custom"], default-features = false }
rand_core = { version = "0.6", default-features = false, features = ["alloc"] }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "=0.3.26", default-features = false }
wasm-bindgen-test = { version = "0.3", default-features = false }
mls-rs-crypto-webcrypto = { path = "../mls-rs-crypto-webcrypto", version = "0.6.0" }
criterion = { version = "0.5.1", default-features = false, features = ["plotters", "cargo_bench_support", "async_futures", "html_reports"] }

Expand Down
8 changes: 4 additions & 4 deletions mls-rs/test_harness_integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ publish = false

[dependencies]
mls-rs = { version = "0.43.0", path = "..", default-features = false, features = ["std", "external_client"]}
tonic = "0.10.2"
prost = "0.12.1"
tonic = "0.12"
prost = "0.13"
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
clap = { version = "4", features = ["derive"] }
thiserror = "1"
thiserror = "2"
hex = "0.4"

[features]
Expand All @@ -31,4 +31,4 @@ mls-rs-crypto-rustcrypto = { path = "../../mls-rs-crypto-rustcrypto", features =
mls-rs-crypto-openssl = { path = "../../mls-rs-crypto-openssl", version = "0.11.0"}

[build-dependencies]
tonic-build = "0.10.2"
tonic-build = "0.12"

0 comments on commit f7b14e0

Please sign in to comment.