Skip to content

Commit

Permalink
refactor(deps): use workspaces and consolidate deps
Browse files Browse the repository at this point in the history
Signed-off-by: mikeee <[email protected]>
  • Loading branch information
mikeee committed Aug 20, 2024
1 parent f4cc7fd commit 5b5a7e3
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 55 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/dapr-bot/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[package]
name = "dapr-bot"
authors = ["[email protected]"]
authors = ["Mike Nguyen <[email protected]>"]
license = "Apache-2.0"
license-file = "LICENSE"
version = "0.1.0"
edition = "2021"
rust-version = "1.70.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
exitcode = "1.1.2"
octocrab = "0.34.1"
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
tokio = { version = "1.36.0", features = ["full"] }
38 changes: 36 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,43 @@
members = [
"dapr",
"dapr-macros",
]
exclude = [
"proto-gen",
"examples",
]
exclude = [
".github/workflows/dapr-bot" # Bot used in github workflow
]
resolver = "2"

[workspace.dependencies]
async-trait = "0.1"

dapr = { version = "0.15.1", path = "./dapr" }
dapr-macros = { version = "0.15.1", path = "./dapr-macros" }

prost = "0.13.1"
prost-build = "0.13.1"
prost-types = "0.13.1"

serde = "1.0"
serde_json = "1.0"

tokio = "1.39"
tokio-stream = "0.1"
tokio-test = "0.4"
tokio-util = "0.7"

tonic = "0.12.1"
tonic-build = "0.12.1"

[workspace.package]
version = "0.15.1"
authors = [
"Mike Nguyen <[email protected]>",
"The Dapr Authors <[email protected]>"
]
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/dapr/rust-sdk"

rust-version = "1.70.0" # MSRV
19 changes: 11 additions & 8 deletions dapr-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
[package]
name = "dapr-macros"
version = "0.15.0"
edition = "2021"
description = "Dapr Rust SDK"
license = "Apache-2.0"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "Dapr Rust SDK (Macros)"
license.workspace = true
repository.workspace = true
rust-version.workspace = true

[lib]
proc-macro = true

[dependencies]
async-trait = "0.1"
log = "0.4"
async-trait = { workspace = true }
axum = "0.7"
syn = { version = "2.0", features = ["full"] }
quote = "1.0"
log = "0.4"
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "2.0", features = ["full"] }
46 changes: 23 additions & 23 deletions dapr/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
[package]
name = "dapr"
version = "0.15.0"
authors = ["dapr.io"]
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/dapr/rust-sdk"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
description = "Rust SDK for dapr"
readme = "../README.md"
keywords = ["microservices", "dapr"]
rust-version.workspace = true

[dependencies]
dapr-macros = { version = "0.15.0", path = "../dapr-macros" }
futures = "0.3"
tonic = "0.12.1"
prost = "0.13.1"
bytes = "1.7"
prost-types = "0.13.1"
async-trait = "0.1"
env_logger = "0.11"
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
async-trait = { workspace = true }
axum = "0.7"
tokio = { version = "1.39", features = ["sync"] }
tokio-util = { version = "0.7", features = ["io"] }
bytes = "1.7"
chrono = "0.4"
base64 = "0.22"
dapr-macros = { workspace = true }
futures = "0.3"
log = "0.4"
prost = { workspace = true }
prost-types = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tonic = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
tokio-util = { workspace = true, features = ["io"] }


[dev-dependencies]
axum-test = "15.3"
once_cell = "1.19"
tokio = { version = "1.39", features = ["full"] }
tokio = { workspace = true, features = ["full"] }
uuid = { version = "1.10", features = ["v4"] }
dapr = { path = "./" }
tokio-test = "0.4"
tokio-stream = { version = "0.1" }
dapr = { workspace = true }
tokio-test = { workspace = true }
tokio-stream = { workspace = true }
27 changes: 14 additions & 13 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
[package]
name = "examples"
authors = ["Mike Nguyen <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
authors.workspace = true
license.workspace = true
edition.workspace = true
publish = false
version = "0.0.1"
repository.workspace = true
rust-version.workspace = true

[dependencies]
async-trait = { workspace = true }
base64 = "0.22"
dapr = { path = "../dapr" }
dapr-macros = { path = "../dapr-macros" }
serde = { version = "1.0", features = ["derive"] }
tokio = { version = "1.39", features = ["full"] }
tokio-stream = "0.1"
async-trait = "0.1"
env_logger = "0.11"
log = "0.4"
tonic = "0.12.1"
prost = "0.13.1"
prost-types = "0.13.1"
base64 = "0.22"
serde_json = "1.0"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tokio-stream = { workspace = true }
tonic = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }

[[example]]
name = "actors-client"
Expand Down
14 changes: 7 additions & 7 deletions proto-gen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "proto-gen"
authors = ["Mike Nguyen <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
authors.workspace = true
license.workspace = true
edition.workspace = true
publish = false
version = "0.0.1"
repository.workspace = true
version.workspace = true
rust-version.workspace = true

[dependencies]
tonic-build = "0.12.1"
prost-types = "0.13.1"
prost-build = "0.13.1"
tonic-build = { workspace = true }

0 comments on commit 5b5a7e3

Please sign in to comment.