upgrade uniffi to 0.31

Author: mhammond

Cargo.lock

@@ -564,9 +564,11 @@ The following text applies to code linked from these dependencies:
 [security-framework](https://github.com/kornelski/rust-security-framework),
 [semver](https://github.com/dtolnay/semver),
 [serde](https://github.com/serde-rs/serde),
+[serde_core](https://github.com/serde-rs/serde),
 [serde_derive](https://github.com/serde-rs/serde),
 [serde_json](https://github.com/serde-rs/json),
 [serde_path_to_error](https://github.com/dtolnay/path-to-error),
+[serde_spanned](https://github.com/toml-rs/toml),
 [serde_urlencoded](https://github.com/nox/serde_urlencoded),
 [sha2](https://github.com/RustCrypto/hashes),
 [shlex](https://github.com/comex/rust-shlex),
@@ -582,6 +584,10 @@ The following text applies to code linked from these dependencies:
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
 [toml](https://github.com/alexcrichton/toml-rs),
+[toml](https://github.com/toml-rs/toml),
+[toml_datetime](https://github.com/toml-rs/toml),
+[toml_parser](https://github.com/toml-rs/toml),
+[toml_writer](https://github.com/toml-rs/toml),
 [typenum](https://github.com/paholg/typenum),
 [url](https://github.com/servo/rust-url),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),

DEPENDENCIES.md

@@ -121,7 +121,7 @@ ext.configureUniFFIBindgen = { crateName ->
 
             workingDir project.rootDir
             commandLine bindgen
-            args 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format'
+            args 'generate', '--library', "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format', libraryPath
 
             outputs.dir uniffiOutDir
             // Re-generate when the native megazord library is rebuilt
@@ -143,7 +143,7 @@ ext.configureUniFFIBindgen = { crateName ->
                 }
                 exec {
                     workingDir project.rootDir
-                    commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format'
+                    commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format', libraryPath
                 }
             }
 

build-scripts/component-common.gradle

@@ -23,7 +23,7 @@ serde = "1"
 serde_json = "1"
 thiserror = "2"
 once_cell = "1.5"
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 url = { version = "2", features = ["serde"] }
 uuid = { version = "1.3", features = ["v4"] }
 viaduct = { path = "../viaduct" }
@@ -35,4 +35,4 @@ mockito = { version = "0.31", default-features = false }
 viaduct-dev = { path = "../support/viaduct-dev" }
 
 [build-dependencies]
-uniffi = { version = "0.29.0", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16", features = ["build"] }

components/ads-client/Cargo.toml

@@ -10,12 +10,12 @@ exclude = ["/ios"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 thiserror = "2"
 parking_lot = "0.12"
 rusqlite = { version = "0.37.0", features = ["bundled"] }
 bhttp = "0.7.1"
 ohttp = { version = "0.7.1", default-features = false, features = ["client", "server", "app-svc", "external-sqlite"] }
 
 [build-dependencies]
-uniffi = { version = "0.29.0", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16", features=["build"]}

components/as-ohttp-client/Cargo.toml

@@ -23,7 +23,7 @@ sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"
 sync15 = { path = "../sync15", features = ["sync-engine"] }
 thiserror = "2"
 types = { path = "../support/types" }
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 url = { version = "2.2", features = ["serde"] }
 
 [dev-dependencies]
@@ -32,4 +32,4 @@ nss = { path = "../support/rc_crypto/nss" }
 error-support = { path = "../support/error", features=["testing"] }
 
 [build-dependencies]
-uniffi = { version = "0.29.0", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16", features=["build"]}

components/autofill/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [build-dependencies]
-uniffi = { version = "0.29.0", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16", features=["build"]}
 
 [dependencies]
 chrono = "0.4"
@@ -15,7 +15,7 @@ parking_lot = "0.12"
 serde = "1"
 serde_json = "1"
 thiserror = "2"
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 url = "2"
 uuid = { version = "1.3", features = ["v4"]}
 viaduct = { path = "../viaduct" }

components/context_id/Cargo.toml

@@ -9,7 +9,7 @@ exclude = ["/android", "/ios"]
 [dependencies]
 log = "0.4"
 thiserror = "2"
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 
 [build-dependencies]
-uniffi = { version = "0.29.0", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16", features=["build"]}

components/crashtest/Cargo.toml

@@ -12,7 +12,7 @@ license = "MPL-2.0"
 [dependencies]
 # UniFFI is a dependency for any shared Rust component, make the version match what the other
 # components are using.
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 # app-services support crates that you probably want to use.
 error-support = { path = "../support/error" }
 interrupt-support = { path = "../support/interrupt" }

components/example/Cargo.toml

@@ -11,7 +11,7 @@ error-support = { path = "../support/error" }
 md-5 = "0.10"
 regex = "1"
 thiserror = "2"
-uniffi = { version = "0.29.0" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "5897c6f07068182dc09869fc1810264d17516f16" }
 
 [[bin]]
 name = "import-site-list"