diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 08f0b7513e2..d20ef9440df 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -546,9 +546,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.10" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "shlex", ] @@ -2563,18 +2563,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.217" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", @@ -2583,9 +2583,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", "memchr", @@ -2793,9 +2793,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.32.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" +checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" dependencies = [ "core-foundation-sys", "libc", diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml index 6230a6bfe15..8f966e2188e 100644 --- a/apps/desktop/desktop_native/Cargo.toml +++ b/apps/desktop/desktop_native/Cargo.toml @@ -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" diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml index 86b6f2239ff..1e856cf2f66 100644 --- a/apps/desktop/desktop_native/core/Cargo.toml +++ b/apps/desktop/desktop_native/core/Cargo.toml @@ -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", ] } @@ -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" @@ -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 } diff --git a/apps/desktop/desktop_native/macos_provider/Cargo.toml b/apps/desktop/desktop_native/macos_provider/Cargo.toml index ff7408d6d44..a488ce88a1c 100644 --- a/apps/desktop/desktop_native/macos_provider/Cargo.toml +++ b/apps/desktop/desktop_native/macos_provider/Cargo.toml @@ -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"] } diff --git a/apps/desktop/desktop_native/napi/Cargo.toml b/apps/desktop/desktop_native/napi/Cargo.toml index b23e61662b4..c7ecc766e65 100644 --- a/apps/desktop/desktop_native/napi/Cargo.toml +++ b/apps/desktop/desktop_native/napi/Cargo.toml @@ -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" diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml index eae303b9f08..2d6478c77c9 100644 --- a/apps/desktop/desktop_native/objc/Cargo.toml +++ b/apps/desktop/desktop_native/objc/Cargo.toml @@ -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" diff --git a/apps/desktop/desktop_native/proxy/Cargo.toml b/apps/desktop/desktop_native/proxy/Cargo.toml index a38fa2cf890..27f2856f3a6 100644 --- a/apps/desktop/desktop_native/proxy/Cargo.toml +++ b/apps/desktop/desktop_native/proxy/Cargo.toml @@ -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" diff --git a/package-lock.json b/package-lock.json index 5377bbbd0fb..e7c50ee8370 100644 --- a/package-lock.json +++ b/package-lock.json @@ -172,7 +172,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", diff --git a/package.json b/package.json index c51d12f4031..b34c18d77de 100644 --- a/package.json +++ b/package.json @@ -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",