From d447aac9aeb04370405a9744770485377b932ba1 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Fri, 2 Sep 2022 13:11:31 -0400 Subject: [PATCH 1/3] Update uniffi-bindgen to 0.19.5 --- bdk-ffi-bindgen/Cargo.toml | 2 +- bdk-ffi-bindgen/src/main.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bdk-ffi-bindgen/Cargo.toml b/bdk-ffi-bindgen/Cargo.toml index 7cbc75a..2c27b1e 100644 --- a/bdk-ffi-bindgen/Cargo.toml +++ b/bdk-ffi-bindgen/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] anyhow = "=1.0.45" # remove after upgrading to next version of uniffi structopt = "0.3" -uniffi_bindgen = "=0.19.3" +uniffi_bindgen = "0.19.5" camino = "1.0.9" diff --git a/bdk-ffi-bindgen/src/main.rs b/bdk-ffi-bindgen/src/main.rs index 500669c..215c824 100644 --- a/bdk-ffi-bindgen/src/main.rs +++ b/bdk-ffi-bindgen/src/main.rs @@ -52,6 +52,7 @@ fn generate_bindings(opt: &Opt) -> anyhow::Result<(), anyhow::Error> { None, vec![opt.language.to_string().as_str()], Some(out_dir), + None, false, )?; From 4f20966ddd78880c81ca88ebd4ea7367f504563d Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 5 Sep 2022 11:46:26 -0500 Subject: [PATCH 2/3] Update CI test rust versions to 1.61 and 1.63 --- .github/workflows/cont_integration.yml | 4 ++-- bdk-ffi-bindgen/src/main.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 2d3980d..206178b 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -10,9 +10,9 @@ jobs: strategy: matrix: rust: - - version: 1.60.0 # STABLE + - version: 1.63.0 # STABLE clippy: true - - version: 1.57.0 # MSRV + - version: 1.61.0 # MSRV steps: - name: checkout uses: actions/checkout@v2 diff --git a/bdk-ffi-bindgen/src/main.rs b/bdk-ffi-bindgen/src/main.rs index 215c824..8a87fc5 100644 --- a/bdk-ffi-bindgen/src/main.rs +++ b/bdk-ffi-bindgen/src/main.rs @@ -4,7 +4,7 @@ use std::path::{Path, PathBuf}; use std::str::FromStr; use structopt::StructOpt; -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum Language { Kotlin, Python, From 8166f820b4e4d6e52887de6406ab6b137f8ed43b Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 5 Sep 2022 12:04:08 -0500 Subject: [PATCH 3/3] Add README info badges for MSRV and other links --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index cd4bca9..c47fd5c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ # Native language bindings for BDK +

+ MIT or Apache-2.0 Licensed + CI Status + Rustc Version 1.61.0+ + Chat on Discord +

+ The workspace in this repository creates the `libbdkffi` multi-language library for the rust based [bdk] library from the [Bitcoin Dev Kit] project. The `bdk-ffi-bindgen` package builds a tool for generating the actual language binding code used to access the `libbdkffi` library.