Skip to content

Commit

Permalink
Merge branch 'main' into jonas/cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
CrabNejonas committed Jan 18, 2024
2 parents dfe1b19 + 7ecb172 commit a3566ad
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 40 deletions.
52 changes: 20 additions & 32 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 crates/devtools-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tonic-web = "0.10"
tonic-health = "0.10"
tower-http = "0.4"
tower-layer = "0.3"
futures = "0.3.28"
futures = "0.3.30"
bytes = "1.5.0"
ringbuf = "0.4.0-rc.2"
async-stream = "0.3.5"
Expand Down
8 changes: 4 additions & 4 deletions crates/devtools-v1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ repository = "https://github.com/crabnebula-dev/devtools"

[dependencies]
devtools-core = { path = "../../crates/devtools-core/" }
tauri = { version = "1.5.3", features = ["tracing"] }
tauri = { version = "1.5.4", features = ["tracing"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tonic = "0.10"
tokio = "1.33.0"
tonic-health = "0.10"
colored = "2.0"
colored = "2.1"
serde_json = "1"
futures = "0.3.28"
futures = "0.3.30"
bytes = "1.5.0"
async-stream = "0.3.5"

[dev-dependencies]
tauri = { version = "1.5.3", features = ["test"] }
tauri = { version = "1.5.4", features = ["test"] }
6 changes: 3 additions & 3 deletions crates/devtools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ tokio.workspace = true
tonic.workspace = true
serde = "1"
tonic-health = "0.10"
colored = "2.0"
colored = "2.1"
serde_json = "1"
futures = "0.3.28"
futures = "0.3.30"
bytes = "1.5.0"
async-stream = "0.3.5"
local-ip-address = "0.5"

[target."cfg(target_os = \"ios\")".dependencies]
swift-rs = "1.0.1"
swift-rs = "1.0.6"
objc = "0.2"
cocoa = "0.24"

0 comments on commit a3566ad

Please sign in to comment.