diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 57bfcc2..63c29b4 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -45,7 +45,7 @@ jobs: if: ${{ matrix.rust.clippy }} run: cargo clippy --all-targets --features "uniffi/bindgen-tests uniffi/cli" -- -D warnings - name: Test - run: CLASSPATH=./tests/jna/jna-5.8.0.jar cargo test + run: CLASSPATH=./tests/jna/jna-5.8.0.jar cargo test --features uniffi/bindgen-tests,uniffi/cli fmt: name: Rust fmt diff --git a/Cargo.lock b/Cargo.lock index a09eb6b..7e603be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1296,6 +1296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f71cc01459bc34cfe43fabf32b39f1228709bc6db1b3a664a92940af3d062376" dependencies = [ "anyhow", + "uniffi_bindgen 0.23.0", "uniffi_build", "uniffi_core", "uniffi_macros", diff --git a/bdk-ffi/Cargo.toml b/bdk-ffi/Cargo.toml index 0dac7a7..c612219 100644 --- a/bdk-ffi/Cargo.toml +++ b/bdk-ffi/Cargo.toml @@ -6,7 +6,8 @@ edition = "2018" license = "MIT OR Apache-2.0" [lib] -crate-type = ["staticlib", "cdylib"] +crate-type = ["lib", "staticlib", "cdylib"] +#crate-type = ["staticlib", "cdylib"] name = "bdkffi" [[bin]] @@ -21,4 +22,5 @@ uniffi = { version = "0.23.0" } uniffi = { version = "0.23.0", features = ["build"] } [dev-dependencies] +uniffi = { version = "0.23.0", features = ["bindgen-tests"] } assert_matches = "1.5.0" diff --git a/bdk-ffi/tests/test_generated_bindings.rs b/bdk-ffi/tests/test_generated_bindings.rs index 943c277..0f334db 100644 --- a/bdk-ffi/tests/test_generated_bindings.rs +++ b/bdk-ffi/tests/test_generated_bindings.rs @@ -1,8 +1,5 @@ -uniffi_macros::build_foreign_language_testcases!( - ["src/bdk.udl",], - [ - "tests/bindings/test.kts", - "tests/bindings/test.swift", - "tests/bindings/test.py" - ] +uniffi::build_foreign_language_testcases!( + "tests/bindings/test.kts", + "tests/bindings/test.swift", + "tests/bindings/test.py", );