diff --git a/Cargo.toml b/Cargo.toml index 89bcfcc5..7d254e4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ sqlx = { workspace = true, default-features = false, features = [ async-trait.workspace = true prometheus-client.workspace = true itertools = "0.11" -uuid = "1.6.1" +uuid.workspace = true tokio-tungstenite = { version = "0.20.1", features = ["native-tls"] } dotenvy.workspace = true url = "2.5.0" diff --git a/admin_frontend/Cargo.toml b/admin_frontend/Cargo.toml index 721a3e71..38d55c1c 100644 --- a/admin_frontend/Cargo.toml +++ b/admin_frontend/Cargo.toml @@ -13,14 +13,14 @@ database-entity = { path = "../libs/database-entity" } shared-entity = { path = "../libs/shared-entity" } anyhow = "1.0.79" -axum = {version = "0.7", features = ["json"]} +axum = { version = "0.7", features = ["json"] } tokio = { version = "1.36", features = ["rt-multi-thread", "macros"] } askama = "0.12" axum-extra = { version = "0.9", features = ["cookie"] } serde.workspace = true serde_json.workspace = true -redis = { version = "0.25.2", features = [ "aio", "tokio-comp", "connection-manager"] } -uuid = { version = "1.6", features = ["v4"] } +redis = { version = "0.25.2", features = ["aio", "tokio-comp", "connection-manager"] } +uuid = { workspace = true, features = ["v4"] } dotenvy = "0.15" reqwest = "0.11.27" tower-service = "0.3" diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 893b56d0..164ff2f3 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -177,7 +177,6 @@ services: - APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET} - APPFLOWY_S3_REGION=${APPFLOWY_S3_REGION} - APPFLOWY_MAILER_SMTP_HOST=${APPFLOWY_MAILER_SMTP_HOST} - - APPFLOWY_MAILER_SMTP_PORT=${APPFLOWY_MAILER_SMTP_PORT} - APPFLOWY_MAILER_SMTP_USERNAME=${APPFLOWY_MAILER_SMTP_USERNAME} - APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD} diff --git a/docker-compose.yml b/docker-compose.yml index ad96e09b..45306cd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -170,7 +170,6 @@ services: - APPFLOWY_S3_SECRET_KEY=${APPFLOWY_S3_SECRET_KEY} - APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET} - APPFLOWY_S3_REGION=${APPFLOWY_S3_REGION} - - APPFLOWY_MAILER_SMTP_HOST=${APPFLOWY_MAILER_SMTP_HOST} - APPFLOWY_MAILER_SMTP_PORT=${APPFLOWY_MAILER_SMTP_PORT} - APPFLOWY_MAILER_SMTP_USERNAME=${APPFLOWY_MAILER_SMTP_USERNAME} - APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD} diff --git a/libs/access-control/Cargo.toml b/libs/access-control/Cargo.toml index 39ff461c..c008ce21 100644 --- a/libs/access-control/Cargo.toml +++ b/libs/access-control/Cargo.toml @@ -9,9 +9,9 @@ app-error.workspace = true anyhow.workspace = true async-trait.workspace = true casbin = { version = "2.2.0", features = [ - "cached", - "runtime-tokio", - "incremental", + "cached", + "runtime-tokio", + "incremental", ], optional = true } database.workspace = true database-entity.workspace = true @@ -23,7 +23,7 @@ sqlx = { workspace = true, default-features = false, features = ["postgres"] } tracing.workspace = true tokio = { workspace = true, features = ["macros", "time"] } tokio-stream.workspace = true -uuid = { version = "1.8.0", features = ["v4"] } +uuid = { workspace = true, features = ["v4"] } serde = { version = "1.0.200", features = ["derive"] } [features] diff --git a/libs/app-error/Cargo.toml b/libs/app-error/Cargo.toml index 902813e6..b40b2af3 100644 --- a/libs/app-error/Cargo.toml +++ b/libs/app-error/Cargo.toml @@ -12,7 +12,7 @@ thiserror = "1.0.56" serde_repr = "0.1.18" serde.workspace = true anyhow = "1.0.79" -uuid = { version = "1.6.1", features = ["v4"] } +uuid = { workspace = true, features = ["v4"] } sqlx = { workspace = true, default-features = false, features = [ "postgres", "json", diff --git a/libs/appflowy-ai-client/Cargo.toml b/libs/appflowy-ai-client/Cargo.toml index 80741bea..2eb38dc6 100644 --- a/libs/appflowy-ai-client/Cargo.toml +++ b/libs/appflowy-ai-client/Cargo.toml @@ -21,7 +21,7 @@ pin-project = "1.1.5" appflowy-ai-client = { path = ".", features = ["dto", "client-api"] } tokio = { version = "1.37.0", features = ["macros", "test-util"] } tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter", "ansi", "json"] } -uuid = { version = "1.6", features = ["v4"] } +uuid = { workspace = true, features = ["v4"] } [features] default = ["client-api"] diff --git a/libs/client-api-test/Cargo.toml b/libs/client-api-test/Cargo.toml index dcf68cfc..22e5a1ea 100644 --- a/libs/client-api-test/Cargo.toml +++ b/libs/client-api-test/Cargo.toml @@ -28,7 +28,7 @@ collab-entity.workspace = true shared-entity.workspace = true collab-database.workspace = true tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter", "ansi", "json"] } -uuid = "1.6.1" +uuid.workspace = true lazy_static = "1.4.0" dotenvy = "0.15.7" reqwest.workspace = true @@ -38,7 +38,7 @@ futures = "0.3.30" anyhow = "1.0.80" serde = { version = "1.0.199", features = ["derive"] } hex = "0.4.3" -async-trait = "0.1.83" +async-trait.workspace = true [target.'cfg(target_arch = "wasm32")'.dependencies] web-sys = { version = "0.3", features = ["console"] } diff --git a/libs/client-api/Cargo.toml b/libs/client-api/Cargo.toml index 8141fe9e..f66f3cf1 100644 --- a/libs/client-api/Cargo.toml +++ b/libs/client-api/Cargo.toml @@ -15,12 +15,12 @@ gotrue = { path = "../gotrue" } tracing = { version = "0.1" } thiserror = "1.0.56" bytes = "1.5" -uuid = "1.6.1" +uuid.workspace = true futures-util = "0.3.30" futures-core = "0.3.30" parking_lot = "0.12.1" brotli = { version = "3.4.0", optional = true } -async-trait = { version = "0.1.77" } +async-trait.workspace = true prost = "0.12.3" bincode = "1.3.3" url = "2.5.0" diff --git a/libs/collab-rt-protocol/Cargo.toml b/libs/collab-rt-protocol/Cargo.toml index 6feaa0ef..446277b2 100644 --- a/libs/collab-rt-protocol/Cargo.toml +++ b/libs/collab-rt-protocol/Cargo.toml @@ -15,7 +15,7 @@ collab = { workspace = true } bincode.workspace = true anyhow.workspace = true tracing.workspace = true -async-trait = "0.1.77" +async-trait.workspace = true tokio = "1.36.0" collab-entity.workspace = true diff --git a/libs/database-entity/Cargo.toml b/libs/database-entity/Cargo.toml index 95bd7524..17d6457f 100644 --- a/libs/database-entity/Cargo.toml +++ b/libs/database-entity/Cargo.toml @@ -13,7 +13,7 @@ serde_json.workspace = true collab-entity = { workspace = true } validator = { version = "0.16", features = ["validator_derive", "derive"] } chrono = { version = "0.4", features = ["serde"] } -uuid = { version = "1.6.1", features = ["serde", "v4"] } +uuid = { workspace = true, features = ["serde", "v4"] } thiserror = "1.0.56" anyhow = "1.0.79" tracing = "0.1" diff --git a/libs/database/Cargo.toml b/libs/database/Cargo.toml index c49a96bf..2367bf2a 100644 --- a/libs/database/Cargo.toml +++ b/libs/database/Cargo.toml @@ -14,7 +14,7 @@ database-entity.workspace = true app-error = { workspace = true, features = ["sqlx_error", "validation_error"] } tokio = { workspace = true, features = ["sync"] } -async-trait = "0.1.77" +async-trait.workspace = true anyhow = "1.0.79" serde.workspace = true serde_json.workspace = true @@ -30,7 +30,7 @@ sqlx = { workspace = true, default-features = false, features = [ ] } pgvector = { workspace = true, features = ["sqlx"] } tracing = { version = "0.1.40" } -uuid = { version = "1.6.1", features = ["serde", "v4"] } +uuid = { workspace = true, features = ["serde", "v4"] } chrono = { version = "0.4", features = ["serde"] } redis.workspace = true futures-util = "0.3.30" diff --git a/libs/workspace-template/Cargo.toml b/libs/workspace-template/Cargo.toml index cb00bde1..69c11895 100644 --- a/libs/workspace-template/Cargo.toml +++ b/libs/workspace-template/Cargo.toml @@ -14,7 +14,7 @@ collab-folder = { workspace = true } collab-document = { workspace = true } collab-database = { workspace = true } collab-entity = { workspace = true } -async-trait = "0.1.77" +async-trait.workspace = true anyhow.workspace = true tokio = { workspace = true, features = ["sync"] } uuid.workspace = true diff --git a/services/appflowy-collaborate/Cargo.toml b/services/appflowy-collaborate/Cargo.toml index c36ff825..2e3151a8 100644 --- a/services/appflowy-collaborate/Cargo.toml +++ b/services/appflowy-collaborate/Cargo.toml @@ -16,17 +16,17 @@ access-control.workspace = true actix.workspace = true actix-web.workspace = true actix-http = { workspace = true, default-features = false, features = [ - "openssl", - "compress-brotli", - "compress-gzip", + "openssl", + "compress-brotli", + "compress-gzip", ] } actix-web-actors = { version = "4.3" } app-error = { workspace = true, features = [ - "sqlx_error", - "actix_web_error", - "tokio_error", - "bincode_error", - "appflowy_ai_error", + "sqlx_error", + "actix_web_error", + "tokio_error", + "bincode_error", + "appflowy_ai_error", ] } authentication.workspace = true brotli.workspace = true @@ -40,22 +40,22 @@ futures-util = "0.3.30" tokio-util = { version = "0.7", features = ["codec"] } tokio-stream = { version = "0.1.14", features = ["sync"] } tokio = { workspace = true, features = [ - "net", - "sync", - "macros", - "rt-multi-thread", + "net", + "sync", + "macros", + "rt-multi-thread", ] } -async-trait = "0.1.77" +async-trait.workspace = true prost.workspace = true serde.workspace = true serde_json.workspace = true serde_repr.workspace = true sqlx = { workspace = true, default-features = false, features = [ - "runtime-tokio-rustls", - "macros", - "postgres", - "uuid", - "chrono", + "runtime-tokio-rustls", + "macros", + "postgres", + "uuid", + "chrono", ] } thiserror = "1.0.56" tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] } diff --git a/services/appflowy-history/Cargo.toml b/services/appflowy-history/Cargo.toml index a50b6e67..5313d6d2 100644 --- a/services/appflowy-history/Cargo.toml +++ b/services/appflowy-history/Cargo.toml @@ -31,7 +31,7 @@ tower = "0.4" serde_repr = "0.1.18" collab-stream.workspace = true chrono = "0.4.37" -uuid = { version = "1.6.1", features = ["v4"] } +uuid = { workspace = true, features = ["v4"] } sqlx = { workspace = true, default-features = false, features = ["runtime-tokio-rustls", "macros", "postgres", "uuid", "chrono", "migrate"] } dashmap = "5.5.3" infra.workspace = true