Switch to using uniffi_cli

Author: praveenperera

rust/Cargo.lock

@@ -7,13 +7,6 @@ edition = "2024"
 crate-type = ["lib", "staticlib", "cdylib"]
 name = "cove"
 
-[[bin]]
-name = "uniffi-bindgen"
-path = "src/bin/uniffi-bindgen.rs"
-
-[features]
-default = ["uniffi/cli"]
-
 [workspace]
 members = ["crates/*"]
 

rust/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "uniffi_cli"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+uniffi = { workspace = true, features = ["cli"] }

rust/crates/uniffi_cli/Cargo.toml

@@ -29,7 +29,7 @@ cp target/aarch64-linux-android/release/libcove.so ../android/app/src/main/jniLi
 cp target/x86_64-linux-android/release/libcove.so ../android/app/src/main/jniLibs/x86_64/libcoveffi.so
 
 # Create Kotlin bindings
-cargo run --bin uniffi-bindgen generate \
+cargo run -p uniffi_cli generate \
     --library target/aarch64-linux-android/release/libcove.so \
     --language kotlin \
     --out-dir ../android/app/src/main/java \

rust/src/bin/uniffi-bindgen.rs renamed to rust/crates/uniffi_cli/src/main.rs

@@ -62,7 +62,8 @@ mkdir -p "$OUTPUT_DIR"
 
 echo "Running uniffi-bindgen for ${TARGETS[0]}, outputting to $OUTPUT_DIR"
 rm -rf $OUTPUT_DIR || true
-cargo run --bin uniffi-bindgen -- "$STATIC_LIB_PATH" "$OUTPUT_DIR" \
+cargo run -p uniffi_cli \
+    -- "$STATIC_LIB_PATH" "$OUTPUT_DIR" \
     --swift-sources --headers \
     --modulemap --module-name cove_core_ffi \
     --modulemap-filename module.modulemap
@@ -73,7 +74,6 @@ SPM_PACKAGE="../ios/CoveCore/"
 XCFRAMEWORK_OUTPUT="$SPM_PACKAGE/Sources/cove_core_ffi.xcframework"
 GENERATED_SWIFT_SOURCES=$SPM_PACKAGE/Sources/CoveCore/generated
 
-
 rm -rf "$XCFRAMEWORK_OUTPUT" || true
 xcodebuild -create-xcframework \
         $LIBRARY_FLAGS \