chore: Sort the deps in our Cargo.toml files

master
Damir Jelić 2021-09-14 15:32:58 +02:00
parent af74988a83
commit 70ab0f446d
5 changed files with 57 additions and 68 deletions

View File

@ -1,11 +1,11 @@
[workspace]
members = [
"crates/matrix-sdk",
"crates/matrix-qrcode",
"crates/matrix-sdk",
"crates/matrix-sdk-appservice",
"crates/matrix-sdk-base",
"crates/matrix-sdk-common",
"crates/matrix-sdk-crypto",
"crates/matrix-sdk-test",
"crates/matrix-sdk-test-macros",
"crates/matrix-sdk-crypto",
"crates/matrix-sdk-common",
"crates/matrix-sdk-appservice"
]

View File

@ -27,6 +27,7 @@ dashmap = "4"
futures = "0.3"
futures-util = "0.3"
http = "0.2"
matrix-sdk = { version = "0.4", path = "../matrix-sdk", default-features = false, features = ["appservice"] }
regex = "1"
serde = "1"
serde_json = "1"
@ -36,20 +37,17 @@ tracing = "0.1"
url = "2"
warp = { git = "https://github.com/seanmonstar/warp.git", rev = "629405", optional = true, default-features = false }
matrix-sdk = { version = "0.4", path = "../matrix-sdk", default-features = false, features = ["appservice"] }
[dependencies.ruma]
version = "0.4.0"
features = ["client-api-c", "appservice-api-s", "unstable-pre-spec"]
[dev-dependencies]
env_logger = "0.8"
matrix-sdk-test = { version = "0.4", path = "../matrix-sdk-test", features = ["appservice"] }
mockito = "0.30"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "macros"] }
tracing-subscriber = "0.2"
matrix-sdk-test = { version = "0.4", path = "../matrix-sdk-test", features = ["appservice"] }
[[example]]
name = "appservice_autojoin"
required-features = ["warp"]

View File

@ -26,28 +26,23 @@ sled_cryptostore = ["matrix-sdk-crypto/sled_cryptostore"]
docs = ["encryption", "sled_cryptostore"]
[dependencies]
chacha20poly1305 = { version = "0.9.0", optional = true }
dashmap = "4.0.2"
futures = "0.3.15"
hmac = { version = "0.11.0", optional = true }
lru = "0.6.5"
matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
matrix-sdk-crypto = { version = "0.4.0", path = "../matrix-sdk-crypto", optional = true }
pbkdf2 = { version = "0.9.0", default-features = false, optional = true }
rand = { version = "0.8.4", optional = true }
ruma = { version = "0.4.0", features = ["client-api-c", "unstable-pre-spec"] }
serde = { version = "1.0.126", features = ["rc"] }
serde_json = "1.0.64"
tracing = "0.1.26"
matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
matrix-sdk-crypto = { version = "0.4.0", path = "../matrix-sdk-crypto", optional = true }
# Misc dependencies
thiserror = "1.0.25"
futures = "0.3.15"
zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
# Deps for the sled state store
sled = { version = "0.34.6", optional = true }
chacha20poly1305 = { version = "0.9.0", optional = true }
pbkdf2 = { version = "0.9.0", default-features = false, optional = true }
hmac = { version = "0.11.0", optional = true }
sha2 = { version = "0.9.5", optional = true }
rand = { version = "0.8.4", optional = true }
sled = { version = "0.34.6", optional = true }
thiserror = "1.0.25"
tracing = "0.1.26"
zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
version = "1.7.1"
@ -55,17 +50,17 @@ default-features = false
features = ["sync", "fs"]
[dev-dependencies]
matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }
http = "0.2.4"
matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
tempfile = "3.2.0"
rustyline = "9.0.0"
rustyline-derive = "0.5.0"
atty = "0.2.14"
clap = "2.33.3"
rustyline = "9.0.0"
rustyline-derive = "0.5.0"
syntect = "4.5.0"
tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
tempfile = "3.2.0"
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = "0.3.24"

View File

@ -23,41 +23,38 @@ sled_cryptostore = ["sled"]
docs = ["sled_cryptostore"]
[dependencies]
matrix-qrcode = { version = "0.2.0", path = "../matrix-qrcode" , optional = true}
matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
ruma = { version = "0.4.0", features = ["client-api-c", "unstable-pre-spec"] }
olm-rs = { version = "2.0.1", features = ["serde"] }
aes = { version = "0.7.4", features = ["ctr"] }
aes-gcm = "0.9.2"
atomic = "0.5.0"
base64 = "0.13.0"
byteorder = "1.4.3"
dashmap = "4.0.2"
futures = "0.3.15"
getrandom = "0.2.3"
hmac = "0.11.0"
matrix-qrcode = { version = "0.2.0", path = "../matrix-qrcode", optional = true }
matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
olm-rs = { version = "2.0.1", features = ["serde"] }
pbkdf2 = { version = "0.9.0", default-features = false }
ruma = { version = "0.4.0", features = ["client-api-c", "unstable-pre-spec"] }
serde = { version = "1.0.126", features = ["derive", "rc"] }
serde_json = "1.0.64"
zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
# Misc dependencies
futures = "0.3.15"
sha2 = "0.9.5"
sled = { version = "0.34.6", optional = true }
thiserror = "1.0.25"
tracing = "0.1.26"
atomic = "0.5.0"
dashmap = "4.0.2"
sha2 = "0.9.5"
aes-gcm = "0.9.2"
aes = { version = "0.7.4", features = ["ctr"] }
pbkdf2 = { version = "0.9.0", default-features = false }
hmac = "0.11.0"
base64 = "0.13.0"
byteorder = "1.4.3"
zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
[dev-dependencies]
tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
proptest = "1.0.0"
criterion = { version = "0.3.4", features = ["async", "async_tokio", "html_reports"] }
http = "0.2.4"
indoc = "1.0.3"
matches = "0.1.8"
matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }
proptest = "1.0.0"
serde_json = "1.0.64"
tempfile = "3.2.0"
http = "0.2.4"
matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }
indoc = "1.0.3"
criterion = { version = "0.3.4", features = ["async", "async_tokio", "html_reports"] }
tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
[target.'cfg(target_os = "linux")'.dev-dependencies]
pprof = { version = "0.5.0", features = ["flamegraph", "criterion"] }

View File

@ -35,21 +35,20 @@ docs = ["encryption", "sled_cryptostore", "sled_state_store", "sso_login"]
[dependencies]
anyhow = { version = "1.0.42", optional = true }
bytes = "1.0.1"
dashmap = "4.0.2"
event-listener = "2.5.1"
futures = "0.3.15"
http = "0.2.4"
matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
mime = "0.3.16"
rand = { version = "0.8.4", optional = true }
serde = "1.0.126"
serde_json = "1.0.64"
thiserror = "1.0.25"
tracing = "0.1.26"
url = "2.2.2"
zeroize = "1.3.0"
mime = "0.3.16"
rand = { version = "0.8.4", optional = true }
bytes = "1.0.1"
matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
[dependencies.matrix-sdk-base]
version = "0.4.0"
@ -69,6 +68,11 @@ version = "0.1.6"
features = ["net"]
optional = true
[dependencies.tracing-futures]
version = "0.2.5"
default-features = false
features = ["std", "std-future"]
[dependencies.warp]
version = "0.3.1"
default-features = false
@ -78,11 +82,6 @@ optional = true
version = "0.3.0"
features = ["tokio"]
[dependencies.tracing-futures]
version = "0.2.5"
default-features = false
features = ["std", "std-future"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
futures-timer = "3.0.2"
@ -98,14 +97,14 @@ features = ["wasm-bindgen"]
[dev-dependencies]
anyhow = "1.0"
dirs = "3.0.2"
lazy_static = "1.4.0"
matches = "0.1.8"
matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }
tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
serde_json = "1.0.64"
tracing-subscriber = "0.2.18"
tempfile = "3.2.0"
mockito = "0.30.0"
lazy_static = "1.4.0"
serde_json = "1.0.64"
tempfile = "3.2.0"
tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
tracing-subscriber = "0.2.18"
[[example]]
name = "emoji_verification"