Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 91 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions build-scripts/component-common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
}

Expand Down
4 changes: 2 additions & 2 deletions components/ads-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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"] }
4 changes: 2 additions & 2 deletions components/as-ohttp-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
4 changes: 2 additions & 2 deletions components/autofill/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"]}
Loading