Skip to content

Commit f36114a

Browse files
committed
upgrade uniffi to 0.31
1 parent f46182e commit f36114a

File tree

39 files changed

+226
-346
lines changed

39 files changed

+226
-346
lines changed

Cargo.lock

Lines changed: 91 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-scripts/component-common.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ ext.configureUniFFIBindgen = { crateName ->
121121

122122
workingDir project.rootDir
123123
commandLine bindgen
124-
args 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format'
124+
args 'generate', '--library', "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format', libraryPath
125125

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

components/ads-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ serde = "1"
2323
serde_json = "1"
2424
thiserror = "2"
2525
once_cell = "1.5"
26-
uniffi = { version = "0.29.0" }
26+
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
2727
url = { version = "2", features = ["serde"] }
2828
uuid = { version = "1.3", features = ["v4"] }
2929
viaduct = { path = "../viaduct" }
@@ -35,4 +35,4 @@ mockito = { version = "0.31", default-features = false }
3535
viaduct-dev = { path = "../support/viaduct-dev" }
3636

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

components/as-ohttp-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exclude = ["/ios"]
1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

1212
[dependencies]
13-
uniffi = { version = "0.29.0" }
13+
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
1414
thiserror = "2"
1515
parking_lot = "0.12"
1616
rusqlite = { version = "0.37.0", features = ["bundled"] }
@@ -26,4 +26,4 @@ rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
2626
features = ["client", "server", "app-svc", "external-sqlite"]
2727

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

components/autofill/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"
2323
sync15 = { path = "../sync15", features = ["sync-engine"] }
2424
thiserror = "2"
2525
types = { path = "../support/types" }
26-
uniffi = { version = "0.29.0" }
26+
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
2727
url = { version = "2.2", features = ["serde"] }
2828

2929
[dev-dependencies]
@@ -32,4 +32,4 @@ nss = { path = "../support/rc_crypto/nss" }
3232
error-support = { path = "../support/error", features=["testing"] }
3333

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

components/context_id/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
license = "MPL-2.0"
66

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

1010
[dependencies]
1111
chrono = "0.4"
@@ -15,7 +15,7 @@ parking_lot = "0.12"
1515
serde = "1"
1616
serde_json = "1"
1717
thiserror = "2"
18-
uniffi = { version = "0.29.0" }
18+
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
1919
url = "2"
2020
uuid = { version = "1.3", features = ["v4"]}
2121
viaduct = { path = "../viaduct" }

components/crashtest/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ exclude = ["/android", "/ios"]
99
[dependencies]
1010
log = "0.4"
1111
thiserror = "2"
12-
uniffi = { version = "0.29.0" }
12+
uniffi = { git = "https://github.com/mhammond/uniffi-rs", rev = "ca9495e29ab473ea0f8e417dd49e27e72cc81f1d" }
1313

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

0 commit comments

Comments
 (0)