Skip to content

Commit

Permalink
Move intra-workspace dependencies into workspace dependencies table
Browse files Browse the repository at this point in the history
This fixes several instances where one of the workspace crates was
depending on an old published version of another workspace crate.

The instances in `atrium-xrpc-server` and the firehose example are not
fixed here as this conflicts with #98.
  • Loading branch information
str4d committed Feb 16, 2024
1 parent 01d2c5d commit 15020e6
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 44 deletions.
41 changes: 7 additions & 34 deletions Cargo.lock

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

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,10 @@ rust-version = "1.70"
repository = "https://github.com/sugyan/atrium"
license = "MIT"
keywords = ["atproto", "bluesky"]

[workspace.dependencies]
# Intra-workspace dependencies
atrium-api = { version = "0.16.0", path = "atrium-api" }
atrium-xrpc = { version = "0.8.0", path = "atrium-xrpc" }
atrium-xrpc-client = { version = "0.2.0", path = "atrium-xrpc-client" }
atrium-xrpc-server = { version = "0.1.0", path = "atrium-xrpc-server" }
4 changes: 2 additions & 2 deletions atrium-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ license.workspace = true
keywords.workspace = true

[dependencies]
atrium-xrpc = "0.8.0"
atrium-xrpc.workspace = true
async-trait = "0.1.68"
http = "0.2.9"
serde = { version = "1.0.160", features = ["derive"] }
Expand All @@ -27,7 +27,7 @@ agent = ["tokio/sync"]
dag-cbor = ["cid/serde-codec", "libipld-core/serde-codec"]

[dev-dependencies]
atrium-xrpc-client = "0.2.0"
atrium-xrpc-client.workspace = true
futures = "0.3.28"
serde_json = "1.0.107"
tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
Expand Down
4 changes: 2 additions & 2 deletions atrium-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ rust-version.workspace = true

[dependencies]
async-trait = "0.1.74"
atrium-api = "0.14"
atrium-xrpc-client = "0.2"
atrium-api.workspace = true
atrium-xrpc-client.workspace = true
chrono = "0.4.24"
clap = { version = "4.4.8", features = ["derive"] }
dirs = "5.0.1"
Expand Down
2 changes: 1 addition & 1 deletion atrium-xrpc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ keywords.workspace = true

[dependencies]
async-trait = "0.1.74"
atrium-xrpc = "0.8.0"
atrium-xrpc.workspace = true
http = "0.2.9"

[dependencies.isahc]
Expand Down
4 changes: 2 additions & 2 deletions examples/concurrent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
atrium-api = "0.14"
atrium-xrpc-client = "0.2"
atrium-api.workspace = true
atrium-xrpc-client.workspace = true
clap = { version = "4.4.7", features = ["derive"] }
futures = "0.3.29"
tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
2 changes: 1 addition & 1 deletion examples/firehose/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
atrium-xrpc-server = { path = "../../atrium-xrpc-server" }
atrium-xrpc-server.workspace = true
atrium-api = "0.15"
ciborium = "0.2.1"
futures = "0.3.28"
Expand Down
5 changes: 5 additions & 0 deletions lexicon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ resolver = "2"

[workspace.package]
edition = "2021"

[workspace.dependencies]
# Intra-workspace dependencies
atrium-codegen = { version = "0.1.0", path = "atrium-codegen" }
atrium-lex = { version = "0.1.0", path = "atrium-lex" }
2 changes: 1 addition & 1 deletion lexicon/atrium-codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["sugyan <[email protected]>"]
edition.workspace = true

[dependencies]
atrium-lex = { path = "../atrium-lex" }
atrium-lex.workspace = true
heck = "0.4.1"
itertools = "0.10.5"
prettyplease = "0.2.15"
Expand Down
2 changes: 1 addition & 1 deletion lexicon/lexgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition.workspace = true
publish = false

[dependencies]
atrium-codegen = { path = "../atrium-codegen" }
atrium-codegen.workspace = true
clap = { version = "4.2.4", features = ["derive"] }

0 comments on commit 15020e6

Please sign in to comment.