Use uniffi as a workspace dependency

Cargo.toml

@@ -122,6 +122,7 @@ default-members = [
 [workspace.dependencies]
 rusqlite = "0.30.0"
 libsqlite3-sys = "0.27.0"
+uniffi = "0.25.2"
 
 [profile.release]
 opt-level = "s"
@@ -132,10 +133,3 @@ lto = "thin"
 # We always want to use the local version of our own crates in that case.
 [patch."https://github.com/mozilla/application-services"]
 viaduct = { path = "components/viaduct" }
-
-# If you need to test some local changes to UniFFI, uncomment the following line
-# for a convenient way to use a local checkout rather than the published version.
-# You just have to make sure that the version number in your local checkout
-# matches the one used in the `Cargo.toml` files in this workspace.
-#[patch.crates-io]
-#uniffi = { path = "../uniffi-rs/uniffi" }

components/as-ohttp-client/Cargo.toml

@@ -10,7 +10,7 @@ exclude = ["/ios"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 thiserror = "1.0"
 bhttp = "0.3"
 parking_lot = "0.12"
@@ -24,4 +24,4 @@ rev = "fc3f4c787d1f6a6a87bf5194f7152cc906b02973"
 features = ["client", "server", "app-svc", "external-sqlite"]
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features=["build"]}
+uniffi = { workspace = true, features=["build"]}

components/autofill/Cargo.toml

@@ -24,7 +24,7 @@ sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"
 sync15 = { path = "../sync15", features = ["sync-engine"] }
 thiserror = "1.0"
 types = { path = "../support/types" }
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 url = { version = "2.2", features = ["serde"] }
 
 [dev-dependencies]
@@ -33,4 +33,4 @@ libsqlite3-sys = { workspace = true }
 
 [build-dependencies]
 nss_build_common = { path = "../support/rc_crypto/nss/nss_build_common" }
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/crashtest/Cargo.toml

@@ -9,7 +9,7 @@ exclude = ["/android", "/ios"]
 [dependencies]
 log = "0.4"
 thiserror = "1.0"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/fxa-client/Cargo.toml

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

components/logins/Cargo.toml

@@ -28,10 +28,10 @@ rusqlite = { workspace = true, features = ["limits", "unlock_notify"] }
 sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"] }
 thiserror = "1.0"
 anyhow = "1.0"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }
 
 [dev-dependencies]
 more-asserts = "0.2"

components/nimbus/Cargo.toml

@@ -33,7 +33,7 @@ uuid = { version = "0.8", features = ["serde", "v4"]}
 sha2 = "^0.10"
 hex = "0.4"
 once_cell = "1"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 chrono = { version = "0.4", features = ["serde"]}
 unicode-segmentation = "1.8.0"
 error-support = { path = "../support/error" }
@@ -41,7 +41,7 @@ remote_settings = { path = "../remote_settings", optional = true }
 cfg-if = "1.0.0"
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }
 glean-build = { path = "../external/glean/glean-core/build" }
 
 [dev-dependencies]

components/places/Cargo.toml

@@ -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 = "0.25.2"
+uniffi = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = "0.6"
@@ -43,4 +43,4 @@ env_logger = {version = "0.7", default-features = false}
 sql-support = { path = "../support/sql" }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/push/Cargo.toml

@@ -20,11 +20,11 @@ error-support = { path = "../support/error" }
 sql-support = { path = "../support/sql" }
 rc_crypto = { path = "../support/rc_crypto", features = ["ece"] }
 thiserror = "1.0"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 types = { path = "../support/types" }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }
 
 [dev-dependencies]
 env_logger = { version = "0.8", default-features = false, features = ["termcolor", "atty", "humantime"] }

components/remote_settings/Cargo.toml

@@ -11,7 +11,7 @@ exclude = ["/android"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 thiserror = "1.0"
 serde = { version = "1", features=["derive"] }
 serde_json = "1"
@@ -20,7 +20,7 @@ viaduct = { path = "../viaduct" }
 url = "2.1" # mozilla-central can't yet take 2.2 (see bug 1734538)
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }
 
 [dev-dependencies]
 expect-test = "1.4"

components/suggest/Cargo.toml

@@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sql-support = { path = "../support/sql" }
 thiserror = "1"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 
 [dev-dependencies]
 env_logger = { version = "0.7", default-features = false }
@@ -28,4 +28,4 @@ hex = "0.4"
 rc_crypto = { path = "../support/rc_crypto" }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/support/error/Cargo.toml

@@ -10,7 +10,7 @@ autotests = false
 log = "0.4"
 lazy_static = { version = "1.4" }
 parking_lot = { version = ">=0.11,<=0.12" }
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 error-support-macros = { path = "macros" }
 
 [dependencies.backtrace]
@@ -18,4 +18,4 @@ optional = true
 version = "0.3"
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, 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", "native-tls-vendored"] }
 glob = "0.3.0"
-uniffi = { version = "0.25.2", optional = true }
+uniffi = { workspace = true, optional = true }
 cfg-if = "1.0.0"
 console = "0.15.5"
 lazy_static = "1.4"
@@ -35,7 +35,7 @@ email_address = { version = "0.2.4", features = ["serde"] }
 sha2 = "^0.10"
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"], optional = true }
+uniffi = { workspace = true, features = ["build"], optional = true }
 
 [dev-dependencies]
 tempfile = "3"

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

@@ -9,7 +9,7 @@ exclude = ["/android", "/ios"]
 [dependencies]
 log = "0.4"
 parking_lot = ">=0.11,<=0.12"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/sync15/Cargo.toml

@@ -60,7 +60,7 @@ serde_json = "1"
 serde_path_to_error = "0.1"
 sync-guid = { path = "../support/guid", features = ["random"] }
 thiserror = "1.0"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 url = { version = "2.1", optional = true } # mozilla-central can't yet take 2.2 (see bug 1734538)
 viaduct = { path = "../viaduct", optional = true }
 
@@ -68,4 +68,4 @@ viaduct = { path = "../viaduct", optional = true }
 env_logger = { version = "0.7", default-features = false }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/sync_manager/Cargo.toml

@@ -24,7 +24,7 @@ serde_derive = "1"
 serde_json = "1"
 parking_lot = ">=0.11,<=0.12"
 interrupt-support = { path = "../support/interrupt" }
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

components/tabs/Cargo.toml

@@ -20,7 +20,7 @@ sql-support = { path = "../support/sql" }
 sync-guid = { path = "../support/guid", features = ["random"] }
 sync15 = { path = "../sync15", features = ["sync-engine"] }
 thiserror = "1.0"
-uniffi = "0.25.2"
+uniffi = { workspace = true }
 url = "2.1" # mozilla-central can't yet take 2.2 (see bug 1734538)
 
 [dev-dependencies]
@@ -28,4 +28,4 @@ env_logger = { version = "0.8.0", default-features = false, features = ["termcol
 tempfile = "3.1"
 
 [build-dependencies]
-uniffi = { version = "0.25.2", features = ["build"] }
+uniffi = { workspace = true, features = ["build"] }

tools/embedded-uniffi-bindgen/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-uniffi = { version = "0.25.2", features = ["cli"] }
+uniffi = { workspace = true, features = ["cli"] }