Use Cargo workspace dependencies

… for most external dependencies that are used from multiple workspace
crates.

Cargo.toml

@@ -2,9 +2,21 @@
 members = ["crates/*", "examples/*", "xtask"]
 # Only compile / check / document the public crates by default
 default-members = ["crates/*"]
-
 resolver = "2"
 
+[workspace.dependencies]
+assert_matches = "1.5.0"
+assign = "1.1.1"
+base64 = "0.13.1"
+criterion = "0.4.0"
+http = "0.2.8"
+js_int = "0.2.2"
+maplit = "1.0.2"
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = "1.0.87"
+thiserror = "1.0.37"
+tracing = { version = "0.1.37", default-features = false, features = ["std"] }
+
 [profile.dev]
 # Speeds up test times by more than 10% in a simple test
 # Set to 1 or 2 if you want to use a debugger in this workspace

crates/ruma-appservice-api/Cargo.toml

@@ -23,11 +23,11 @@ unstable-msc2409 = []
 unstable-msc3202 = []
 
 [dependencies]
-js_int = { version = "0.2.2", features = ["serde"] }
+js_int = { workspace = true, features = ["serde"] }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.61"
+serde_json = { workspace = true }
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches = { workspace = true }
 serde_yaml = "0.9.14"

crates/ruma-client-api/Cargo.toml

@@ -31,15 +31,15 @@ client = []
 server = []
 
 [dependencies]
-assign = "1.1.1"
+assign = { workspace = true }
 bytes = "1.0.1"
-http = "0.2.2"
+http = { workspace = true }
-js_int = { version = "0.2.0", features = ["serde"] }
+js_int = { workspace = true, features = ["serde"] }
-maplit = "1.0.2"
+maplit = { workspace = true }
 percent-encoding = "2.1.0"
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.61"
+serde_json = { workspace = true }
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches = { workspace = true }

crates/ruma-client/Cargo.toml

@@ -32,13 +32,13 @@ reqwest-rustls-webpki-roots = ["reqwest", "reqwest?/rustls-tls-webpki-roots"]
 reqwest-rustls-native-roots = ["reqwest", "reqwest?/rustls-tls-native-roots"]
 
 [dependencies]
-assign = "1.1.1"
+assign = { workspace = true }
 async-stream = "0.3.0"
 async-trait = "0.1.50"
 bytes = "1.0.1"
 futures-core = "0.3.8"
 futures-lite = { version = "1.11.3", optional = true }
-http = "0.2.2"
+http = { workspace = true }
 hyper = { version = "0.14.2", optional = true, features = ["client", "http1", "http2", "tcp"] }
 hyper-rustls = { version = "0.23.0", optional = true, default-features = false }
 hyper-tls = { version = "0.5.0", optional = true }
@@ -46,8 +46,8 @@ isahc = { version = "1.3.1", optional = true }
 reqwest = { version = "0.11.4", optional = true, default-features = false }
 ruma-client-api = { version = "0.15.3", path = "../ruma-client-api", optional = true, features = ["client"] }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.61"
+serde_json = { workspace = true }
 tracing = { version = "0.1.30", default-features = false, features = ["std"] }
 
 [dev-dependencies]

crates/ruma-common/Cargo.toml

@@ -47,15 +47,15 @@ unstable-sanitize = ["dep:html5ever", "dep:phf"]
 unstable-unspecified = []
 
 [dependencies]
-base64 = "0.13.0"
+base64 = { workspace = true }
 bytes = "1.0.1"
 form_urlencoded = "1.0.0"
 getrandom = { version = "0.2.6", optional = true }
 html5ever = { version = "0.25.2", optional = true }
-http = { version = "0.2.2", optional = true }
+http = { workspace = true, optional = true }
 indexmap = { version = "1.9.1", features = ["serde"] }
 itoa = "1.0.1"
-js_int = { version = "0.2.0", features = ["serde"] }
+js_int = { workspace = true, features = ["serde"] }
 js_option = "0.1.0"
 konst = { version = "0.2.19", features = ["rust_1_64", "alloc"] }
 percent-encoding = "2.1.0"
@@ -65,25 +65,25 @@ rand = { version = "0.8.3", optional = true }
 regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] }
 ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false }
 ruma-macros = { version = "0.10.5", path = "../ruma-macros" }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = { version = "1.0.64", features = ["raw_value"] }
+serde_json = { workspace = true, features = ["raw_value"] }
-thiserror = { version = "1.0.26", optional = true }
+thiserror = { workspace = true, optional = true }
-tracing = "0.1.25"
+tracing = { workspace = true, features = ["attributes"] }
 url = "2.2.2"
 uuid = { version = "1.0.0", optional = true, features = ["v4"] }
 wildmatch = "2.0.0"
 
 # dev-dependencies can't be optional, so this is a regular dependency
-criterion = { version = "0.4.0", optional = true }
+criterion = { workspace = true, optional = true }
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 js-sys = { version = "0.3", optional = true }
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches = { workspace = true }
-assign = "1.1.1"
+assign = { workspace = true }
-http = "0.2.2"
+http = { workspace = true }
-maplit = "1.0.2"
+maplit = { workspace = true }
 trybuild = "1.0.71"
 
 [[bench]]

crates/ruma-federation-api/Cargo.toml

@@ -26,11 +26,11 @@ unstable-msc3723 = []
 unstable-unspecified = []
 
 [dependencies]
-js_int = { version = "0.2.0", features = ["serde"] }
+js_int = { workspace = true, features = ["serde"] }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.61"
+serde_json = { workspace = true }
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches = { workspace = true }
-http = "0.2.2"
+http = { workspace = true }

crates/ruma-identifiers-validation/Cargo.toml

@@ -15,5 +15,5 @@ all-features = true
 compat = []
 
 [dependencies]
-js_int = "0.2.0"
+js_int = { workspace = true }
-thiserror = "1.0.26"
+thiserror = { workspace = true }

crates/ruma-identity-service-api/Cargo.toml

@@ -19,9 +19,9 @@ client = []
 server = []
 
 [dependencies]
-js_int = { version = "0.2.0", features = ["serde"] }
+js_int = { workspace = true, features = ["serde"] }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
 
 [dev-dependencies]
-serde_json = "1.0.61"
+serde_json = { workspace = true }

crates/ruma-macros/Cargo.toml

@@ -23,6 +23,6 @@ proc-macro-crate = "1.0.0"
 proc-macro2 = "1.0.24"
 quote = "1.0.8"
 ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false }
-serde = { version = "1.0.139", features = ["derive"] }
+serde = { workspace = true }
 syn = { version = "1.0.57", features = ["extra-traits", "full", "visit"] }
 toml = "0.5.9"

crates/ruma-push-gateway-api/Cargo.toml

@@ -20,7 +20,7 @@ client = []
 server = []
 
 [dependencies]
-js_int = { version = "0.2.0", features = ["serde"] }
+js_int = { workspace = true, features = ["serde"] }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.61"
+serde_json = { workspace = true }

crates/ruma-server-util/Cargo.toml

@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 headers = "0.3"
 ruma-common = { version = "0.10.5", path = "../ruma-common" }
-tracing = "0.1.25"
+tracing = { workspace = true }
 yap = "0.7.2"
 
 [dev-dependencies]

crates/ruma-signatures/Cargo.toml

@@ -18,16 +18,16 @@ ring-compat = ["dep:subslice"]
 unstable-exhaustive-types = []
 
 [dependencies]
-base64 = "0.13.0"
+base64 = { workspace = true }
 ed25519-dalek = "1.0.1"
 pkcs8 = { version = "0.9.0", features = ["alloc"] }
 # because dalek uses an older version of rand_core
 rand = { version = "0.7", features = ["getrandom"] }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["canonical-json"] }
-serde_json = "1.0.60"
+serde_json = { workspace = true }
 sha2 = "0.9.5"
 subslice = { version = "0.2.3", optional = true }
-thiserror = "1.0.26"
+thiserror = { workspace = true }
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches = { workspace = true }

crates/ruma-state-res/Cargo.toml

@@ -19,18 +19,18 @@ unstable-exhaustive-types = []
 
 [dependencies]
 itertools = "0.10.0"
-js_int = "0.2.0"
+js_int = { workspace = true }
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["events"] }
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.60"
+serde_json = { workspace = true }
-thiserror = "1.0.26"
+thiserror = { workspace = true }
-tracing = "0.1.26"
+tracing = { workspace = true }
 
 # dev-dependencies can't be optional, so this is a regular dependency
-criterion = { version = "0.4.0", optional = true }
+criterion = { workspace = true, optional = true }
 
 [dev-dependencies]
-maplit = "1.0.2"
+maplit = { workspace = true }
 rand = "0.8.3"
 ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["unstable-pdu"] }
 tracing-subscriber = "0.3.3"

crates/ruma/Cargo.toml

@@ -188,8 +188,8 @@ __ci = [
 ]
 
 [dependencies]
-assign = "1.1.1"
+assign = { workspace = true }
-js_int = "0.2.0"
+js_int = { workspace = true }
 js_option = "0.1.1"
 
 ruma-common = { version = "0.10.5", path = "../ruma-common" }
@@ -205,4 +205,4 @@ ruma-identity-service-api = { version = "0.6.0", path = "../ruma-identity-servic
 ruma-push-gateway-api = { version = "0.6.0", path = "../ruma-push-gateway-api", optional = true }
 
 [dev-dependencies]
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { workspace = true }

xtask/Cargo.toml

@@ -11,8 +11,8 @@ default = ["dep:isahc", "dep:semver", "dep:toml_edit"]
 clap = { version = "4.0.18", features = ["derive"] }
 isahc = { version = "1.7.0", features = ["json"], optional = true }
 semver = { version = "1.0.6", features = ["serde"], optional = true }
-serde = { version = "1.0.136", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.79"
+serde_json = { workspace = true }
 toml = "0.5.8"
 toml_edit = { version = "0.15.0", optional = true }
 xshell = "0.1.17"