Merge pull request #31 from trilitech/[email protected]

Release: 0.4.2
trilitech · Mar 13, 2023 · dc2646e · dc2646e
2 parents cd60bf7 + 84ab82e
commit dc2646e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Nothing.
 
+## [0.4.2] - 2023-03-14
+
+### Changed
+
+- `tezos_crypto` rename to `tezos_crypto_rs`, due to conflict on crates.io
+
 ## [0.4.1] - 2023-03-14
 
 ### Changed

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "tezos_crypto"
-version = "0.4.1"
+name = "tezos_crypto_rs"
+version = "0.4.2"
 authors = ["TriliTech <[email protected]>"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/tezos-encoding-derive/Cargo.toml b/tezos-encoding-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tezos_data_encoding_derive"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["TriliTech <[email protected]>"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/tezos-encoding/Cargo.toml b/tezos-encoding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tezos_data_encoding"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["TriliTech <[email protected]>"]
 edition = "2021"
 rust-version = "1.60"
@@ -20,14 +20,14 @@ serde = { version = "1.0", features = ["derive"] }
 nom = "6.1"
 lazy_static = "1.4"
 
-[dependencies.tezos_crypto]
+[dependencies.tezos_crypto_rs]
 path = "../crypto"
-version = "0.4.1"
+version = "0.4.2"
 default-features = false
 
 [dependencies.tezos_data_encoding_derive]
 path = "../tezos-encoding-derive"
-version = "0.4.1"
+version = "0.4.2"
 
 [features]
 

diff --git a/tezos-encoding/src/lib.rs b/tezos-encoding/src/lib.rs
@@ -5,7 +5,7 @@
 
 //! This crate provides serialization and deserialization functionality for the data types used by the Tezos shell.
 
-extern crate tezos_crypto as crypto;
+extern crate tezos_crypto_rs as crypto;
 
 mod bit_utils;
 pub mod types;