Skip to content

Commit

Permalink
Move kitsune-retry-policies into lib/ directory (#478)
Browse files Browse the repository at this point in the history
  • Loading branch information
aumetra authored Jan 27, 2024
1 parent 0541ddf commit f2d8040
Show file tree
Hide file tree
Showing 27 changed files with 124 additions and 108 deletions.
142 changes: 79 additions & 63 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ members = [
"crates/kitsune-messaging",
"crates/kitsune-observability",
"crates/kitsune-oidc",
"crates/kitsune-retry-policies",
"crates/kitsune-scss-compiler",
"crates/kitsune-search",
"crates/kitsune-service",
Expand All @@ -46,6 +45,7 @@ members = [
"lib/athena",
"lib/cursiv",
"lib/http-compat",
"lib/kitsune-retry-policies",
"lib/masto-id-convert",
"lib/post-process",
"lib/speedy-uuid",
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-activitypub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ diesel-async = "0.4.1"
futures-util = "0.3.30"
headers = "0.4.0"
http = "1.0.0"
iso8601-timestamp = "0.2.16"
iso8601-timestamp = "0.2.17"
kitsune-cache = { path = "../kitsune-cache" }
kitsune-core = { path = "../kitsune-core" }
kitsune-db = { path = "../kitsune-db" }
Expand All @@ -31,7 +31,7 @@ mime = "0.3.17"
mime_guess = { version = "2.0.4", default-features = false }
rsa = "0.9.6"
scoped-futures = "0.1.3"
serde = "1.0.195"
serde = "1.0.196"
sha2 = "0.10.8"
simd-json = "0.13.8"
speedy-uuid = { path = "../../lib/speedy-uuid" }
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ version.workspace = true
[dependencies]
deadpool-redis = "0.14.0"
enum_dispatch = "0.3.12"
moka = { version = "0.12.3", features = ["sync"] }
moka = { version = "0.12.4", features = ["sync"] }
redis = "0.24.0"
serde = "1.0.195"
serde = "1.0.196"
simd-json = "0.13.8"
thiserror = "1.0.56"
tracing = "0.1.40"
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-captcha/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition.workspace = true
enum_dispatch = "0.3.12"
http = "1.0.0"
kitsune-http-client = { path = "../kitsune-http-client" }
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
serde_urlencoded = "0.7.1"
simd-json = "0.13.8"
strum = { version = "0.25.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true

[dependencies]
miette = "5.10.0"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
smol_str = { version = "0.2.1", features = ["serde"] }
tokio = { version = "1.35.1", features = ["fs"] }
toml = { version = "0.8.8", default-features = false, features = ["parse"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const_format = "0.2.32"
http = "1.0.0"
kitsune-db = { path = "../kitsune-db" }
kitsune-messaging = { path = "../kitsune-messaging" }
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] }
thiserror = "1.0.56"
typed-builder = "0.18.1"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ diesel_migrations = "2.1.0"
futures-util = { version = "0.3.30", default-features = false, features = [
"alloc",
] }
iso8601-timestamp = { version = "0.2.16", features = ["diesel-pg"] }
iso8601-timestamp = { version = "0.2.17", features = ["diesel-pg"] }
kitsune-blocking = { path = "../kitsune-blocking" }
kitsune-config = { path = "../kitsune-config" }
kitsune-language = { path = "../kitsune-language" }
Expand All @@ -28,7 +28,7 @@ num-derive = "0.4.1"
num-traits = "0.2.17"
rustls = "0.22.2"
rustls-native-certs = "0.7.0"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
simd-json = "0.13.8"
speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] }
thiserror = "1.0.56"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-embed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ version.workspace = true
[dependencies]
diesel = "2.1.4"
diesel-async = "0.4.1"
embed-sdk = { git = "https://github.com/Lantern-chat/embed-service.git", rev = "b00278f1d2c41bc4394d394426dff0ecf8e42c90" }
embed-sdk = { git = "https://github.com/Lantern-chat/embed-service.git", rev = "0d43394bb2514f57edc402a83f69b171705c3650" }
http = "1.0.0"
iso8601-timestamp = "0.2.16"
iso8601-timestamp = "0.2.17"
kitsune-db = { path = "../kitsune-db" }
kitsune-http-client = { path = "../kitsune-http-client" }
once_cell = "1.19.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-http-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ hyper-util = { version = "0.1.2", features = [
hyper-rustls = { version = "0.26.0", features = ["http2"] }
kitsune-http-signatures = { path = "../kitsune-http-signatures" }
kitsune-type = { path = "../kitsune-type" }
pin-project = "1.1.3"
serde = "1.0.195"
pin-project = "1.1.4"
serde = "1.0.196"
simd-json = "0.13.8"
tower = { version = "0.4.13", features = ["util"] }
tower-http = { version = "0.5.1", features = [
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-http-signatures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition.workspace = true

[dependencies]
base64-simd = "0.8.0"
derive_builder = "0.12.0"
derive_builder = "0.13.0"
http = "1.0.0"
kitsune-blocking = { path = "../kitsune-blocking" }
itertools = { version = "0.12.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-jobs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ kitsune-db = { path = "../kitsune-db" }
kitsune-email = { path = "../kitsune-email" }
miette = "5.10.0"
scoped-futures = "0.1.3"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
speedy-uuid = { path = "../../lib/speedy-uuid" }
tracing = "0.1.40"
typed-builder = "0.18.1"
Expand Down
6 changes: 3 additions & 3 deletions crates/kitsune-mastodon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ edition.workspace = true
version.workspace = true

[dependencies]
derive_builder = "0.12.0"
derive_builder = "0.13.0"
diesel = "2.1.4"
diesel-async = "0.4.1"
futures-util = "0.3.30"
iso8601-timestamp = "0.2.16"
iso8601-timestamp = "0.2.17"
kitsune-cache = { path = "../kitsune-cache" }
kitsune-core = { path = "../kitsune-core" }
kitsune-db = { path = "../kitsune-db" }
Expand All @@ -20,7 +20,7 @@ kitsune-url = { path = "../kitsune-url" }
kitsune-util = { path = "../kitsune-util" }
mime = "0.3.17"
scoped-futures = "0.1.3"
serde = "1.0.195"
serde = "1.0.196"
simd-json = "0.13.8"
smol_str = "0.2.1"
speedy-uuid = { path = "../../lib/speedy-uuid" }
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-messaging/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ edition.workspace = true
ahash = "0.8.7"
derive_more = { version = "1.0.0-beta.6", features = ["from"] }
futures-util = "0.3.30"
kitsune-retry-policies = { path = "../kitsune-retry-policies" }
kitsune-retry-policies = { path = "../../lib/kitsune-retry-policies" }
pin-project-lite = "0.2.13"
redis = { version = "0.24.0", features = [
"aio",
"connection-manager",
"tokio-rustls-comp",
] }
serde = "1.0.195"
serde = "1.0.196"
simd-json = "0.13.8"
tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
tokio-stream = { version = "0.1.14", features = ["sync"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-oidc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ http-compat = { path = "../../lib/http-compat" }
kitsune-config = { path = "../kitsune-config" }
kitsune-http-client = { path = "../kitsune-http-client" }
miette = "5.10.0"
moka = { version = "0.12.3", features = ["sync"] }
moka = { version = "0.12.4", features = ["sync"] }
once_cell = "1.19.0"
openidconnect = { version = "3.4.0", default-features = false, features = [
# Accept these two, per specification invalid, cases to increase compatibility
"accept-rfc3339-timestamps",
"accept-string-booleans",
] }
redis = "0.24.0"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
simd-json = "0.13.8"
speedy-uuid = { path = "../../lib/speedy-uuid", features = ["serde"] }
thiserror = "1.0.56"
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-search/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ futures-util = "0.3.30"
kitsune-db = { path = "../kitsune-db" }
kitsune-language = { path = "../kitsune-language" }
miette = "5.10.0"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
speedy-uuid = { path = "../../lib/speedy-uuid" }
strum = { version = "0.25.0", features = ["derive"] }
thiserror = "1.0.56"
Expand Down
8 changes: 4 additions & 4 deletions crates/kitsune-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ version.workspace = true

[dependencies]
ahash = "0.8.7"
argon2 = "0.5.2"
argon2 = "0.5.3"
async-stream = "0.3.5"
athena = { path = "../../lib/athena" }
bytes = "1.5.0"
deadpool-redis = "0.14.0"
derive_builder = "0.12.0"
derive_builder = "0.13.0"
diesel = "2.1.4"
diesel-async = "0.4.1"
futures-util = "0.3.30"
Expand All @@ -24,7 +24,7 @@ garde = { version = "0.17.0", default-features = false, features = [
] }
http = "1.0.0"
img-parts = "0.3.0"
iso8601-timestamp = "0.2.16"
iso8601-timestamp = "0.2.17"
kitsune-blocking = { path = "../kitsune-blocking" }
kitsune-cache = { path = "../kitsune-cache" }
kitsune-captcha = { path = "../kitsune-captcha" }
Expand All @@ -51,7 +51,7 @@ rand = "0.8.5"
rsa = "0.9.6"
rusty-s3 = { version = "0.5.0", default-features = false }
scoped-futures = "0.1.3"
serde = "1.0.195"
serde = "1.0.196"
simd-json = "0.13.8"
smol_str = "0.2.1"
speedy-uuid = { path = "../../lib/speedy-uuid" }
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-type/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ authors.workspace = true
edition.workspace = true

[dependencies]
iso8601-timestamp = "0.2.16"
serde = { version = "1.0.195", features = ["derive"] }
iso8601-timestamp = "0.2.17"
serde = { version = "1.0.196", features = ["derive"] }
simd-json = "0.13.8"
smol_str = { version = "0.2.1", features = ["serde"] }
speedy-uuid = { path = "../../lib/speedy-uuid", features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true

[dependencies]
bubble-bath = "0.1.1"
iso8601-timestamp = "0.2.16"
iso8601-timestamp = "0.2.17"
kitsune-type = { path = "../kitsune-type" }
once_cell = "1.19.0"
pulldown-cmark = { version = "0.9.3", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion kitsune-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ envy = "0.4.2"
kitsune-config = { path = "../crates/kitsune-config" }
kitsune-db = { path = "../crates/kitsune-db" }
miette = { version = "5.10.0", features = ["fancy"] }
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
speedy-uuid = { path = "../lib/speedy-uuid" }
tokio = { version = "1.35.1", features = ["full"] }
tracing-subscriber = "0.3.18"
Expand Down
2 changes: 1 addition & 1 deletion kitsune-job-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ kitsune-federation = { path = "../crates/kitsune-federation" }
kitsune-federation-filter = { path = "../crates/kitsune-federation-filter" }
kitsune-jobs = { path = "../crates/kitsune-jobs" }
kitsune-observability = { path = "../crates/kitsune-observability" }
kitsune-retry-policies = { path = "../crates/kitsune-retry-policies" }
kitsune-retry-policies = { path = "../lib/kitsune-retry-policies" }
kitsune-service = { path = "../crates/kitsune-service" }
kitsune-url = { path = "../crates/kitsune-url" }
miette = { version = "5.10.0", features = ["fancy"] }
Expand Down
12 changes: 6 additions & 6 deletions kitsune/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ eula = false

[dependencies]
athena = { path = "../lib/athena" }
argon2 = { version = "0.5.2", features = ["std"] }
argon2 = { version = "0.5.3", features = ["std"] }
askama = { version = "0.12.1", features = [
"with-axum",
], default-features = false }
Expand All @@ -30,7 +30,7 @@ axum-extra = { version = "0.9.2", features = [
] }
axum-flash = "0.8.0"
bytes = "1.5.0"
chrono = { version = "0.4.31", default-features = false }
chrono = { version = "0.4.33", default-features = false }
clap = { version = "4.4.18", features = ["derive", "wrap_help"] }
const-oid = { version = "0.9.6", features = ["db"] }
cursiv = { path = "../lib/cursiv", features = ["axum"] }
Expand All @@ -41,7 +41,7 @@ futures-util = "0.3.30"
headers = "0.4.0"
http = "1.0.0"
http-body-util = "0.1.0"
iso8601-timestamp = "0.2.16"
iso8601-timestamp = "0.2.17"
itertools = { version = "0.12.0", default-features = false }
kitsune-activitypub = { path = "../crates/kitsune-activitypub" }
kitsune-blocking = { path = "../crates/kitsune-blocking" }
Expand Down Expand Up @@ -78,7 +78,7 @@ oxide-auth-async = "0.1.1"
oxide-auth-axum = "0.4.0"
rust-embed = { version = "8.2.0", features = ["include-exclude"] }
scoped-futures = "0.1.3"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
serde_urlencoded = "0.7.1"
simd-json = "0.13.8"
speedy-uuid = { path = "../lib/speedy-uuid" }
Expand Down Expand Up @@ -107,15 +107,15 @@ utoipa-swagger-ui = { version = "6.0.0", features = ["axum"] }
# --- Optional dependencies ---

# "graphql" feature
async-graphql = { version = "7.0.0", default-features = false, features = [
async-graphql = { version = "7.0.1", default-features = false, features = [
"playground",
"tempfile",
"time",
"tracing",
"unblock",
"uuid",
], optional = true }
async-graphql-axum = { version = "7.0.0", optional = true }
async-graphql-axum = { version = "7.0.1", optional = true }

# "mastodon-api" feature
kitsune-mastodon = { path = "../crates/kitsune-mastodon", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions lib/athena/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ahash = "0.8.7"
deadpool-redis = "0.14.0"
either = { version = "1.9.0", default-features = false }
futures-util = { version = "0.3.30", default-features = false }
iso8601-timestamp = { version = "0.2.16", features = ["diesel-pg"] }
kitsune-retry-policies = { path = "../../crates/kitsune-retry-policies" }
iso8601-timestamp = { version = "0.2.17", features = ["diesel-pg"] }
kitsune-retry-policies = { path = "../kitsune-retry-policies" }
once_cell = "1.19.0"
rand = "0.8.5"
redis = { version = "0.24.0", default-features = false, features = [
Expand All @@ -22,7 +22,7 @@ redis = { version = "0.24.0", default-features = false, features = [
"tokio-rustls-comp",
] }
retry-policies = "0.2.1"
serde = { version = "1.0.195", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
simd-json = "0.13.8"
smol_str = "0.2.1"
speedy-uuid = { path = "../speedy-uuid", features = ["redis", "serde"] }
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/speedy-uuid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ edition.workspace = true
version.workspace = true

[dependencies]
async-graphql = { version = "7.0.0", default-features = false, optional = true }
async-graphql = { version = "7.0.1", default-features = false, optional = true }
diesel = { version = "2.1.4", features = [
"postgres_backend",
"uuid",
], optional = true }
redis = { version = "0.24.0", default-features = false, optional = true }
serde = { version = "1.0.195", optional = true }
serde = { version = "1.0.196", optional = true }
thiserror = "1.0.56"
uuid = { version = "1.7.0", features = ["fast-rng", "v7"] }
uuid-simd = { version = "0.8.0", features = ["uuid"] }
Expand Down
2 changes: 1 addition & 1 deletion lib/tower-stop-using-brave/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version.workspace = true
either = "1.9.0"
http = "1.0.0"
once_cell = "1.19.0"
regex = "1.10.2"
regex = "1.10.3"
tower-layer = "0.3.2"
tower-service = "0.3.2"

Expand Down

0 comments on commit f2d8040

Please sign in to comment.