Skip to content

Commit

Permalink
Use workspace dependencies for actix-web (#594)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnTitor
JohnTitor authored Dec 21, 2022
1 parent 096521d commit aee47e0
Show file tree
Hide file tree
Showing 64 changed files with 143 additions and 126 deletions.
1 change: 0 additions & 1 deletion Cargo.lock
View file

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

19 changes: 19 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,22 @@ members = [
"websockets/echo",
]
resolver = "2"

[workspace.dependencies]
actix = "0.13"
actix-broker = "0.4.2"
actix-codec = "0.5"
actix-cors = "0.6"
actix-files = "0.6"
actix-http = "3"
actix-identity = "0.5"
actix-multipart = "0.4"
actix-protobuf = "0.9"
actix-session = "0.7"
actix-test = "0.1"
actix-tls = "3.0"
actix-utils = "3"
actix-web = "4"
actix-web-actors = "4.1"
actix-web-lab = "0.18"
actix-ws = "0.2.5"
2 changes: 1 addition & 1 deletion auth/casbin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
casbin = "2"
loge = { version = "0.4", default-features = false, features = ["colored", "chrono"] }
tokio = { version = "1.13.1", features = ["sync"] }
6 changes: 3 additions & 3 deletions auth/cookie-auth/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-identity = "0.5"
actix-session = { version = "0.7", features = ["cookie-session"] }
actix-web = { workspace = true }
actix-identity = { workspace = true }
actix-session = { workspace = true, features = ["cookie-session"] }

env_logger = "0.10"
rand = "0.8"
4 changes: 2 additions & 2 deletions auth/cookie-session/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-session = { version = "0.7", features = ["cookie-session"] }
actix-web = { workspace = true }
actix-session = { workspace = true, features = ["cookie-session"] }
log = "0.4"
env_logger = "0.10"
6 changes: 3 additions & 3 deletions auth/redis-session/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-session = { version = "0.7", features = ["redis-actor-session"] }
actix-web = { workspace = true }
actix-session = { workspace = true, features = ["redis-actor-session"] }

env_logger = "0.10"
log = "0.4"
serde = { version = "1", features = ["derive"] }
serde_json = "1"

[dev-dependencies]
actix-test = "0.1"
actix-test = { workspace = true }
time = "0.3"
6 changes: 3 additions & 3 deletions auth/simple-auth-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-identity = "0.5"
actix-session = { version = "0.7", features = ["cookie-session"] }
actix-web = { workspace = true }
actix-identity = { workspace = true }
actix-session = { workspace = true, features = ["cookie-session"] }

chrono = { version = "0.4", features = ["serde"] }
derive_more = "0.99.5"
Expand Down
6 changes: 3 additions & 3 deletions basics/basics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-files = "0.6"
actix-session = { version = "0.7", features = ["cookie-session"] }
actix-web = "4"
actix-files = { workspace = true }
actix-session = { workspace = true, features = ["cookie-session"] }
actix-web = { workspace = true }

async-stream = "0.3"
env_logger = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion basics/error-handling/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }

derive_more = "0.99.5"
env_logger = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion basics/hello-world/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
env_logger = "0.10"
2 changes: 1 addition & 1 deletion basics/nested-routing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = { version = "4", features = ["openssl"] }
actix-web = { workspace = true, features = ["openssl"] }
env_logger = "0.10"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "1.0.39"
2 changes: 1 addition & 1 deletion basics/state/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
env_logger = "0.10"
4 changes: 2 additions & 2 deletions basics/static-files/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-files = "0.6"
actix-web = { workspace = true }
actix-files = { workspace = true }
env_logger = "0.10"
log = "0.4"
8 changes: 4 additions & 4 deletions basics/todo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-files = "0.6"
actix-session = { version = "0.7", features = ["cookie-session"] }
actix-web = "4"
actix-web-lab = "0.18"
actix-files = { workspace = true }
actix-session = { workspace = true, features = ["cookie-session"] }
actix-web = { workspace = true }
actix-web-lab = { workspace = true }

dotenv = "0.15"
env_logger = "0.10"
Expand Down
4 changes: 2 additions & 2 deletions cors/backend/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = { version = "4", features = ["rustls"] }
actix-cors = "0.6"
actix-web = { workspace = true, features = ["rustls"] }
actix-cors = { workspace = true }

env_logger = "0.10"
serde = { version = "1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion data-factory/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }

env_logger = "0.10"
log = "0.4"
2 changes: 1 addition & 1 deletion databases/diesel/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
diesel = { version = "2", features = ["sqlite", "r2d2"] }
dotenv = "0.15"
env_logger = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion databases/mongodb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
mongodb = "2"
serde = { version = "1", features = ["derive"] }
2 changes: 1 addition & 1 deletion databases/postgres/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
config = "0.13.1"
deadpool-postgres = { version = "0.10.2", features = ["serde"] }
derive_more = "0.99.17"
Expand Down
2 changes: 1 addition & 1 deletion databases/redis/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }

env_logger = "0.10"
futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
Expand Down
2 changes: 1 addition & 1 deletion databases/sqlite/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }

env_logger = "0.10"
futures-util = { version = "0.3", default-features = false, features = ["std"] }
Expand Down
2 changes: 1 addition & 1 deletion docker/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
env_logger = "0.10"
log = "0.4"
2 changes: 1 addition & 1 deletion forms/form/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
serde = { version = "1", features = ["derive"] }
6 changes: 3 additions & 3 deletions forms/multipart-s3/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-multipart = "0.4"
actix-web = "4"
actix-web-lab = "0.18"
actix-multipart = { workspace = true }
actix-web = { workspace = true }
actix-web-lab = { workspace = true }

aws-config = "0.51"
aws-sdk-s3 = "0.21"
Expand Down
4 changes: 2 additions & 2 deletions forms/multipart/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repository = "https://github.com/actix/examples"
readme = "README.md"

[dependencies]
actix-multipart = "0.4"
actix-web = "4"
actix-multipart = { workspace = true }
actix-web = { workspace = true }

futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
sanitize-filename = "0.4"
Expand Down
8 changes: 4 additions & 4 deletions graphql/async-graphql/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix = "0.13"
actix-web = "4"
actix-web-lab = "0.18"
actix-cors = "0.6"
actix = { workspace = true }
actix-web = { workspace = true }
actix-web-lab = { workspace = true }
actix-cors = { workspace = true }

async-graphql = "5"
async-graphql-actix-web = "5"
Expand Down
6 changes: 3 additions & 3 deletions graphql/juniper-advanced/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web-lab = "0.18"
actix-cors = "0.6"
actix-web = { workspace = true }
actix-web-lab = { workspace = true }
actix-cors = { workspace = true }

juniper = "0.15"

Expand Down
6 changes: 3 additions & 3 deletions graphql/juniper/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web-lab = "0.18"
actix-cors = "0.6"
actix-web = { workspace = true }
actix-web-lab = { workspace = true }
actix-cors = { workspace = true }

juniper = "0.15"

Expand Down
2 changes: 1 addition & 1 deletion guards/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
2 changes: 1 addition & 1 deletion http-proxy/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = { version = "4", features = ["openssl"] }
actix-web = { workspace = true, features = ["openssl"] }
awc = "3"

clap = { version = "4", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion https-tls/awc-https/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }
awc = { version = "3", features = ["rustls"] }

env_logger = "0.10"
Expand Down
4 changes: 2 additions & 2 deletions https-tls/openssl-auto-le/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = { version = "4", features = ["openssl"] }
actix-files = "0.6"
actix-web = { workspace = true, features = ["openssl"] }
actix-files = { workspace = true }

acme-micro = "0.12"
anyhow = "1"
Expand Down
2 changes: 1 addition & 1 deletion https-tls/openssl/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = { version = "4", features = ["openssl"] }
actix-web = { workspace = true, features = ["openssl"] }
env_logger = "0.10"
openssl = "0.10"
4 changes: 2 additions & 2 deletions https-tls/rustls-client-cert/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-tls = "3.0"
actix-web = { version = "4", features = ["rustls"] }
actix-tls = { workspace = true }
actix-web = { workspace = true, features = ["rustls"] }
env_logger = "0.10"
log = "0.4"
rustls = "0.20"
Expand Down
6 changes: 3 additions & 3 deletions https-tls/rustls/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ name = "rustls-server"
path = "src/main.rs"

[dependencies]
actix-web = { version = "4", features = ["rustls"] }
actix-web-lab = "0.18"
actix-files = "0.6"
actix-web = { workspace = true, features = ["rustls"] }
actix-web-lab = { workspace = true }
actix-files = { workspace = true }

env_logger = "0.10"
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion json/json-decode-error/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }

env_logger = "0.10"
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion json/json-error/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"

[dependencies]
actix-web = "4"
actix-web = { workspace = true }

env_logger = "0.10"
log = "0.4"
Expand Down
Loading

0 comments on commit aee47e0

Please sign in to comment.