Skip to content

Commit

Permalink
Use the dependecy version that other packages are already using
Browse files Browse the repository at this point in the history
  • Loading branch information
bitfriend committed Dec 26, 2024
1 parent 3fbdb12 commit d4292c4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ default-features = false
[workspace.dependencies.matrix-sdk-crypto]
git = "https://github.com/matrix-org/matrix-rust-sdk"
# path = "../matrix-rust-sdk/crates/matrix-sdk-crypto"
default-features = false

[workspace.dependencies.matrix-sdk-sqlite]
git = "https://github.com/matrix-org/matrix-rust-sdk"
Expand Down Expand Up @@ -72,10 +73,6 @@ derive_builder = "0.20.0"
icalendar = "0.16.1"
scc = "2"
env_logger = "0.11.5"
http = "1.1.0"
zeroize = "1.8.1"
rand = "0.8.5"
sha2 = "0.10.8"

[profile.release]
panic = "unwind"
Expand Down
28 changes: 15 additions & 13 deletions native/acter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ ffi-gen-macro = { git = "https://github.com/acterglobal/ffi-gen", branch = "main
# ffi-gen-macro = { path = "../../../ffi-gen/macro" }
futures = "0.3.30"
futures-signals = "0.3.33"
hmac = { version = "0.12.1", optional = true }
http = { workspace = true, optional = true }
icalendar = { workspace = true }
indexmap = { version = "2.2.5", features = ["serde"]}
indexmap = { version = "2.2.5", features = ["serde"] }
infer = "0.15.0"
lazy_static = "1.4"
log = "0.4"
Expand All @@ -50,40 +48,44 @@ mime = "0.3.17"
mime2ext = "0.1.52"
mime_guess = "2.0.4"
parse-env-filter = "0.1.0"
pbkdf2 = { version = "0.12.2", optional = true }

rand = { workspace = true, optional = true }
sanitize-filename-reader-friendly = "2.2.1"
scc = { workspace = true }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = { workspace = true, optional = true }
strum = { workspace = true }
tokio = {version = "1.37", features = ["rt-multi-thread"] }
tokio-stream = "0.1.14"
tokio = { version = "1.37", features = ["rt-multi-thread"] }
tokio-retry = "0.3.0"
tokio-stream = "0.1.14"
tracing = { version = "0.1.40", default-features = false, features = ["log"] }
url = { workspace = true }
urlencoding = "2.1.3"
uuid = { version = "1.6.1", features = ["v4"] }
zeroize = { workspace = true, features = ["zeroize_derive"], optional = true }

# for markdown support.
pulldown-cmark = { version = "0.9.3", default-features = false }

# for uniffi support
uniffi = { version = "0.26.1", features = ["cli"], optional = true }
uniffi = { version = "0.26.1", optional = true, features = ["cli"] }
thiserror = { version = "1.0.56", optional = true }

# for proxyman support
# enable support for system native TLS certificates
reqwest = { optional = true, version = "*", default-features = false, features = ["rustls-tls-native-roots"] }
reqwest = { version = "*", optional = true, default-features = false, features = ["rustls-tls-native-roots"] }

# for tracing support
tracing-subscriber = { version = "0.3.1", optional = true, default-features = false, features = ["fmt", "std", "env-filter"] }
console-subscriber = { version = "0.2.0", optional = true }
tracing-appender = { version = "0.2", optional = true }
tracing-log = { version = "0.2", optional = true }
console-subscriber = { version = "0.2.0", optional = true }
tracing-subscriber = { version = "0.3.1", optional = true, default-features = false, features = ["fmt", "std", "env-filter"] }

# for session verification support
hmac = { version = "*", optional = true }
http = { version = "*", optional = true }
pbkdf2 = { version = "*", optional = true }
rand = { version = "*", optional = true }
sha2 = { version = "*", optional = true }
zeroize = { version = "*", optional = true, features = ["zeroize_derive"] }

# not used directly but needed to enable specific features from ruma
ruma = { workspace = true, features = ["html", "rand", "unstable-msc2448", "unstable-msc2965", "unstable-msc3930", "unstable-msc3245-v1-compat"] }
Expand Down

0 comments on commit d4292c4

Please sign in to comment.