diff --git a/Cargo.lock b/Cargo.lock index 27318477b..989039b18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3962,12 +3962,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "oneshot-uniffi" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c548d5c78976f6955d72d0ced18c48ca07030f7a1d4024529fedd7c1c01b29c" - [[package]] name = "oorandom" version = "11.1.3" @@ -5934,8 +5928,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", - "unicode-linebreak", - "unicode-width", ] [[package]] @@ -6388,12 +6380,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - [[package]] name = "unicode-normalization" version = "0.1.23" @@ -6423,9 +6409,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "uniffi" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5566fae48a5cb017005bf9cd622af5236b2a203a13fb548afde3506d3c68277" +checksum = "f31bff6daf87277a9014bcdefbc2842b0553392919d1096843c5aad899ca4588" dependencies = [ "anyhow", "camino", @@ -6445,19 +6431,18 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a77bb514bcd4bf27c9bd404d7c3f2a6a8131b957eba9c22cfeb7751c4278e09" +checksum = "96061d7e01b185aa405f7c9b134741ab3e50cc6796a47d6fd8ab9a5364b5feed" dependencies = [ "anyhow", "askama", "camino", "cargo_metadata", - "clap", "fs-err", "glob", "goblin", - "heck 0.4.1", + "heck 0.5.0", "once_cell", "paste", "serde", @@ -6470,9 +6455,9 @@ dependencies = [ [[package]] name = "uniffi_build" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45cba427aeb7b3a8b54830c4c915079a7a3c62608dd03dddba1d867a8a023eb4" +checksum = "9d6b86f9b221046af0c533eafe09ece04e2f1ded04ccdc9bba0ec09aec1c52bd" dependencies = [ "anyhow", "camino", @@ -6481,9 +6466,9 @@ dependencies = [ [[package]] name = "uniffi_checksum_derive" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae7e5a6c33b1dec3f255f57ec0b6af0f0b2bb3021868be1d5eec7a38e2905ebc" +checksum = "2fcfa22f55829d3aaa7acfb1c5150224188fe0f27c59a8a3eddcaa24d1ffbe58" dependencies = [ "quote", "syn 2.0.63", @@ -6491,9 +6476,9 @@ dependencies = [ [[package]] name = "uniffi_core" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea3eb5474d50fc149b7e4d86b9c5bd4a61dcc167f0683902bf18ae7bbb3deef" +checksum = "3210d57d6ab6065ab47a2898dacdb7c606fd6a4156196831fa3bf82e34ac58a6" dependencies = [ "anyhow", "async-compat", @@ -6501,16 +6486,15 @@ dependencies = [ "camino", "log", "once_cell", - "oneshot-uniffi", "paste", "static_assertions", ] [[package]] name = "uniffi_macros" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18331d35003f46f0d04047fbe4227291815b83a937a8c32bc057f990962182c4" +checksum = "b58691741080935437dc862122e68d7414432a11824ac1137868de46181a0bd2" dependencies = [ "bincode", "camino", @@ -6526,9 +6510,9 @@ dependencies = [ [[package]] name = "uniffi_meta" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7224422c4cfd181c7ca9fca2154abca4d21db962f926f270f996edd38b0c4b8" +checksum = "7663eacdbd9fbf4a88907ddcfe2e6fa85838eb6dc2418a7d91eebb3786f8e20b" dependencies = [ "anyhow", "bytes", @@ -6538,9 +6522,9 @@ dependencies = [ [[package]] name = "uniffi_testing" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ce878d0bdfc288b58797044eaaedf748526c56eef3575380bb4d4b19d69eee" +checksum = "f922465f7566f25f8fe766920205fdfa9a3fcdc209c6bfb7557f0b5bf45b04dd" dependencies = [ "anyhow", "camino", @@ -6551,9 +6535,9 @@ dependencies = [ [[package]] name = "uniffi_udl" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c43c9ed40a8d20a5c3eae2d23031092db6b96dc8e571beb449ba9757484cea0" +checksum = "cef408229a3a407fafa4c36dc4f6ece78a6fb258ab28d2b64bddd49c8cb680f6" dependencies = [ "anyhow", "textwrap", diff --git a/Cargo.toml b/Cargo.toml index 48bab8ad8..eab785750 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,8 +67,8 @@ tokio = { version = "1.30.0", default-features = false, features = ["sync"] } tokio-stream = "0.1.14" tracing = { version = "0.1.40", default-features = false, features = ["std"] } tracing-core = "0.1.32" -uniffi = { version = "0.27.1" } -uniffi_bindgen = { version = "0.27.1" } +uniffi = { version = "0.28.0" } +uniffi_bindgen = { version = "0.28.0" } url = "2.5.0" vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "4ef989c6a8eba0bc809e285a081c56320a9bbf1e" } wiremock = "0.6.0" diff --git a/xtask/src/kotlin.rs b/xtask/src/kotlin.rs index df2812545..8aca51478 100644 --- a/xtask/src/kotlin.rs +++ b/xtask/src/kotlin.rs @@ -2,9 +2,7 @@ use std::fs::create_dir_all; use camino::{Utf8Path, Utf8PathBuf}; use clap::{Args, Subcommand, ValueEnum}; -use uniffi_bindgen::{ - bindings::TargetLanguage, library_mode::generate_bindings, BindingGeneratorDefault, -}; +use uniffi_bindgen::{bindings::KotlinBindingGenerator, library_mode::generate_bindings}; use xshell::{cmd, pushd}; use crate::{workspace, Result}; @@ -122,17 +120,7 @@ fn build_android_library( fn generate_uniffi_bindings(library_path: &Utf8Path, ffi_generated_dir: &Utf8Path) -> Result<()> { println!("-- library_path = {library_path}"); - generate_bindings( - library_path, - None, - &BindingGeneratorDefault { - target_languages: vec![TargetLanguage::Kotlin], - try_format_code: false, - }, - None, - ffi_generated_dir, - false, - )?; + generate_bindings(library_path, None, &KotlinBindingGenerator, None, ffi_generated_dir, false)?; Ok(()) } diff --git a/xtask/src/swift.rs b/xtask/src/swift.rs index f00271c11..95ea96e71 100644 --- a/xtask/src/swift.rs +++ b/xtask/src/swift.rs @@ -5,9 +5,7 @@ use std::{ use camino::{Utf8Path, Utf8PathBuf}; use clap::{Args, Subcommand}; -use uniffi_bindgen::{ - bindings::swift::gen_swift::SwiftBindingGenerator, library_mode::generate_bindings, -}; +use uniffi_bindgen::{bindings::SwiftBindingGenerator, library_mode::generate_bindings}; use xshell::{cmd, pushd}; use crate::{workspace, Result};