Skip to content

Commit

Permalink
use workspace for member deps
Browse files Browse the repository at this point in the history
  • Loading branch information
aumetra committed May 22, 2024
1 parent 8a6ec7d commit 049cd3e
Show file tree
Hide file tree
Showing 33 changed files with 307 additions and 258 deletions.
100 changes: 50 additions & 50 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ resolver = "2"
askama = { version = "0.12.1", default-features = false, features = [
"with-axum",
] }
clap = { version = "4.5.4", features = ["derive", "wrap_help"] }
diesel = { version = "2.1.6", default-features = false, features = [
"32-column-tables",
"with-deprecated",
Expand Down Expand Up @@ -110,6 +111,54 @@ triomphe = { version = "0.1.11", default-features = false, features = [
"unsize",
] }

# Local workspace dependencies (so we don't have to specify the path in every crate)
kitsune-activitypub = { path = "crates/kitsune-activitypub" }
kitsune-cache = { path = "crates/kitsune-cache" }
kitsune-captcha = { path = "crates/kitsune-captcha" }
kitsune-config = { path = "crates/kitsune-config" }
kitsune-core = { path = "crates/kitsune-core" }
kitsune-db = { path = "crates/kitsune-db" }
kitsune-derive = { path = "crates/kitsune-derive" }
kitsune-email = { path = "crates/kitsune-email" }
kitsune-embed = { path = "crates/kitsune-embed" }
kitsune-error = { path = "crates/kitsune-error" }
kitsune-federation = { path = "crates/kitsune-federation" }
kitsune-federation-filter = { path = "crates/kitsune-federation-filter" }
kitsune-http-client = { path = "crates/kitsune-http-client" }
kitsune-jobs = { path = "crates/kitsune-jobs" }
kitsune-language = { path = "crates/kitsune-language" }
kitsune-mastodon = { path = "crates/kitsune-mastodon" }
kitsune-observability = { path = "crates/kitsune-observability" }
kitsune-oidc = { path = "crates/kitsune-oidc" }
kitsune-s3 = { path = "crates/kitsune-s3" }
kitsune-scss-compiler = { path = "crates/kitsune-scss-compiler" }
kitsune-search = { path = "crates/kitsune-search" }
kitsune-service = { path = "crates/kitsune-service" }
kitsune-storage = { path = "crates/kitsune-storage" }
kitsune-test = { path = "crates/kitsune-test" }
kitsune-type = { path = "crates/kitsune-type" }
kitsune-url = { path = "crates/kitsune-url" }
kitsune-util = { path = "crates/kitsune-util" }
kitsune-wasm-mrf = { path = "crates/kitsune-wasm-mrf" }
kitsune-webfinger = { path = "crates/kitsune-webfinger" }
kitsune = { path = "kitsune" }
kitsune-job-runner = { path = "kitsune-job-runner" }
athena = { path = "lib/athena" }
blowocking = { path = "lib/blowocking" }
cursiv = { path = "lib/cursiv" }
geomjeungja = { path = "lib/geomjeungja" }
http-signatures = { path = "lib/http-signatures" }
just-retry = { path = "lib/just-retry" }
masto-id-convert = { path = "lib/masto-id-convert" }
mrf-manifest = { path = "lib/mrf-manifest" }
post-process = { path = "lib/post-process" }
speedy-uuid = { path = "lib/speedy-uuid" }
tick-tock-mock = { path = "lib/tick-tock-mock" }
tower-http-digest = { path = "lib/tower-http-digest" }
tower-stop-using-brave = { path = "lib/tower-stop-using-brave" }
tower-x-clacks-overhead = { path = "lib/tower-x-clacks-overhead" }
trials = { path = "lib/trials" }

[workspace.lints.clippy]
all = "warn"
pedantic = "warn"
Expand Down
38 changes: 19 additions & 19 deletions crates/kitsune-activitypub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@ futures-util = "0.3.30"
headers = "0.4.0"
http = "1.1.0"
iso8601-timestamp = "0.2.17"
kitsune-cache = { path = "../kitsune-cache" }
kitsune-config = { path = "../kitsune-config" }
kitsune-core = { path = "../kitsune-core" }
kitsune-db = { path = "../kitsune-db" }
kitsune-embed = { path = "../kitsune-embed" }
kitsune-error = { path = "../kitsune-error" }
kitsune-federation-filter = { path = "../kitsune-federation-filter" }
kitsune-http-client = { path = "../kitsune-http-client" }
kitsune-language = { path = "../kitsune-language" }
kitsune-search = { path = "../kitsune-search" }
kitsune-service = { path = "../kitsune-service" }
kitsune-type = { path = "../kitsune-type" }
kitsune-url = { path = "../kitsune-url" }
kitsune-util = { path = "../kitsune-util" }
kitsune-wasm-mrf = { path = "../kitsune-wasm-mrf" }
kitsune-cache = { workspace = true }
kitsune-config = { workspace = true }
kitsune-core = { workspace = true }
kitsune-db = { workspace = true }
kitsune-embed = { workspace = true }
kitsune-error = { workspace = true }
kitsune-federation-filter = { workspace = true }
kitsune-http-client = { workspace = true }
kitsune-language = { workspace = true }
kitsune-search = { workspace = true }
kitsune-service = { workspace = true }
kitsune-type = { workspace = true }
kitsune-url = { workspace = true }
kitsune-util = { workspace = true }
kitsune-wasm-mrf = { workspace = true }
mime = "0.3.17"
mime_guess = { version = "2.0.4", default-features = false }
serde = "1.0.202"
sha2 = "0.10.8"
simd-json = { workspace = true }
speedy-uuid = { path = "../../lib/speedy-uuid" }
speedy-uuid = { workspace = true }
tracing = "0.1.40"
triomphe = { workspace = true }
typed-builder = "0.18.2"
Expand All @@ -46,9 +46,9 @@ sha2 = { version = "0.10.8", features = ["asm"] }
[dev-dependencies]
http-body-util = "0.1.1"
hyper = "1.3.1"
kitsune-config = { path = "../kitsune-config" }
kitsune-test = { path = "../kitsune-test" }
kitsune-webfinger = { path = "../kitsune-webfinger" }
kitsune-config = { workspace = true }
kitsune-test = { workspace = true }
kitsune-webfinger = { workspace = true }
pretty_assertions = "1.4.0"
tokio = { version = "1.37.0", features = ["macros"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }
Expand Down
Loading

0 comments on commit 049cd3e

Please sign in to comment.