chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: use workspace deps (#880)

This commit is contained in:
Nathan.fooo 2024-10-14 16:02:22 +08:00 committed by GitHub
parent 72d4a29d5b
commit 1616ceaf4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -91,7 +91,7 @@ sqlx = { workspace = true, default-features = false, features = [
async-trait.workspace = true async-trait.workspace = true
prometheus-client.workspace = true prometheus-client.workspace = true
itertools = "0.11" itertools = "0.11"
uuid = "1.6.1" uuid.workspace = true
tokio-tungstenite = { version = "0.20.1", features = ["native-tls"] } tokio-tungstenite = { version = "0.20.1", features = ["native-tls"] }
dotenvy.workspace = true dotenvy.workspace = true
url = "2.5.0" url = "2.5.0"

6
admin_frontend/Cargo.toml
View File

@ -13,14 +13,14 @@ database-entity = { path = "../libs/database-entity" }
shared-entity = { path = "../libs/shared-entity" } shared-entity = { path = "../libs/shared-entity" }
anyhow = "1.0.79" 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"] } tokio = { version = "1.36", features = ["rt-multi-thread", "macros"] }
askama = "0.12" askama = "0.12"
axum-extra = { version = "0.9", features = ["cookie"] } axum-extra = { version = "0.9", features = ["cookie"] }
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
redis = { version = "0.25.2", features = [ "aio", "tokio-comp", "connection-manager"] } redis = { version = "0.25.2", features = ["aio", "tokio-comp", "connection-manager"] }
uuid = { version = "1.6", features = ["v4"] } uuid = { workspace = true, features = ["v4"] }
dotenvy = "0.15" dotenvy = "0.15"
reqwest = "0.11.27" reqwest = "0.11.27"
tower-service = "0.3" tower-service = "0.3"

1
docker-compose-ci.yml
View File

@ -177,7 +177,6 @@ services:
- APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET} - APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET}
- APPFLOWY_S3_REGION=${APPFLOWY_S3_REGION} - APPFLOWY_S3_REGION=${APPFLOWY_S3_REGION}
- APPFLOWY_MAILER_SMTP_HOST=${APPFLOWY_MAILER_SMTP_HOST} - 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_USERNAME=${APPFLOWY_MAILER_SMTP_USERNAME}
- APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD} - APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD}

1
docker-compose.yml
View File

@ -170,7 +170,6 @@ services:
- APPFLOWY_S3_SECRET_KEY=${APPFLOWY_S3_SECRET_KEY} - APPFLOWY_S3_SECRET_KEY=${APPFLOWY_S3_SECRET_KEY}
- APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET} - APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET}
- APPFLOWY_S3_REGION=${APPFLOWY_S3_REGION} - 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_PORT=${APPFLOWY_MAILER_SMTP_PORT}
- APPFLOWY_MAILER_SMTP_USERNAME=${APPFLOWY_MAILER_SMTP_USERNAME} - APPFLOWY_MAILER_SMTP_USERNAME=${APPFLOWY_MAILER_SMTP_USERNAME}
- APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD} - APPFLOWY_MAILER_SMTP_PASSWORD=${APPFLOWY_MAILER_SMTP_PASSWORD}

8
libs/access-control/Cargo.toml
View File

@ -9,9 +9,9 @@ app-error.workspace = true
anyhow.workspace = true anyhow.workspace = true
async-trait.workspace = true async-trait.workspace = true
casbin = { version = "2.2.0", features = [ casbin = { version = "2.2.0", features = [
"cached", "cached",
"runtime-tokio", "runtime-tokio",
"incremental", "incremental",
], optional = true } ], optional = true }
database.workspace = true database.workspace = true
database-entity.workspace = true database-entity.workspace = true
@ -23,7 +23,7 @@ sqlx = { workspace = true, default-features = false, features = ["postgres"] }
tracing.workspace = true tracing.workspace = true
tokio = { workspace = true, features = ["macros", "time"] } tokio = { workspace = true, features = ["macros", "time"] }
tokio-stream.workspace = true tokio-stream.workspace = true
uuid = { version = "1.8.0", features = ["v4"] } uuid = { workspace = true, features = ["v4"] }
serde = { version = "1.0.200", features = ["derive"] } serde = { version = "1.0.200", features = ["derive"] }
[features] [features]

2
libs/app-error/Cargo.toml
View File

@ -12,7 +12,7 @@ thiserror = "1.0.56"
serde_repr = "0.1.18" serde_repr = "0.1.18"
serde.workspace = true serde.workspace = true
anyhow = "1.0.79" anyhow = "1.0.79"
uuid = { version = "1.6.1", features = ["v4"] } uuid = { workspace = true, features = ["v4"] }
sqlx = { workspace = true, default-features = false, features = [ sqlx = { workspace = true, default-features = false, features = [
"postgres", "postgres",
"json", "json",

2
libs/appflowy-ai-client/Cargo.toml
View File

@ -21,7 +21,7 @@ pin-project = "1.1.5"
appflowy-ai-client = { path = ".", features = ["dto", "client-api"] } appflowy-ai-client = { path = ".", features = ["dto", "client-api"] }
tokio = { version = "1.37.0", features = ["macros", "test-util"] } tokio = { version = "1.37.0", features = ["macros", "test-util"] }
tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter", "ansi", "json"] } tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter", "ansi", "json"] }
uuid = { version = "1.6", features = ["v4"] } uuid = { workspace = true, features = ["v4"] }
[features] [features]
default = ["client-api"] default = ["client-api"]

4
libs/client-api-test/Cargo.toml
View File

@ -28,7 +28,7 @@ collab-entity.workspace = true
shared-entity.workspace = true shared-entity.workspace = true
collab-database.workspace = true collab-database.workspace = true
tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter", "ansi", "json"] } tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter", "ansi", "json"] }
uuid = "1.6.1" uuid.workspace = true
lazy_static = "1.4.0" lazy_static = "1.4.0"
dotenvy = "0.15.7" dotenvy = "0.15.7"
reqwest.workspace = true reqwest.workspace = true
@ -38,7 +38,7 @@ futures = "0.3.30"
anyhow = "1.0.80" anyhow = "1.0.80"
serde = { version = "1.0.199", features = ["derive"] } serde = { version = "1.0.199", features = ["derive"] }
hex = "0.4.3" hex = "0.4.3"
async-trait = "0.1.83" async-trait.workspace = true
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
web-sys = { version = "0.3", features = ["console"] } web-sys = { version = "0.3", features = ["console"] }

4
libs/client-api/Cargo.toml
View File

@ -15,12 +15,12 @@ gotrue = { path = "../gotrue" }
tracing = { version = "0.1" } tracing = { version = "0.1" }
thiserror = "1.0.56" thiserror = "1.0.56"
bytes = "1.5" bytes = "1.5"
uuid = "1.6.1" uuid.workspace = true
futures-util = "0.3.30" futures-util = "0.3.30"
futures-core = "0.3.30" futures-core = "0.3.30"
parking_lot = "0.12.1" parking_lot = "0.12.1"
brotli = { version = "3.4.0", optional = true } brotli = { version = "3.4.0", optional = true }
async-trait = { version = "0.1.77" } async-trait.workspace = true
prost = "0.12.3" prost = "0.12.3"
bincode = "1.3.3" bincode = "1.3.3"
url = "2.5.0" url = "2.5.0"

2
libs/collab-rt-protocol/Cargo.toml
View File

@ -15,7 +15,7 @@ collab = { workspace = true }
bincode.workspace = true bincode.workspace = true
anyhow.workspace = true anyhow.workspace = true
tracing.workspace = true tracing.workspace = true
async-trait = "0.1.77" async-trait.workspace = true
tokio = "1.36.0" tokio = "1.36.0"
collab-entity.workspace = true collab-entity.workspace = true

2
libs/database-entity/Cargo.toml
View File

@ -13,7 +13,7 @@ serde_json.workspace = true
collab-entity = { workspace = true } collab-entity = { workspace = true }
validator = { version = "0.16", features = ["validator_derive", "derive"] } validator = { version = "0.16", features = ["validator_derive", "derive"] }
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
uuid = { version = "1.6.1", features = ["serde", "v4"] } uuid = { workspace = true, features = ["serde", "v4"] }
thiserror = "1.0.56" thiserror = "1.0.56"
anyhow = "1.0.79" anyhow = "1.0.79"
tracing = "0.1" tracing = "0.1"

4
libs/database/Cargo.toml
View File

@ -14,7 +14,7 @@ database-entity.workspace = true
app-error = { workspace = true, features = ["sqlx_error", "validation_error"] } app-error = { workspace = true, features = ["sqlx_error", "validation_error"] }
tokio = { workspace = true, features = ["sync"] } tokio = { workspace = true, features = ["sync"] }
async-trait = "0.1.77" async-trait.workspace = true
anyhow = "1.0.79" anyhow = "1.0.79"
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
@ -30,7 +30,7 @@ sqlx = { workspace = true, default-features = false, features = [
] } ] }
pgvector = { workspace = true, features = ["sqlx"] } pgvector = { workspace = true, features = ["sqlx"] }
tracing = { version = "0.1.40" } 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"] } chrono = { version = "0.4", features = ["serde"] }
redis.workspace = true redis.workspace = true
futures-util = "0.3.30" futures-util = "0.3.30"

2
libs/workspace-template/Cargo.toml
View File

@ -14,7 +14,7 @@ collab-folder = { workspace = true }
collab-document = { workspace = true } collab-document = { workspace = true }
collab-database = { workspace = true } collab-database = { workspace = true }
collab-entity = { workspace = true } collab-entity = { workspace = true }
async-trait = "0.1.77" async-trait.workspace = true
anyhow.workspace = true anyhow.workspace = true
tokio = { workspace = true, features = ["sync"] } tokio = { workspace = true, features = ["sync"] }
uuid.workspace = true uuid.workspace = true

36
services/appflowy-collaborate/Cargo.toml
View File

@ -16,17 +16,17 @@ access-control.workspace = true
actix.workspace = true actix.workspace = true
actix-web.workspace = true actix-web.workspace = true
actix-http = { workspace = true, default-features = false, features = [ actix-http = { workspace = true, default-features = false, features = [
"openssl", "openssl",
"compress-brotli", "compress-brotli",
"compress-gzip", "compress-gzip",
] } ] }
actix-web-actors = { version = "4.3" } actix-web-actors = { version = "4.3" }
app-error = { workspace = true, features = [ app-error = { workspace = true, features = [
"sqlx_error", "sqlx_error",
"actix_web_error", "actix_web_error",
"tokio_error", "tokio_error",
"bincode_error", "bincode_error",
"appflowy_ai_error", "appflowy_ai_error",
] } ] }
authentication.workspace = true authentication.workspace = true
brotli.workspace = true brotli.workspace = true
@ -40,22 +40,22 @@ futures-util = "0.3.30"
tokio-util = { version = "0.7", features = ["codec"] } tokio-util = { version = "0.7", features = ["codec"] }
tokio-stream = { version = "0.1.14", features = ["sync"] } tokio-stream = { version = "0.1.14", features = ["sync"] }
tokio = { workspace = true, features = [ tokio = { workspace = true, features = [
"net", "net",
"sync", "sync",
"macros", "macros",
"rt-multi-thread", "rt-multi-thread",
] } ] }
async-trait = "0.1.77" async-trait.workspace = true
prost.workspace = true prost.workspace = true
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
serde_repr.workspace = true serde_repr.workspace = true
sqlx = { workspace = true, default-features = false, features = [ sqlx = { workspace = true, default-features = false, features = [
"runtime-tokio-rustls", "runtime-tokio-rustls",
"macros", "macros",
"postgres", "postgres",
"uuid", "uuid",
"chrono", "chrono",
] } ] }
thiserror = "1.0.56" thiserror = "1.0.56"
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] } tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }

2
services/appflowy-history/Cargo.toml
View File

@ -31,7 +31,7 @@ tower = "0.4"
serde_repr = "0.1.18" serde_repr = "0.1.18"
collab-stream.workspace = true collab-stream.workspace = true
chrono = "0.4.37" 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"] } sqlx = { workspace = true, default-features = false, features = ["runtime-tokio-rustls", "macros", "postgres", "uuid", "chrono", "migrate"] }
dashmap = "5.5.3" dashmap = "5.5.3"
infra.workspace = true infra.workspace = true