From fd1c15ec4bb1e5c255ed540a3b5a3e66b896fcf8 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Mon, 16 Nov 2020 16:37:09 -0800 Subject: [PATCH 1/4] bump bindgen back to 0.54 for compatibility with rocksdb --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2edbcb1fc..f4ad23e91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ blake2b_simd = "0.5.10" [build-dependencies] cc = { version = ">= 1.0.36, <= 1.0.41", features = ["parallel"] } -bindgen = "0.55" +bindgen = "0.54" [dev-dependencies] rustc-serialize = "0.3" From 5a2081a9b0bc1a73506b236d1f78b30b601b2cb9 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Mon, 16 Nov 2020 16:39:55 -0800 Subject: [PATCH 2/4] update changelog for new release --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5c331141..8b853232c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - ReleaseDate +### Changed +- switched from bindgen `0.55` to bindgen `0.54` to avoid a dependency + conflict with `rocksdb` ## [0.1.3] - 2020-10-09 ### Changed From 979e7605f9572670b48c6035c81c128269c78f67 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Tue, 17 Nov 2020 15:03:59 -0800 Subject: [PATCH 3/4] (cargo-release) version 0.1.4 --- CHANGELOG.md | 5 ++++- Cargo.toml | 2 +- src/lib.rs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b853232c..8d8d0bfbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - ReleaseDate + +## [0.1.4] - 2020-11-17 ### Changed - switched from bindgen `0.55` to bindgen `0.54` to avoid a dependency conflict with `rocksdb` @@ -31,7 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated `bindgen` to a non yanked version -[Unreleased]: https://github.com/ZcashFoundation/zcash_script/compare/v0.1.3...HEAD +[Unreleased]: https://github.com/ZcashFoundation/zcash_script/compare/v0.1.4...HEAD +[0.1.4]: https://github.com/ZcashFoundation/zcash_script/compare/v0.1.3...v0.1.4 [0.1.3]: https://github.com/ZcashFoundation/zcash_script/compare/v0.1.2...v0.1.3 [0.1.2]: https://github.com/ZcashFoundation/zcash_script/compare/v0.1.1...v0.1.2 [0.1.1]: https://github.com/ZcashFoundation/zcash_script/compare/v0.1.0...v0.1.1 diff --git a/Cargo.toml b/Cargo.toml index f4ad23e91..922de5aa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zcash_script" -version = "0.1.4-alpha.0" +version = "0.1.4" authors = ["Tamas Blummer ", "Zcash Foundation "] license = "Apache-2.0" readme = "README.md" diff --git a/src/lib.rs b/src/lib.rs index e8301d363..ec3eef5b3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ #![doc(html_logo_url = "https://www.zfnd.org/images/zebra-icon.png")] -#![doc(html_root_url = "https://docs.rs/zcash_script/0.1.3")] +#![doc(html_root_url = "https://docs.rs/zcash_script/0.1.4")] #![allow(non_upper_case_globals)] #![allow(non_camel_case_types)] #![allow(non_snake_case)] From 21d79270eef0ea4d737903e3850be24671d3f2ec Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Tue, 17 Nov 2020 15:07:08 -0800 Subject: [PATCH 4/4] (cargo-release) start next development iteration 0.1.5-alpha.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 922de5aa4..354c70f30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zcash_script" -version = "0.1.4" +version = "0.1.5-alpha.0" authors = ["Tamas Blummer ", "Zcash Foundation "] license = "Apache-2.0" readme = "README.md"