Remove cargo workspace dependencies.

Once in m-c, many of our crates need to be excluded from the main workspace,
which means they can't use workspace deps. So we don't bother using them anywhere.

Cargo.toml

@@ -129,11 +129,9 @@ default-members = [
     "testing/separated/*/",
 ]
 
-[workspace.dependencies]
-rusqlite = "0.31.0"
-libsqlite3-sys = "0.28.0"
-uniffi = "0.28.2"
-uniffi_bindgen = "0.28.2"
+# * sob* - why can't we have nice things? Workspace properties don't work in m-c when our crates are
+# "excluded" from the m-c workspace for unfortunate reasons.
+# [workspace.dependencies]
 
 [profile.release]
 opt-level = "s"

components/as-ohttp-client/Cargo.toml

@@ -10,11 +10,11 @@ exclude = ["/ios"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 thiserror = "1.0"
 bhttp = "0.3"
 parking_lot = "0.12"
-rusqlite = { workspace = true, features = ["bundled"] }
+rusqlite = { version = "0.31.0", features = ["bundled"] }
 
 [dependencies.ohttp]
 version = "0.5.1"
@@ -24,7 +24,7 @@ rev = "bf02e480d4722f9fba38a4245168d1a82f8fac6c"
 features = ["client", "server", "app-svc", "external-sqlite"]
 
 [build-dependencies]
-uniffi = { workspace = true, features=["build"]}
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/autofill/Cargo.toml

@@ -15,7 +15,7 @@ interrupt-support = { path = "../support/interrupt" }
 jwcrypto = { path = "../support/jwcrypto" }
 lazy_static = "1.4"
 log = "0.4"
-rusqlite = { workspace = true, features = ["functions", "bundled", "serde_json", "unlock_notify"] }
+rusqlite = { version = "0.31.0", features = ["functions", "bundled", "serde_json", "unlock_notify"] }
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
@@ -24,15 +24,15 @@ sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"
 sync15 = { path = "../sync15", features = ["sync-engine"] }
 thiserror = "1.0"
 types = { path = "../support/types" }
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 url = { version = "2.2", features = ["serde"] }
 
 [dev-dependencies]
 env_logger = { version = "0.10", default-features = false }
-libsqlite3-sys = { workspace = true }
+libsqlite3-sys = { version = "0.28.0" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/crashtest/Cargo.toml

@@ -9,10 +9,10 @@ exclude = ["/android", "/ios"]
 [dependencies]
 log = "0.4"
 thiserror = "1.0"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/fxa-client/Cargo.toml

@@ -25,11 +25,11 @@ error-support = { path = "../support/error" }
 thiserror = "1.0"
 anyhow = "1.0"
 sync-guid = { path = "../support/guid", features = ["random"] }
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 payload-support = { path = "../support/payload" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [dev-dependencies]
 viaduct-reqwest = { path = "../support/viaduct-reqwest" }

components/logins/Cargo.toml

@@ -24,14 +24,14 @@ sql-support = { path = "../support/sql" }
 jwcrypto = { path = "../support/jwcrypto" }
 interrupt-support = { path = "../support/interrupt" }
 error-support = { path = "../support/error" }
-rusqlite = { workspace = true, features = ["limits", "unlock_notify"] }
+rusqlite = { version = "0.31.0", features = ["limits", "unlock_notify"] }
 sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"] }
 thiserror = "1.0"
 anyhow = "1.0"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [dev-dependencies]
 more-asserts = "0.2"

components/nimbus/Cargo.toml

@@ -33,7 +33,7 @@ uuid = { version = "1.3", features = ["serde", "v4"]}
 sha2 = "^0.10"
 hex = "0.4"
 once_cell = "1"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 chrono = { version = "0.4", features = ["serde"]}
 unicode-segmentation = "1.8.0"
 error-support = { path = "../support/error" }
@@ -43,7 +43,7 @@ regex = { version = "1.9", optional = true }
 firefox-versioning = { path = "../support/firefox-versioning", optional = true }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [dev-dependencies]
 viaduct-reqwest = { path = "../support/viaduct-reqwest" }

components/places/Cargo.toml

@@ -22,7 +22,7 @@ lazy_static = "1.4"
 url = { version = "2.1", features = ["serde"] }
 percent-encoding = "2.1"
 caseless = "0.2"
-rusqlite = { workspace = true, features = ["functions", "window", "bundled", "unlock_notify"] }
+rusqlite = { version = "0.31.0", features = ["functions", "window", "bundled", "unlock_notify"] }
 sql-support = { path = "../support/sql" }
 types = { path = "../support/types" }
 bitflags = "1.2"
@@ -34,7 +34,7 @@ error-support = { path = "../support/error" }
 sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"]}
 thiserror = "1.0"
 anyhow = "1.0"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 
 [dev-dependencies]
 pretty_assertions = "0.6"
@@ -43,7 +43,7 @@ env_logger = {version = "0.10", default-features = false}
 sql-support = { path = "../support/sql" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/push/Cargo.toml

@@ -13,18 +13,18 @@ bincode = "1.2"
 lazy_static = "1.4"
 base64 = "0.21"
 log = "0.4"
-rusqlite = { workspace = true, features = ["bundled", "unlock_notify"] }
+rusqlite = { version = "0.31.0", features = ["bundled", "unlock_notify"] }
 url = "2.2"
 viaduct = { path = "../viaduct" }
 error-support = { path = "../support/error" }
 sql-support = { path = "../support/sql" }
 rc_crypto = { path = "../support/rc_crypto", features = ["ece"] }
 thiserror = "1.0"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 types = { path = "../support/types" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [dev-dependencies]
 env_logger = { version = "0.10", default-features = false, features = ["humantime"] }

components/relevancy/Cargo.toml

@@ -17,18 +17,18 @@ md-5 = "0.10"
 parking_lot = ">=0.11,<=0.12"
 rand = "0.8"
 rand_distr = "0.4"
-rusqlite = { workspace = true, features = ["bundled"] }
+rusqlite = { version = "0.31.0", features = ["bundled"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_path_to_error = "0.1"
 thiserror = "1.0"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 url = "2.5"
 remote_settings = { path = "../remote_settings"}
 base64 = "0.21.2"
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [lib]
 

components/remote_settings/Cargo.toml

@@ -16,7 +16,7 @@ jexl = ["dep:jexl-eval"]
 
 [dependencies]
 log = "0.4"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 thiserror = "1.0"
 serde = { version = "1", features=["derive"] }
 serde_json = "1"
@@ -25,15 +25,15 @@ error-support = { path = "../support/error" }
 viaduct = { path = "../viaduct" }
 url = "2"
 camino = "1.0"
-rusqlite = { workspace = true, features = ["bundled"] }
+rusqlite = { version = "0.31.0", features = ["bundled"] }
 jexl-eval = { version = "0.3.0", optional = true }
 regex = "1.9"
 anyhow = "1.0"
 firefox-versioning = { path = "../support/firefox-versioning" }
 sha2 = "^0.10"
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [dev-dependencies]
 expect-test = "1.4"

components/search/Cargo.toml

@@ -12,7 +12,7 @@ parking_lot = ">=0.11,<=0.12"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "1"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }

components/suggest/Cargo.toml

@@ -17,7 +17,7 @@ log = "0.4"
 once_cell = "1.5"
 parking_lot = ">=0.11,<=0.12"
 remote_settings = { path = "../remote_settings" }
-rusqlite = { workspace = true, features = ["functions", "bundled", "load_extension"] }
+rusqlite = { version = "0.31.0", features = ["functions", "bundled", "load_extension"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 error-support = { path = "../support/error" }
@@ -26,7 +26,7 @@ viaduct = { path = "../viaduct" }
 viaduct-reqwest = { path = "../support/viaduct-reqwest", optional=true }
 tempfile = { version = "3.2.0", optional = true }
 thiserror = "1"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 url = { version = "2.1", features = ["serde"] }
 
 [dev-dependencies]
@@ -37,7 +37,7 @@ hex = "0.4"
 rc_crypto = { path = "../support/rc_crypto" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }
 
 [features]
 # Required for the benchmarks to work, wasted bytes otherwise.

components/support/error/Cargo.toml

@@ -11,15 +11,15 @@ exclude = ["/android"]
 log = "0.4"
 lazy_static = { version = "1.4" }
 parking_lot = { version = ">=0.11,<=0.12" }
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 error-support-macros = { path = "macros" }
 
 [dependencies.backtrace]
 optional = true
 version = "0.3"
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/support/guid/Cargo.toml

@@ -6,7 +6,7 @@ license = "MPL-2.0"
 edition = "2021"
 
 [dependencies]
-rusqlite = { workspace = true, optional = true, features = ["bundled"] }
+rusqlite = { version = "0.31.0", optional = true, features = ["bundled"] }
 serde = { version = "1", optional = true }
 rand = { version = "0.8", optional = true }
 base64 = { version = "0.21", optional = true }

components/support/interrupt/Cargo.toml

@@ -8,8 +8,8 @@ edition = "2021"
 [dependencies]
 lazy_static = "1.4"
 parking_lot = ">=0.11,<=0.12"
-rusqlite = { workspace = true, features = ["functions", "limits", "bundled", "unlock_notify"] }
-uniffi = { workspace = true }
+rusqlite = { version = "0.31.0", features = ["functions", "limits", "bundled", "unlock_notify"] }
+uniffi = { version = "0.28.2" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }

components/support/nimbus-fml/Cargo.toml

@@ -27,7 +27,7 @@ unicode-segmentation = "1.8.0"
 url = { version = "2", features = ["serde"] }
 reqwest = { version = "0.11", features = ["blocking", "json", "native-tls-vendored"] }
 glob = "0.3.0"
-uniffi = { workspace = true, optional = true }
+uniffi = { version = "0.28.2", optional = true }
 cfg-if = "1.0.0"
 console = "0.15.5"
 lazy_static = "1.4"
@@ -36,7 +36,7 @@ sha2 = "^0.10"
 itertools = "0"
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"], optional = true }
+uniffi = { version = "0.28.2", features = ["build"], optional = true }
 
 [dev-dependencies]
 tempfile = "3"

components/support/rc_crypto/nss/nss_sys/Cargo.toml

@@ -12,7 +12,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(__appsvc_ci_hack)'] }
 crate-type = ["lib"]
 
 [dependencies]
-libsqlite3-sys = { workspace = true, features = ["bundled"] }
+libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
 
 [build-dependencies]
 nss_build_common = {path = "../nss_build_common"}

components/support/rust-log-forwarder/Cargo.toml

@@ -9,10 +9,10 @@ exclude = ["/android", "/ios"]
 [dependencies]
 log = "0.4"
 parking_lot = ">=0.11,<=0.12"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/support/sql/Cargo.toml

@@ -20,7 +20,7 @@ tempfile = "3.1.0"
 parking_lot = ">=0.11,<=0.12"
 # disable for m-c :(
 # prettytable-rs = { version = "0.10", optional = true }
-rusqlite = { workspace = true, features = ["functions", "limits", "bundled", "unlock_notify"] }
+rusqlite = { version = "0.31.0", features = ["functions", "limits", "bundled", "unlock_notify"] }
 
 [dev-dependencies]
 env_logger = {version = "0.10", default-features = false}

components/support/types/Cargo.toml

@@ -8,7 +8,7 @@ license = "MPL-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rusqlite = { workspace = true, features = ["functions", "bundled"] }
+rusqlite = { version = "0.31.0", features = ["functions", "bundled"] }
 serde = "1"
 serde_derive = "1"
 serde_json = "1"

components/sync15/Cargo.toml

@@ -60,15 +60,15 @@ serde_json = "1"
 serde_path_to_error = "0.1"
 sync-guid = { path = "../support/guid", features = ["random"] }
 thiserror = "1.0"
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 url = { version = "2", optional = true }
 viaduct = { path = "../viaduct", optional = true }
 
 [dev-dependencies]
 env_logger = { version = "0.10", default-features = false }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]

components/sync_manager/Cargo.toml

@@ -24,10 +24,10 @@ serde_derive = "1"
 serde_json = "1"
 parking_lot = ">=0.11,<=0.12"
 interrupt-support = { path = "../support/interrupt" }
-uniffi = { workspace = true }
+uniffi = { version = "0.28.2" }
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
+uniffi = { version = "0.28.2", features=["build"]}
 
 # Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
 [lints.clippy]