move more dependencies into workspace

kitsune-soc · Dec 1, 2024 · 3b0af9d · 3b0af9d
1 parent 06d5457
commit 3b0af9d
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -87,6 +87,8 @@ async-graphql = { version = "7.0.11", default-features = false, features = [
     "uuid",
 ] }
 asynk-strim = "0.1.2"
+async-trait = "0.1.83"
+base64-simd = "0.8.0"
 clap = { version = "4.5.21", features = ["derive", "wrap_help"] }
 diesel = { version = "2.2.5", default-features = false, features = [
     "32-column-tables",

diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml
@@ -6,8 +6,8 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-async-trait = "0.1.83"
-base64-simd = "0.8.0"
+async-trait.workspace = true
+base64-simd.workspace = true
 diesel.workspace = true
 diesel-async.workspace = true
 futures-util.workspace = true
@@ -40,9 +40,6 @@ triomphe.workspace = true
 typed-builder.workspace = true
 url.workspace = true
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-sha2 = { version = "0.10.8", features = ["asm"] }
-
 [dev-dependencies]
 http-body-util = "0.1.2"
 hyper = "1.5.1"

diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml
@@ -6,7 +6,7 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 const_format = "0.2.33"
 git-version = "0.3.9"
 kitsune-db.workspace = true

diff --git a/crates/kitsune-observability/Cargo.toml b/crates/kitsune-observability/Cargo.toml
@@ -6,7 +6,7 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 eyre = "0.6.12"
 http-body-util = "0.1.2"
 hyper = { version = "1.5.1", default-features = false }

diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml
@@ -6,7 +6,7 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 bytes = "1.9.0"
 diesel.workspace = true
 diesel-async.workspace = true

diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml
@@ -7,7 +7,7 @@ license.workspace = true
 build = "build.rs"
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 blake3 = "1.5.5"
 color-eyre = "0.6.3"
 derive_more = { version = "1.0.0", features = ["from"] }

diff --git a/crates/kitsune-webfinger/Cargo.toml b/crates/kitsune-webfinger/Cargo.toml
@@ -6,7 +6,7 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 fred.workspace = true
 http.workspace = true
 kitsune-cache.workspace = true

diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -18,7 +18,7 @@ eula = false
 athena.workspace = true
 arc-swap = "1.7.1"
 argon2 = { version = "0.5.3", features = ["std"] }
-async-trait = "0.1.83"
+async-trait.workspace = true
 axum = { version = "0.7.9", features = ["macros", "multipart"] }
 axum-extra = { version = "0.9.6", features = [
     "cookie",

diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml
@@ -11,7 +11,7 @@ required-features = ["redis"]
 
 [dependencies]
 ahash = "0.8.11"
-async-trait = "0.1.83"
+async-trait.workspace = true
 either = { version = "1.13.0", default-features = false, optional = true }
 futures-util.workspace = true
 iso8601-timestamp.workspace = true

diff --git a/lib/cursiv/Cargo.toml b/lib/cursiv/Cargo.toml
@@ -18,7 +18,7 @@ triomphe.workspace = true
 zeroize = { version = "1.8.1", features = ["derive"] }
 
 # `axum` feature
-async-trait = { version = "0.1.83", optional = true }
+async-trait = { workspace = true, optional = true }
 axum-core = { version = "0.4.5", optional = true }
 
 [dev-dependencies]

diff --git a/lib/geomjeungja/Cargo.toml b/lib/geomjeungja/Cargo.toml
@@ -6,7 +6,7 @@ version.workspace = true
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 hickory-resolver.workspace = true
 rand = "0.8.5"
 serde.workspace = true

diff --git a/lib/http-signatures/Cargo.toml b/lib/http-signatures/Cargo.toml
@@ -14,7 +14,7 @@ name = "parse_cavage_header"
 harness = false
 
 [dependencies]
-base64-simd = "0.8.0"
+base64-simd.workspace = true
 blowocking = { workspace = true, optional = true }
 const-oid = { version = "0.9.6", features = ["db"] }
 derive_builder = "0.20.2"

diff --git a/lib/tower-http-digest/Cargo.toml b/lib/tower-http-digest/Cargo.toml
@@ -6,7 +6,7 @@ version.workspace = true
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-base64-simd = "0.8.0"
+base64-simd.workspace = true
 bytes = "1.9.0"
 either = { version = "1.13.0", default-features = false }
 http.workspace = true