Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/docker/dependencies-0a80f3633e
Browse files Browse the repository at this point in the history
  • Loading branch information
m4tx authored Jun 1, 2024
2 parents c78db09 + c68b8a4 commit a153d76
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 35 deletions.
104 changes: 76 additions & 28 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ codegen-units = 1
lto = true

[workspace.dependencies]
serde = { version = "1.0.199", features = ["derive"] }
serde = { version = "1.0.203", features = ["derive"] }
8 changes: 4 additions & 4 deletions chombo-gen-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ license = "AGPL-3.0-only"

[dependencies]
chombo-gen-common = { path = "../chombo-gen-common", features = ["backend"] }
riichi_hand = "0.6.2"
rocket = "0.5.0"
riichi_hand = "0.6.3"
rocket = "0.5.1"
rocket-cache-response = "0.6.4"
image = { version = "0.25.1", default-features = false, features = ["png"] }
serde = { version = "1.0.199", features = ["derive"] }
serde_json = "1.0.116"
serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.117"
log = { version = "0.4.21", features = ["max_level_trace", "release_max_level_info"] }
chrono = "0.4.38"
time = "0.3.36"
2 changes: 1 addition & 1 deletion chombo-gen-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ license = "AGPL-3.0-only"

[dependencies]
serde.workspace = true
rocket = { version = "0.5.0", optional = true }
rocket = { version = "0.5.1", optional = true }

[features]
backend = ["rocket"]
2 changes: 1 addition & 1 deletion chombo-gen-frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ license = "AGPL-3.0-only"
chombo-gen-common = { path = "../chombo-gen-common" }
gloo-net = "0.5.0"
yew = { version = "0.21", features = ["csr"] }
yew-hooks = "0.3.1"
yew-hooks = "0.3.2"
serde.workspace = true
wasm-bindgen-futures = "0.4.42"
base64 = "0.22.1"
Expand Down

0 comments on commit a153d76

Please sign in to comment.