Update UniFFI library access

src/bindings.rs

@@ -5,7 +5,7 @@ use std::{
 
 use crate::Result;
 use camino::Utf8Path;
-use uniffi_bindgen::{bindings::TargetLanguage, BindingGeneratorDefault};
+use uniffi_bindgen::bindings::SwiftBindingGenerator;
 
 use crate::recreate_dir;
 
@@ -22,10 +22,7 @@ pub fn generate_bindings(lib_path: &Utf8Path) -> Result<()> {
     let uniffi_outputs = uniffi_bindgen::library_mode::generate_bindings(
         lib_path,
         None,
-        &BindingGeneratorDefault {
-            target_languages: vec![TargetLanguage::Swift],
-            try_format_code: false,
-        },
+        &SwiftBindingGenerator {},
         None,
         out_dir,
         false,
@@ -37,7 +34,7 @@ pub fn generate_bindings(lib_path: &Utf8Path) -> Result<()> {
         .open(headers.join("module.modulemap"))?;
 
     for output in uniffi_outputs {
-        let crate_name = output.crate_name;
+        let crate_name = output.ci.crate_name();
         fs::copy(
             out_dir.join(format!("{crate_name}.swift")),
             sources.join(format!("{crate_name}.swift")),

src/metadata.rs

@@ -22,7 +22,6 @@ pub(crate) fn metadata() -> &'static Metadata {
 
 pub(crate) trait MetadataExt {
     fn target_dir(&self) -> Cow<Utf8Path>;
-    fn uniffi_crates(&self) -> Vec<&Package>;
     fn current_crate(&self) -> Option<&Package>;
 }
 
@@ -37,20 +36,6 @@ impl MetadataExt for Metadata {
         }
     }
 
-    /// Returns the package metadata for all crates that depend on UniFFI and are below, at or above the current working directory.
-    fn uniffi_crates(&self) -> Vec<&Package> {
-        let cwd = std::env::current_dir().unwrap();
-        // TODO: also include crates that are above the current working directory
-        let crates: Vec<_> = self
-            .workspace_packages()
-            .into_iter()
-            .filter(|package| package.manifest_path.starts_with(&cwd))
-            // TODO: Filter out the crates that depend on UniFFI
-            .collect();
-
-        crates
-    }
-
     /// Returns the package metadata for the crate currently at or above the current working directory.
     fn current_crate(&self) -> Option<&Package> {
         let cwd = std::env::current_dir().unwrap();