Merge #32: Make uniffi an optional feature

6ccaea6 Make `uniffi` an optional feature (Praveen Perera)

Pull request description:

ACKs for top commit:
  notmandatory:
    ACK 6ccaea6

Tree-SHA512: f09db2fb3d147051ee9045bbc25dd6386066bd69ba4445b9ccfbc884767bb48f4ed034661fc34590c92c85759b4cf69bdac912d2636ed8a9bc9886813b680134

Author: notmandatory

cktap-swift/build-xcframework.sh

@@ -40,6 +40,7 @@ cargo build --package rust-cktap --profile release-smaller --target aarch64-appl
 
 # Then run uniffi-bindgen
 cargo run --bin uniffi-bindgen generate \
+    --features uniffi \
     --library target/aarch64-apple-ios/release-smaller/librust_cktap.dylib \
     --language swift \
     --out-dir cktap-swift/Sources/CKTap \

lib/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 crate-type = ["lib", "staticlib", "cdylib"]
 name = "rust_cktap"
 
+
 [dependencies]
 ciborium = "0.2.0"
 serde = "1"
@@ -25,15 +26,16 @@ bitcoin = { version = "0.32", features = ["rand-std"] }
 # logging
 log = "0.4"
 
-# uniffi todo: make this optional
-uniffi = { version = "0.29.1", features = ["cli"] }
+# uniffi 
+uniffi = { version = "0.29", features = ["cli"], optional = true }
 
 pcsc = { version = "2", optional = true }
 
 [build-dependencies]
 uniffi = { version = "0.29.1", features = ["build"] }
 
 [features]
+uniffi = ["dep:uniffi"]
 default = []
 emulator = []
 

lib/src/lib.rs

@@ -1,3 +1,4 @@
+#[cfg(feature = "uniffi")]
 uniffi::setup_scaffolding!();
 
 extern crate core;
@@ -13,7 +14,10 @@ pub use bitcoin::secp256k1::{self, rand};
 
 #[cfg(feature = "emulator")]
 pub mod emulator;
+
+#[cfg(feature = "uniffi")]
 mod ffi;
+
 #[cfg(feature = "pcsc")]
 pub mod pcsc;
 pub mod sats_card;

lib/src/uniffi-bindgen.rs

@@ -1,3 +1,4 @@
 fn main() {
+    #[cfg(feature = "uniffi")]
     uniffi::uniffi_bindgen_main()
 }