From bf7797df5d8899b3f859cf1e3651732d7231ccec Mon Sep 17 00:00:00 2001 From: Ben Dean-Kawamura Date: Thu, 9 Nov 2023 16:07:23 -0500 Subject: [PATCH] Upgarding UniFFI to `0.25.1` Mostly mechanical, the one extra step was to add the `serde::derive` feature to `remote_settings`. I guess it's not pulling that feature in from `uniffi` anymore. --- Cargo.lock | 203 +++++++++++++++--- components/as-ohttp-client/Cargo.toml | 4 +- components/autofill/Cargo.toml | 4 +- components/crashtest/Cargo.toml | 4 +- components/fxa-client/Cargo.toml | 4 +- components/logins/Cargo.toml | 4 +- components/nimbus/Cargo.toml | 4 +- components/places/Cargo.toml | 4 +- components/push/Cargo.toml | 4 +- components/remote_settings/Cargo.toml | 6 +- components/suggest/Cargo.toml | 4 +- components/support/error/Cargo.toml | 4 +- components/support/nimbus-fml/Cargo.toml | 4 +- .../support/rust-log-forwarder/Cargo.toml | 4 +- components/sync15/Cargo.toml | 4 +- components/sync_manager/Cargo.toml | 4 +- components/tabs/Cargo.toml | 4 +- tools/dependency_summary.py | 10 + tools/embedded-uniffi-bindgen/Cargo.toml | 2 +- 19 files changed, 222 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index afa1236049..f9c98d3dff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1598,6 +1598,19 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + [[package]] name = "generic-array" version = "0.14.5" @@ -2229,6 +2242,20 @@ dependencies = [ "url", ] +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "pin-utils", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -2238,6 +2265,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matches" version = "0.1.9" @@ -2632,6 +2668,16 @@ dependencies = [ "nss_build_common", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num" version = "0.2.1" @@ -2800,6 +2846,15 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "oneshot" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4" +dependencies = [ + "loom", +] + [[package]] name = "oorandom" version = "11.1.3" @@ -2890,6 +2945,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.12.1" @@ -3417,7 +3478,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata 0.3.7", - "regex-syntax", + "regex-syntax 0.7.5", ] [[package]] @@ -3425,6 +3486,9 @@ name = "regex-automata" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] [[package]] name = "regex-automata" @@ -3434,9 +3498,15 @@ checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.5", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.7.5" @@ -3815,6 +3885,15 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.1.0" @@ -4196,6 +4275,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + [[package]] name = "time" version = "0.1.44" @@ -4387,9 +4476,21 @@ dependencies = [ "cfg-if 1.0.0", "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + [[package]] name = "tracing-core" version = "0.1.31" @@ -4397,6 +4498,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -4496,9 +4627,9 @@ checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "uniffi" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da26ba712a8547207ededc70f3e0952c09754be9516c320f71731d2f18daf3e" +checksum = "6ba05e3479d824a75256ab5fd7d9cd957f3f19a14e2517546a1ca072a3443bf8" dependencies = [ "anyhow", "camino", @@ -4511,9 +4642,9 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bff3ba24868022fc82e2f1558f3a0fdcc2655e1335459a35f25d1ec4ff1d0c" +checksum = "2f0ab1d77f56b0a0f8e9649975a37cee762e97d20630935c3b47779b1d77efd7" dependencies = [ "anyhow", "askama", @@ -4527,18 +4658,17 @@ dependencies = [ "once_cell", "paste", "serde", - "serde_json", "toml", "uniffi_meta", "uniffi_testing", - "weedle2", + "uniffi_udl", ] [[package]] name = "uniffi_build" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b7cd03e17b997469e5438d1a491c3b9e2d41c2a87c86fd91ba96e87aecba6a" +checksum = "170621ba52f1917a6f2f78efb6a023b917ebc95c0194d533b3e1ee71a7e1f12f" dependencies = [ "anyhow", "camino", @@ -4547,9 +4677,9 @@ dependencies = [ [[package]] name = "uniffi_checksum_derive" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af98d58e238b6aef9ff62a93b5c60caa710bdb49351434a639b9bd7b4c84c808" +checksum = "a189b3bbfdae832dd294befc8c871629833fbe283d89796960768b3e8d5684c8" dependencies = [ "quote", "syn 2.0.26", @@ -4557,25 +4687,25 @@ dependencies = [ [[package]] name = "uniffi_core" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68640fa1b5dfbb4ccc149057c81b40adc51a01d295ce798c15c6c76f7e899907" +checksum = "dcd51aa85d355ce985c6e0c95b1340516b0fe565fb357845143aa29d02c8dda0" dependencies = [ "anyhow", "bytes", "camino", - "cargo_metadata", "log", "once_cell", + "oneshot", "paste", "static_assertions", ] [[package]] name = "uniffi_macros" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f72684ff48a8ff0ee95fde6dbcfa687236ad1789dc18205cb3305432a7b35c" +checksum = "c4cb09cd1e2ede4a35186d1a6491a0376ab9d74f64194ebeb9b640cfd546377d" dependencies = [ "bincode", "camino", @@ -4592,31 +4722,39 @@ dependencies = [ [[package]] name = "uniffi_meta" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3388a58b13dad8f0cdcbdee1c59af6408608ce8d85a3ef5d1429369ca7b217" +checksum = "afeeb9cc3b701cc84762e888a49366737e0487229abd298dd7f58ae58f7692e5" dependencies = [ "anyhow", "bytes", - "serde", "siphasher", "uniffi_checksum_derive", - "uniffi_core", ] [[package]] name = "uniffi_testing" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb437a2c8565249274e381fd88bc75b539897f321b79022c9fe7e275d2c2bbb" +checksum = "c60675fcc9ba5264a0c12ced2332e4b9203e5f1a8d1134cb72ffca6a048ea886" dependencies = [ "anyhow", "camino", "cargo_metadata", "fs-err", "once_cell", - "serde", - "serde_json", +] + +[[package]] +name = "uniffi_udl" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9c5950c95166692ca50ec77d5c9c026c9ccf83cfab563882f3df61502e211d" +dependencies = [ + "anyhow", + "uniffi_meta", + "uniffi_testing", + "weedle2", ] [[package]] @@ -4666,6 +4804,12 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -5016,6 +5160,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.36.1" diff --git a/components/as-ohttp-client/Cargo.toml b/components/as-ohttp-client/Cargo.toml index 8189f5fbca..73954d750c 100644 --- a/components/as-ohttp-client/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" 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.24.1", features=["build"]} +uniffi = { version = "0.25.1", features=["build"]} diff --git a/components/autofill/Cargo.toml b/components/autofill/Cargo.toml index 5ce3728417..e7c3f2f7f4 100644 --- a/components/autofill/Cargo.toml +++ b/components/autofill/Cargo.toml @@ -23,7 +23,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.24.1" +uniffi = "0.25.1" url = { version = "2.2", features = ["serde"] } [dependencies.rusqlite] @@ -36,4 +36,4 @@ libsqlite3-sys = "0.26.0" [build-dependencies] nss_build_common = { path = "../support/rc_crypto/nss/nss_build_common" } -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/crashtest/Cargo.toml b/components/crashtest/Cargo.toml index 9ccf558284..a771c18c9c 100644 --- a/components/crashtest/Cargo.toml +++ b/components/crashtest/Cargo.toml @@ -9,7 +9,7 @@ exclude = ["/android", "/ios"] [dependencies] log = "0.4" thiserror = "1.0" -uniffi = "0.24.1" +uniffi = "0.25.1" [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/fxa-client/Cargo.toml b/components/fxa-client/Cargo.toml index d2d11ff904..390306626c 100644 --- a/components/fxa-client/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } [dev-dependencies] viaduct-reqwest = { path = "../support/viaduct-reqwest" } diff --git a/components/logins/Cargo.toml b/components/logins/Cargo.toml index 8c8f258588..3df2f7e1dd 100644 --- a/components/logins/Cargo.toml +++ b/components/logins/Cargo.toml @@ -27,14 +27,14 @@ error-support = { path = "../support/error" } sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"] } thiserror = "1.0" anyhow = "1.0" -uniffi = "0.24.1" +uniffi = "0.25.1" [dependencies.rusqlite] version = "0.29.0" features = ["limits", "unlock_notify"] [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } [dev-dependencies] more-asserts = "0.2" diff --git a/components/nimbus/Cargo.toml b/components/nimbus/Cargo.toml index 8f34a9470d..619a226182 100644 --- a/components/nimbus/Cargo.toml +++ b/components/nimbus/Cargo.toml @@ -33,7 +33,7 @@ uuid = { version = "0.8", features = ["serde", "v4"]} sha2 = "0.9" hex = "0.4" once_cell = "1" -uniffi = "0.24.1" +uniffi = "0.25.1" 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.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } glean-build = { path = "../external/glean/glean-core/build" } [dev-dependencies] diff --git a/components/places/Cargo.toml b/components/places/Cargo.toml index 3775d68cf7..5ed9b70ce9 100644 --- a/components/places/Cargo.toml +++ b/components/places/Cargo.toml @@ -33,7 +33,7 @@ error-support = { path = "../support/error" } sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"]} thiserror = "1.0" anyhow = "1.0" -uniffi = "0.24.1" +uniffi = "0.25.1" [dependencies.rusqlite] version = "0.29.0" @@ -46,4 +46,4 @@ env_logger = {version = "0.7", default-features = false} sql-support = { path = "../support/sql" } [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/push/Cargo.toml b/components/push/Cargo.toml index 7809f1c583..13f811e33c 100644 --- a/components/push/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" types = { path = "../support/types" } [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } [dev-dependencies] env_logger = { version = "0.8", default-features = false, features = ["termcolor", "atty", "humantime"] } diff --git a/components/remote_settings/Cargo.toml b/components/remote_settings/Cargo.toml index 29e936ce43..9aaba22a99 100644 --- a/components/remote_settings/Cargo.toml +++ b/components/remote_settings/Cargo.toml @@ -11,16 +11,16 @@ exclude = ["/android"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -uniffi = "0.24.1" +uniffi = "0.25.1" thiserror = "1.0" -serde = "1" +serde = { version = "1", features=["derive"] } serde_json = "1" parking_lot = "0.12" viaduct = { path = "../viaduct" } url = "2.1" # mozilla-central can't yet take 2.2 (see bug 1734538) [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } [dev-dependencies] expect-test = "1.4" diff --git a/components/suggest/Cargo.toml b/components/suggest/Cargo.toml index f2ffd28f3b..add3bb300a 100644 --- a/components/suggest/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" [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.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/support/error/Cargo.toml b/components/support/error/Cargo.toml index 6129797c61..b95bc07aba 100644 --- a/components/support/error/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" error-support-macros = { path = "macros" } [dependencies.backtrace] @@ -18,4 +18,4 @@ optional = true version = "0.3" [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/support/nimbus-fml/Cargo.toml b/components/support/nimbus-fml/Cargo.toml index 03f8193c73..9b0af51cf9 100644 --- a/components/support/nimbus-fml/Cargo.toml +++ b/components/support/nimbus-fml/Cargo.toml @@ -27,14 +27,14 @@ 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.24.1", optional = true } +uniffi = { version = "0.25.1", optional = true } cfg-if = "1.0.0" console = "0.15.5" lazy_static = "1.4" email_address = { version = "0.2.4", features = ["serde"] } [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"], optional = true } +uniffi = { version = "0.25.1", features = ["build"], optional = true } [dev-dependencies] tempfile = "3" diff --git a/components/support/rust-log-forwarder/Cargo.toml b/components/support/rust-log-forwarder/Cargo.toml index 8038e37e6e..965b88fd5c 100644 --- a/components/support/rust-log-forwarder/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/sync15/Cargo.toml b/components/sync15/Cargo.toml index fce749249d..26d9310bf5 100644 --- a/components/sync15/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" 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.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/sync_manager/Cargo.toml b/components/sync_manager/Cargo.toml index b3e33bc78f..86d7848bce 100644 --- a/components/sync_manager/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" [build-dependencies] -uniffi = { version = "0.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/components/tabs/Cargo.toml b/components/tabs/Cargo.toml index 559f5f7285..4006b41cdc 100644 --- a/components/tabs/Cargo.toml +++ b/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.24.1" +uniffi = "0.25.1" 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.24.1", features = ["build"] } +uniffi = { version = "0.25.1", features = ["build"] } diff --git a/tools/dependency_summary.py b/tools/dependency_summary.py index c960208251..ad4fe3eda9 100755 --- a/tools/dependency_summary.py +++ b/tools/dependency_summary.py @@ -804,6 +804,16 @@ "fixup": "https://raw.githubusercontent.com/mozilla/uniffi-rs/main/LICENSE", } }, + "uniffi_udl": { + "license_url": { + "check": None, + "fixup": "https://github.com/mozilla/uniffi-rs/blob/main/LICENSE", + }, + "license_file": { + "check": None, + "fixup": "https://raw.githubusercontent.com/mozilla/uniffi-rs/main/LICENSE", + } + }, "uniffi": { "license_url": { "check": None, diff --git a/tools/embedded-uniffi-bindgen/Cargo.toml b/tools/embedded-uniffi-bindgen/Cargo.toml index 1f528bdc8f..885dc72f8e 100644 --- a/tools/embedded-uniffi-bindgen/Cargo.toml +++ b/tools/embedded-uniffi-bindgen/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" license = "MPL-2.0" [dependencies] -uniffi = { version = "0.24.1", features = ["cli"] } +uniffi = { version = "0.25.1", features = ["cli"] }