Merge pull request #3669 from matrix-org/misc/update-uniffi-to-0.28.0

chore: update UniFFI to `v0.28.0`

Cargo.toml

@@ -72,8 +72,8 @@ tokio-stream = "0.1.14"
 tracing = { version = "0.1.40", default-features = false, features = ["std"] }
 tracing-core = "0.1.32"
 tracing-subscriber = "0.3.18"
-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"

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(())
 }
 

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};