Merge branch 'main' of github.com:antoniusnaumann/cargo-swift into main

antoniusnaumann · Sep 7, 2024 · d52ae49 · d52ae49
2 parents a6ec82f + 9d8b87c
commit d52ae49
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 49 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -15,6 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Cargo Outdated
-        run: cargo outdated --exit-code 1
+        run: cargo outdated -i cargo_metadata --exit-code 1
       - name: Cargo Audit
         run: cargo audit -D warnings
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ exclude = ["/readme", "/.github", "/testing", "/swift-examples", "*-DRAFT.md"]
 
 [dependencies]
 camino = "1.1.7"
-cargo_metadata = "0.18.1"
+cargo_metadata = "0.15.4"
 clap = { version = "4.5.11", features = ["derive"] }
 convert_case = "0.6.0"
 glob = "0.3.1"
@@ -35,7 +35,7 @@ execute = "0.2.13"
 indicatif = "0.17.8"
 
 # FFI Bindings
-uniffi_bindgen = { version = "0.28.0" }
+uniffi_bindgen = { version = "=0.28.1" }
 
 # Error Handling
 anyhow = "1.0.86"

diff --git a/src/bindings.rs b/src/bindings.rs
@@ -3,9 +3,9 @@ use std::{
     io,
 };
 
-use crate::Result;
+use crate::{metadata::metadata, Result};
 use camino::Utf8Path;
-use uniffi_bindgen::bindings::SwiftBindingGenerator;
+use uniffi_bindgen::{bindings::SwiftBindingGenerator, cargo_metadata::CrateConfigSupplier};
 
 use crate::recreate_dir;
 
@@ -23,6 +23,7 @@ pub fn generate_bindings(lib_path: &Utf8Path) -> Result<()> {
         lib_path,
         None,
         &SwiftBindingGenerator {},
+        &CrateConfigSupplier::from(metadata().clone()),
         None,
         out_dir,
         false,