Skip to content

upgrade uniffi to 0.31 #7140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mhammond wants to merge 1 commit into
base: main
Choose a base branch
from
+315 −362
Draft

upgrade uniffi to 0.31 #7140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
238 changes: 180 additions & 58 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build-scripts/component-common.gradle
View file
Open in desktop
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
View file
Open in desktop
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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }
4 changes: 2 additions & 2 deletions components/as-ohttp-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ 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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
thiserror = "2"
parking_lot = "0.12"
rusqlite = { version = "0.37.0", features = ["bundled"] }
Expand All @@ -26,4 +26,4 @@ rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
features = ["client", "server", "app-svc", "external-sqlite"]

[build-dependencies]
uniffi = { version = "0.29.0", features=["build"]}
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}
4 changes: 2 additions & 2 deletions components/autofill/Cargo.toml
View file
Open in desktop
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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}
4 changes: 2 additions & 2 deletions components/context_id/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
license = "MPL-2.0"

[build-dependencies]
uniffi = { version = "0.29.0", features=["build"]}
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}

[dependencies]
chrono = "0.4"
Expand All @@ -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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
url = "2"
uuid = { version = "1.3", features = ["v4"]}
viaduct = { path = "../viaduct" }
Expand Down
4 changes: 2 additions & 2 deletions components/crashtest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exclude = ["/android", "/ios"]
[dependencies]
log = "0.4"
thiserror = "2"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[build-dependencies]
uniffi = { version = "0.29.0", features=["build"]}
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}
2 changes: 1 addition & 1 deletion components/example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
# app-services support crates that you probably want to use.
error-support = { path = "../support/error" }
interrupt-support = { path = "../support/interrupt" }
Expand Down
2 changes: 1 addition & 1 deletion components/filter_adult/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[[bin]]
name = "import-site-list"
Expand Down
4 changes: 2 additions & 2 deletions components/fxa-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ error-support = { path = "../support/error", features = ["tracing-logging"] }
thiserror = "2"
anyhow = "1.0"
sync-guid = { path = "../support/guid", features = ["random"] }
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
payload-support = { path = "../support/payload" }
nss = { path = "../support/rc_crypto/nss" }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[dev-dependencies]
viaduct-dev = { path = "../support/viaduct-dev"}
Expand Down
2 changes: 1 addition & 1 deletion components/init_rust_components/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ keydb = ["nss/keydb"]
ohttp = ["dep:viaduct", "viaduct/ohttp"]

[dependencies]
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
nss = { path = "../support/rc_crypto/nss" }
viaduct = { path = "../viaduct", optional = true }
4 changes: 2 additions & 2 deletions components/logins/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ rusqlite = { version = "0.37.0", features = ["limits", "unlock_notify"] }
sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"] }
thiserror = "2"
anyhow = "1.0"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
async-trait = { version = "0.1", optional = true }
futures = { version = "0.3", optional = true, features = ["executor"] }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[dev-dependencies]
error-support = { path = "../support/error", features = ["testing"] }
Expand Down
2 changes: 2 additions & 0 deletions components/logins/src/encryption.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ use nss::pk11::sym_key::{
/// Note that EncryptorDecryptor must not call any LoginStore methods. The login store can call out
/// to the EncryptorDecryptor when it's internal mutex is held so calling back in to the LoginStore
/// may deadlock.
#[uniffi::trait_interface]
pub trait EncryptorDecryptor: Send + Sync {
fn encrypt(&self, cleartext: Vec<u8>) -> ApiResult<Vec<u8>>;
fn decrypt(&self, ciphertext: Vec<u8>) -> ApiResult<Vec<u8>>;
Expand Down Expand Up @@ -152,6 +153,7 @@ impl EncryptorDecryptor for ManagedEncryptorDecryptor {

/// Consumers can implement the KeyManager in combination with the ManagedEncryptorDecryptor to hand
/// over the encryption key whenever encryption or decryption happens.
#[uniffi::trait_interface]
pub trait KeyManager: Send + Sync {
fn get_key(&self) -> ApiResult<Vec<u8>>;
}
Expand Down
4 changes: 2 additions & 2 deletions components/merino/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
url = "2"
Expand All @@ -13,4 +13,4 @@ error-support = { path = "../support/error" }
thiserror = "2"

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }
4 changes: 2 additions & 2 deletions components/nimbus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ uuid = { version = "1.3", features = ["serde", "v4"]}
sha2 = "^0.10"
hex = "0.4"
once_cell = "1"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
chrono = { version = "0.4", features = ["serde"]}
icu_segmenter = "2"
error-support = { path = "../support/error" }
Expand All @@ -42,7 +42,7 @@ regex = { version = "1.9", optional = true }
firefox-versioning = { path = "../support/firefox-versioning", optional = true }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[dev-dependencies]
error-support = { path = "../support/error", features = ["testing"] }
Expand Down
1 change: 1 addition & 0 deletions components/nimbus/src/stateful/targeting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ impl NimbusTargetingHelper {
}
}

#[uniffi::trait_interface]
pub trait RecordedContext: Send + Sync {
/// Returns a JSON representation of the context object
///
Expand Down
4 changes: 2 additions & 2 deletions components/places/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ error-support = { path = "../support/error" }
sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"]}
thiserror = "2"
anyhow = "1.0"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[dev-dependencies]
error-support = { path = "../support/error", features = ["testing"] }
tempfile = "3.1"
sql-support = { path = "../support/sql" }

[build-dependencies]
uniffi = { version = "0.29.0", features=["build"]}
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}
4 changes: 2 additions & 2 deletions components/push/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ error-support = { path = "../support/error" }
sql-support = { path = "../support/sql" }
rc_crypto = { path = "../support/rc_crypto", features = ["ece"] }
thiserror = "2"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
types = { path = "../support/types" }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[dev-dependencies]
error-support = { path = "../support/error", features = ["testing"] }
Expand Down
4 changes: 2 additions & 2 deletions components/relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ serde_json = "1"
thiserror = "2"
url = "2"
viaduct = { path = "../viaduct" }
uniffi = "0.29.0"
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[dev-dependencies]
expect-test = "1.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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}
4 changes: 2 additions & 2 deletions components/relevancy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_path_to_error = "0.1"
thiserror = "2"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
url = "2.5"
remote_settings = { path = "../remote_settings"}
base64 = "0.21.2"

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[lib]

Expand Down
4 changes: 2 additions & 2 deletions components/remote_settings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ signatures = ["dep:canonical_json", "dep:rc_crypto"]
# 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/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
thiserror = "2"
serde = { version = "1", features=["derive"] }
serde_json = "1"
Expand All @@ -35,7 +35,7 @@ canonical_json = { version = "0.5", optional = true }
rc_crypto = { path = "../support/rc_crypto", optional = true }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[dev-dependencies]
expect-test = "1.4"
Expand Down
4 changes: 2 additions & 2 deletions components/search/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ remote_settings = { path = "../remote_settings" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
thiserror = "2"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
firefox-versioning = { path = "../support/firefox-versioning" }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[dev-dependencies]
error-support = { path = "../support/error", features = ["testing"] }
Expand Down
4 changes: 2 additions & 2 deletions components/suggest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sql-support = { path = "../support/sql" }
viaduct = { path = "../viaduct" }
tempfile = { version = "3.2.0", optional = true }
thiserror = "2"
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
url = { version = "2.1", features = ["serde"] }

[dev-dependencies]
Expand All @@ -39,7 +39,7 @@ itertools = "0.14"
rc_crypto = { path = "../support/rc_crypto" }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }

[features]
# Required for the benchmarks to work, wasted bytes otherwise.
Expand Down
4 changes: 2 additions & 2 deletions components/support/error/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ log = { version = "0.4" }
parking_lot = { version = ">=0.11,<=0.12" }
tracing = { version = "0.1", optional = true }
tracing-support = { path = "../tracing", optional = true }
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[build-dependencies]
uniffi = { version = "0.29.0", features=["build"]}
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}

[features]
backtrace = ["dep:backtrace"]
Expand Down
4 changes: 2 additions & 2 deletions components/support/interrupt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
lazy_static = "1.4"
parking_lot = ">=0.11,<=0.12"
rusqlite = { version = "0.37.0", features = ["functions", "limits", "bundled", "unlock_notify"] }
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }
4 changes: 2 additions & 2 deletions components/support/nimbus-fml/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name = "nimbus_fml"
name = "nimbus-fml"

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"], optional = true }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"], optional = true }

[dev-dependencies]
tempfile = "3"
Expand All @@ -44,7 +44,7 @@ heck = "0.5"
icu_segmenter = "2"
url = { version = "2", features = ["serde"] }
glob = "0.3.0"
uniffi = { version = "0.29.0", optional = true }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", optional = true }
cfg-if = "1.0.0"
lazy_static = "1.4"
sha2 = "^0.10"
Expand Down
4 changes: 2 additions & 2 deletions components/support/rust-log-forwarder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MPL-2.0"
exclude = ["/android", "/ios"]

[dependencies]
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
error-support = { path = "../error", default-features = false, features = ["tracing-logging"] }
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
tracing-support = { path = "../tracing" }
Expand All @@ -16,4 +16,4 @@ tracing-support = { path = "../tracing" }
tracing = "0.1"

[build-dependencies]
uniffi = { version = "0.29.0", features=["build"]}
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features=["build"]}
4 changes: 2 additions & 2 deletions components/support/tracing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ parking_lot = "0.12"
serde_json = "1"
tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }

[dev-dependencies]
tracing-subscriber = { version = "0.3", default-features = false }

[build-dependencies]
uniffi = { version = "0.29.0", features = ["build"] }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d", features = ["build"] }
2 changes: 1 addition & 1 deletion components/support/viaduct-hyper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ viaduct = { path = "../../viaduct" }
hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp"] }
hyper-tls = { version = "0.5", features = ["vendored"] }
tokio = { version = "1", features = ["rt-multi-thread"] }
uniffi = { version = "0.29.0" }
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
url = "2"
Loading
Loading