Skip to content

Commit fb99bc7

Browse files
committed
move common dependencies to workspace dependencies
Move rocket and sqlx to workspace deps, as already the features that we specified in different crates started to diverge. Signed-off-by: stadust <[email protected]>
1 parent 8ddbf95 commit fb99bc7

File tree

12 files changed

+19
-15
lines changed

12 files changed

+19
-15
lines changed

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ description = "Libraries for creating pointercrate-like demonlist websites"
2626
homepage = "https://pointercrate.com"
2727
edition = "2021"
2828
repository = "https://github.com/stadust/pointercrate"
29+
30+
[workspace.dependencies]
31+
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
32+
rocket = { git = "https://github.com/rwf2/Rocket", branch = "master", features = ["json"] }

pointercrate-core-api/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ edition.workspace = true
88

99
[dependencies]
1010
serde = "1.0.226"
11-
rocket = { git = "https://github.com/rwf2/Rocket", branch = "master", features = ["json"] }
11+
rocket = { workspace = true }
1212
pointercrate-core = {path = "../pointercrate-core"}
1313
pointercrate-core-pages = {path = "../pointercrate-core-pages"}
1414
serde_json = "1.0.145"
15-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
15+
sqlx = { workspace = true }
1616
log = "0.4.28"
1717
serde_urlencoded = "0.7.0"
1818
maud = "0.27.0"

pointercrate-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition.workspace = true
99
[dependencies]
1010
serde = "1.0.226"
1111
derive_more = { version = "2.0.1", features = ["display"] }
12-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate"] }
12+
sqlx = { workspace = true }
1313
fluent = "0.17.0"
1414
tokio = "1.47.1"
1515
log = "0.4.28"

pointercrate-demonlist-api/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition.workspace = true
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
rocket = { git = "https://github.com/rwf2/Rocket", branch = "master" }
10+
rocket = { workspace = true }
1111
pointercrate-demonlist = {path = "../pointercrate-demonlist"}
1212
pointercrate-demonlist-pages = {path = "../pointercrate-demonlist-pages"}
1313
pointercrate-core = {path = "../pointercrate-core"}
@@ -17,7 +17,7 @@ pointercrate-core-macros = {path = "../pointercrate-core-macros"}
1717
pointercrate-user = {path = "../pointercrate-user"}
1818
pointercrate-user-api = {path = "../pointercrate-user-api"}
1919
pointercrate-integrate = {path = "../pointercrate-integrate"}
20-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
20+
sqlx = { workspace = true }
2121
serde_json = "1.0.145"
2222
log = "0.4.28"
2323
nonzero_ext = "0.3.0"

pointercrate-demonlist-pages/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ chrono = "0.4.42"
1919
url = "2.5.7"
2020
async-trait = "0.1.89"
2121
log = "0.4.28"
22-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
22+
sqlx = { workspace = true }
2323

2424
[features]
2525
geolocation = []

pointercrate-demonlist/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition.workspace = true
88

99
[dependencies]
1010
serde = "1.0.226"
11-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
11+
sqlx = { workspace = true }
1212
derive_more = { version = "2.0.1", features = ["display"] }
1313
pointercrate-core = {path = "../pointercrate-core"}
1414
pointercrate-user = {path = "../pointercrate-user"}

pointercrate-example/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pointercrate-demonlist-pages = { version = "0.1.0", path = "../pointercrate-demo
1919
pointercrate-user = { version = "0.1.0", path = "../pointercrate-user" }
2020
pointercrate-user-api = { version = "0.1.0", path = "../pointercrate-user-api", features = ["legacy_accounts"] }
2121
pointercrate-user-pages = { version = "0.1.0", path = "../pointercrate-user-pages", features = ["legacy_accounts"] }
22-
rocket = { git = "https://github.com/rwf2/Rocket", branch = "master" }
22+
rocket = { workspace = true }
2323
unic-langid = { version = "0.9.5", features = ["macros"] }
2424
reqwest = "0.12.23"
2525
serde = "1.0.226"

pointercrate-integrate/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition.workspace = true
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
10+
sqlx = { workspace = true }
1111
bincode = "1.3.1"
1212
reqwest = "0.12.*"
1313
futures = "0.3.31"

pointercrate-test/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pointercrate-user = {path = "../pointercrate-user"}
1616
pointercrate-user-api = {path = "../pointercrate-user-api"}
1717
pointercrate-user-pages = {path = "../pointercrate-user-pages", features = ["legacy_accounts"]}
1818
serde = "1.0.226"
19-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
20-
rocket = { git = "https://github.com/rwf2/Rocket", branch = "master" }
19+
sqlx = { workspace = true }
20+
rocket = { workspace = true }
2121
serde_json = "1.0.145"
2222
dotenv = "0.15.0"
2323
serde_urlencoded = "0.7.1"

pointercrate-user-api/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ edition.workspace = true
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
rocket = { git = "https://github.com/rwf2/Rocket", branch = "master", features = ["json"] }
11-
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
10+
rocket = { workspace = true }
11+
sqlx = { workspace = true }
1212
pointercrate-user = {path = "../pointercrate-user"}
1313
pointercrate-user-pages = {path = "../pointercrate-user-pages"}
1414
pointercrate-core = {path = "../pointercrate-core"}

0 commit comments

Comments
 (0)