Skip to content

Commit

Permalink
[deps] Platform: Pin dependencies (#12292)
Browse files Browse the repository at this point in the history
* [deps] Platform: Pin dependencies

* fix: version conflicts by making them workspace deps

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Andreas Coroiu <[email protected]>
  • Loading branch information
renovate[bot] and coroiu authored Jan 31, 2025
1 parent f17cb61 commit b423460
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 42 deletions.
20 changes: 10 additions & 10 deletions apps/desktop/desktop_native/Cargo.lock

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

10 changes: 10 additions & 0 deletions apps/desktop/desktop_native/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
[workspace]
resolver = "2"
members = ["napi", "core", "proxy", "macos_provider"]

[workspace.dependencies]
anyhow = "=1.0.94"
log = "=0.4.25"
serde = "=1.0.209"
serde_json = "=1.0.127"
tokio = "=1.43.0"
tokio-util = "=0.7.13"
tokio-stream = "=0.1.15"
thiserror = "=1.0.69"
16 changes: 8 additions & 8 deletions apps/desktop/desktop_native/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ default = [
"dep:security-framework",
"dep:security-framework-sys",
"dep:zbus",
"dep:zbus_polkit"
"dep:zbus_polkit",
]
manual_test = []

[dependencies]
aes = "=0.8.4"
anyhow = "=1.0.94"
anyhow.workspace = true
arboard = { version = "=3.4.1", default-features = false, features = [
"wayland-data-control",
] }
Expand All @@ -32,7 +32,7 @@ pin-project = "=1.1.8"
dirs = "=6.0.0"
futures = "=0.3.31"
interprocess = { version = "=2.2.1", features = ["tokio"] }
log = "=0.4.25"
log.workspace = true
rand = "=0.8.5"
russh-cryptovec = "=0.7.3"
scopeguard = "=1.2.0"
Expand All @@ -45,15 +45,15 @@ ssh-key = { version = "=0.6.7", default-features = false, features = [
"getrandom",
] }
bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "23b50e3bbe6d56ef19ab0e98e8bb1462cb6d77ae" }
tokio = { version = "=1.43.0", features = ["io-util", "sync", "macros", "net"] }
tokio-stream = { version = "=0.1.15", features = ["net"] }
tokio-util = { version = "=0.7.13", features = ["codec"] }
thiserror = "=1.0.69"
tokio = { workspace = true, features = ["io-util", "sync", "macros", "net"] }
tokio-stream = { workspace = true, features = ["net"] }
tokio-util = { workspace = true, features = ["codec"] }
thiserror.workspace = true
typenum = "=1.17.0"
pkcs8 = { version = "=0.10.2", features = ["alloc", "encryption", "pem"] }
rsa = "=0.9.6"
ed25519 = { version = "=2.2.3", features = ["pkcs8"] }
sysinfo = { version = "0.32.0", features = ["windows"] }
sysinfo = { version = "=0.32.0", features = ["windows"] }

[target.'cfg(windows)'.dependencies]
widestring = { version = "=1.1.0", optional = true }
Expand Down
16 changes: 8 additions & 8 deletions apps/desktop/desktop_native/macos_provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ bench = false
[dependencies]
desktop_core = { path = "../core" }
futures = "=0.3.31"
log = "0.4.22"
serde = { version = "1.0.205", features = ["derive"] }
serde_json = "1.0.122"
tokio = { version = "1.39.2", features = ["sync"] }
tokio-util = "0.7.11"
uniffi = { version = "0.28.3", features = ["cli"] }
log.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
tokio = { workspace = true, features = ["sync"] }
tokio-util.workspace = true
uniffi = { version = "=0.28.3", features = ["cli"] }

[target.'cfg(target_os = "macos")'.dependencies]
oslog = "0.2.0"
oslog = "=0.2.0"

[build-dependencies]
uniffi = { version = "0.28.3", features = ["build"] }
uniffi = { version = "=0.28.3", features = ["build"] }
10 changes: 5 additions & 5 deletions apps/desktop/desktop_native/napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ anyhow = "=1.0.94"
desktop_core = { path = "../core" }
napi = { version = "=2.16.13", features = ["async"] }
napi-derive = "=2.16.13"
serde = { version = "1.0.209", features = ["derive"] }
serde_json = "1.0.127"
tokio = { version = "=1.43.0" }
tokio-util = "=0.7.13"
tokio-stream = "=0.1.15"
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
tokio.workspace = true
tokio-util.workspace = true
tokio-stream.workspace = true

[target.'cfg(windows)'.dependencies]
windows-registry = "=0.4.0"
Expand Down
10 changes: 5 additions & 5 deletions apps/desktop/desktop_native/objc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ publish = false
default = []

[dependencies]
anyhow = "=1.0.94"
thiserror = "=1.0.69"
tokio = "1.39.1"
anyhow.workspace = true
thiserror.workspace = true
tokio.workspace = true

[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "=0.10.0"

[build-dependencies]
cc = "1.2.4"
glob = "0.3.2"
cc = "=1.2.4"
glob = "=0.3.2"
8 changes: 4 additions & 4 deletions apps/desktop/desktop_native/proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ version = "0.0.0"
publish = false

[dependencies]
anyhow = "=1.0.94"
anyhow.workspace = true
desktop_core = { path = "../core" }
futures = "=0.3.31"
log = "=0.4.25"
log.workspace = true
simplelog = "=0.12.2"
tokio = { version = "=1.43.0", features = ["io-std", "io-util", "macros", "rt"] }
tokio-util = { version = "=0.7.13", features = ["codec"] }
tokio = { workspace = true, features = ["io-std", "io-util", "macros", "rt"] }
tokio-util = { workspace = true, features = ["codec"] }

[target.'cfg(target_os = "macos")'.dependencies]
embed_plist = "=1.2.2"
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"type-fest": "2.19.0",
"typescript": "5.4.2",
"typescript-eslint": "8.20.0",
"typescript-strict-plugin": "^2.4.4",
"typescript-strict-plugin": "2.4.4",
"url": "0.11.4",
"util": "0.12.5",
"wait-on": "8.0.2",
Expand Down

0 comments on commit b423460

Please sign in to comment.