Skip to content

Commit

Permalink
chore: Update dependencies paths in Cargo.toml and update versions in…
Browse files Browse the repository at this point in the history
… Cargo.lock files. (#69)
  • Loading branch information
pavadeli authored May 17, 2024
1 parent a46819c commit d87cc10
Show file tree
Hide file tree
Showing 9 changed files with 140 additions and 126 deletions.
192 changes: 99 additions & 93 deletions Cargo.lock

Large diffs are not rendered by default.

37 changes: 24 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,36 @@ members = ["crates/*"]
version = "0.0.4"

[workspace.dependencies]
async-trait = "0.1.77"
async-trait = "0.1.79"
axum = "0.6.20"
emulator-tracing = { path = "crates/emulator-tracing" }
firestore-database = { path = "crates/firestore-database" }
clap = "4.5.4"
color-eyre = "0.6.3"
console-subscriber = "0.2.0"
futures = "0.3.30"
googleapis = { path = "crates/googleapis" }
hyper = "0.14"
itertools = "0.12.1"
pin-project = "1.1.5"
prost = "0.12"
serde = "1.0.197"
serde_with = "3.6.1"
thiserror = "1.0.57"
serde_json = "1.0.115"
serde_with = "3.7.0"
string_cache = "0.8.7"
thiserror = "1.0.58"
tikv-jemallocator = "0.5.4"
time = "0.3.34"
tokio = "1.36.0"
tokio-stream = "0.1.14"
tokio = "1.37.0"
tokio-stream = "0.1.15"
tonic = "0.11"
tower = "0.4.13"
tower-http = "0.4.4"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"

# [workspace.dev-dependencies]
rstest = "0.18.2"

# [workspace.build-dependencies]
tonic-build = "0.11"

[workspace.lints.rust]
unsafe_code = "forbid"
Expand All @@ -61,14 +72,14 @@ blocks_in_conditions = "allow"

[dependencies]
axum = { workspace = true }
clap = { version = "4.5.1", features = ["derive", "env"] }
color-eyre = "0.6.2"
clap = { workspace = true, features = ["derive", "env"] }
color-eyre = { workspace = true }
emulator-grpc = { path = "crates/emulator-grpc" }
emulator-http = { path = "crates/emulator-http" }
emulator-tracing = { workspace = true }
firestore-database = { workspace = true }
emulator-tracing = { path = "crates/emulator-tracing" }
firestore-database = { path = "crates/firestore-database" }
hybrid-axum-tonic = { path = "crates/hybrid-axum-tonic" }
tikv-jemallocator = "0.5.4"
tikv-jemallocator = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
tracing = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions crates/emulator-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
firestore-database = { workspace = true }
firestore-database = { path = "../firestore-database" }
futures = { workspace = true }
googleapis = { workspace = true }
googleapis = { path = "../googleapis" }
itertools = { workspace = true }
tokio = { workspace = true }
tokio-stream = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/emulator-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ ui = []

[dependencies]
axum = { workspace = true, features = ["macros"] }
emulator-tracing = { workspace = true }
firestore-database = { workspace = true }
serde_json = "1.0.114"
tower-http = { version = "0.4.4", features = ["full"] }
emulator-tracing = { path = "../emulator-tracing" }
firestore-database = { path = "../firestore-database" }
serde_json = { workspace = true }
tower-http = { workspace = true, features = ["full"] }

[lints]
workspace = true
7 changes: 2 additions & 5 deletions crates/emulator-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ edition = "2021"
console = ["dep:console-subscriber"]

[dependencies]
console-subscriber = { version = "0.2.0", optional = true }
console-subscriber = { workspace = true, optional = true }
thiserror = { workspace = true }
time = { workspace = true }
tracing-subscriber = { version = "0.3.18", features = [
"local-time",
"env-filter",
] }
tracing-subscriber = { workspace = true, features = ["local-time", "env-filter"] }

[lints]
workspace = true
6 changes: 3 additions & 3 deletions crates/firestore-database/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ edition = "2021"
[dependencies]
async-trait = { workspace = true }
futures = { workspace = true }
googleapis = { workspace = true }
googleapis = { path = "../googleapis" }
itertools = { workspace = true }
serde = { workspace = true, features = ["serde_derive"] }
serde_with = { workspace = true }
string_cache = "0.8.7"
string_cache = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
tokio-stream = { workspace = true, features = ["sync"] }
tonic = { workspace = true }
tracing = { workspace = true }

[dev-dependencies]
rstest = "0.18.2"
rstest = { workspace = true }

[lints]
workspace = true
4 changes: 2 additions & 2 deletions crates/firestore-database/src/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use googleapis::google::{
listen_request,
listen_response::ResponseType,
target::{self, query_target},
target_change::{self, TargetChangeType},
target_change::TargetChangeType,
DocumentChange, DocumentDelete, ListenRequest, ListenResponse, Target, TargetChange,
},
protobuf::Timestamp,
Expand Down Expand Up @@ -523,7 +523,7 @@ impl QueryTarget {
time: Timestamp,
) -> Result<Vec<ResponseType>> {
let mut msgs = vec![ResponseType::TargetChange(TargetChange {
target_change_type: target_change::TargetChangeType::Reset as _,
target_change_type: TargetChangeType::Reset as _,
target_ids: vec![TARGET_ID],
cause: None,
resume_token: vec![],
Expand Down
6 changes: 3 additions & 3 deletions crates/googleapis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ thiserror = { workspace = true }
tonic = { workspace = true }

[build-dependencies]
tonic-build = "0.11"
tonic-build = { workspace = true }

[dev-dependencies]
itertools = "0.12.1"
rstest = "0.18.2"
itertools = { workspace = true }
rstest = { workspace = true }

# Do not use workspace lints here, because generated code is not that clean.
[lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion crates/hybrid-axum-tonic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tonic = { workspace = true }
tower = { workspace = true }

[build-dependencies]
tonic-build = "0.11"
tonic-build = { workspace = true }

[dev-dependencies]
prost = { workspace = true }
Expand Down

0 comments on commit d87cc10

Please sign in to comment.