Skip to content

Commit a8a9702

Browse files
chore(deps): using workspace dependencies
1 parent f950706 commit a8a9702

File tree

8 files changed

+37
-30
lines changed

8 files changed

+37
-30
lines changed

Cargo.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,17 @@ members = [
66
"front",
77
"shared"
88
]
9+
10+
[workspace.dependencies]
11+
# internal
12+
shared = { version = "0.1.0", path = "./shared" }
13+
api-lib = { version = "0.1.0", path = "./api/lib" }
14+
# actix and sqlx
15+
actix-web = "4.3.1"
16+
sqlx = { version = "0.6.3", default-features = false, features = [ "runtime-actix-native-tls", "macros", "postgres", "uuid", "chrono", "json" ] }
17+
# serde
18+
serde = { version = "1.0.164", features = ["derive"] }
19+
# utils
20+
tracing = "0.1"
21+
uuid = { version = "1.3.4", features = ["serde", "v4"] }
22+
chrono = { version = "0.4", features = ["serde"] }

api.http

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# @host = https://devbcn.shuttleapp.rs
2-
@host = http://localhost:8000
1+
@host = https://devbcn.shuttleapp.rs
2+
# @host = http://localhost:8000
33

44
### health
55
GET {{host}}/api/health HTTP/1.1

api/actix/Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@ publish = false
66

77
[dependencies]
88
# internal
9-
api-lib = { path = "../lib" }
10-
shared = { path = "../../shared", features = ["backend"] }
11-
9+
api-lib = { workspace = true }
1210
# db
13-
sqlx = "0.6.3"
14-
11+
sqlx = { workspace = true }
1512
# actix
16-
actix-web = "4.3.1"
13+
actix-web = { workspace = true }
1714
actix-cors = "0.6.4"
1815
# utils
1916
dotenv = "0.15"
2017
# tracing
21-
tracing = "0.1"
18+
tracing = { workspace = true }
2219
tracing-subscriber = { version= "0.3", features = ["env-filter", "json", "time"] }

api/lib/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ edition = "2021"
55
publish = false
66

77
[dependencies]
8-
shared = { path = "../../shared", features = ["backend"] }
8+
shared = { workspace = true, features = ["backend"] }
99

1010
# db
11-
sqlx = { version = "0.6.3", default-features = false, features = [ "runtime-actix-native-tls", "macros", "postgres", "uuid", "chrono", "json" ] }
11+
sqlx = { workspace = true }
1212
# actix
13-
actix-web = "4.3.1"
13+
actix-web = { workspace = true }
1414
# serde
15-
serde = { version = "1.0.164", features = ["derive"] }
15+
serde = { workspace = true }
1616
serde_json = "1.0"
1717
# utils
18-
chrono = { version = "0.4", features = ["serde"] }
19-
uuid = { version = "1.3.4", features = ["serde", "v4"] }
18+
uuid = { workspace = true }
19+
chrono = { workspace = true }
2020
async-trait = "0.1.68"
21-
tracing = "0.1"
21+
tracing = { workspace = true }
2222

2323
[dev-dependencies]
2424
actix-rt = "2"

api/shuttle/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ publish = false
88

99
[dependencies]
1010
# internal
11-
api-lib = { version = "0.1.0", path = "../lib" }
12-
shared = { version = "0.1.0", path = "../../shared" }
11+
api-lib = { workspace = true }
1312
# shuttle
1413
shuttle-runtime = "0.19.0"
1514
shuttle-actix-web = "0.19.0"
1615
# db
1716
# shuttle-aws-rds = { version = "0.18.0", features = ["postgres"] }
1817
shuttle-shared-db = { version = "0.19.0", features = ["postgres"] }
19-
sqlx = "0.6.3"
18+
sqlx = { workspace = true }
2019

2120
# static files
2221
shuttle-static-folder = "0.19.0"
2322
# actix
24-
actix-web = "4.3.1"
23+
actix-web = { workspace = true }
2524
tokio = "1.28.2"

front/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ edition = "2021"
77

88
[dependencies]
99
# shared
10-
# shared = { path = "../shared" }
10+
shared = { workspace = true }
1111
# dioxus
1212
dioxus = "0.3.2"
1313
dioxus-web = "0.3.2"
1414
reqwest = { version = "0.11.18", features = ["json"] }
15-
serde = { version = "1.0.164", features = ["derive"] }
15+
serde = { workspace = true }

shared/Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ backend = ["sqlx"]
88

99
[dependencies]
1010
# serde
11-
serde = { version = "1.0.164", features = ["derive"] }
12-
11+
serde = { workspace = true }
1312
# Sqlx, only when the backend add this as dependency is compiled
14-
sqlx = { version = "0.6.3", optional = true }
15-
13+
sqlx = { workspace = true, optional = true }
1614
# utils
17-
uuid = { version = "1.3.4", features = ["serde", "v4"] }
18-
chrono = { version = "0.4", features = ["serde"] }
15+
uuid = { workspace = true }
16+
chrono = { workspace = true }

0 commit comments

Comments
 (0)