Force version number during macro resolution (#642)

paupino · Feb 1, 2024 · 999bb02 · 999bb02
1 parent bacc60b
commit 999bb02
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/.buildnumber b/.buildnumber
@@ -1,3 +1,3 @@
 1
 34
-0
+1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Version History
 
+## 1.34.1
+
+### Fixed
+
+* Hotfix for circular dependency when using the `macros` feature.
+
 ## 1.34.0
 
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ name = "rust_decimal"
 readme = "./README.md"
 repository = "https://github.com/paupino/rust-decimal"
 rust-version = "1.60"
-version = "1.34.0"
+version = "1.34.1"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -32,7 +32,7 @@ proptest = { default-features = false, optional = true, features = ["std"], vers
 rand = { default-features = false, optional = true, version = "0.8" }
 rkyv = { default-features = false, features = ["size_32", "std"], optional = true, version = "0.7.42" }
 rocket = { default-features = false, optional = true, version = "0.5.0-rc.3" }
-rust_decimal_macros = { default-features = false, optional = true, version = "1.33" } # This needs to be the n-1 published version
+rust_decimal_macros = { default-features = false, optional = true, version = "1.34" } # This needs to a published version
 serde = { default-features = false, optional = true, version = "1.0" }
 serde_json = { default-features = false, optional = true, version = "1.0" }
 tokio-postgres = { default-features = false, optional = true, version = "0.7" }

diff --git a/examples/serde-json-scenarios/Cargo.toml b/examples/serde-json-scenarios/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde-json-scenarios"
-version = "1.34.0"
+version = "0.0.0"
 edition = "2021"
 publish = false
 

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -21,7 +21,7 @@ authors = ["Automatically generated"]
 edition = "2021"
 name = "rust-decimal-fuzz"
 publish = false
-version = "1.34.0"
+version = "0.0.0"
 
 [package.metadata]
 cargo-fuzz = true

diff --git a/macros/Cargo.toml b/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust_decimal_macros"
-version = "1.34.0"
+version = "1.34.1"
 authors = ["Paul Mason <paul@form1.co.nz>"]
 edition = "2021"
 description = "Shorthand macros to assist creating Decimal types."
@@ -12,7 +12,8 @@ categories = ["science","data-structures"]
 license = "MIT"
 
 [dependencies]
-rust_decimal = { path = "..", version = "1.31", default-features = false }
+# This needs to be a locked version until we can remove this dependency altogether
+rust_decimal = { version = "=1.33.1", default-features = false }
 quote = "1.0"
 
 [dev-dependencies]