Skip to content

Commit

Permalink
Merge pull request #2089 from CosmWasm/aw/workspace-version
Browse files Browse the repository at this point in the history
Set the crate version centrally via the workspace
  • Loading branch information
aumetra authored Apr 8, 2024
2 parents 32ff9fb + a41f5a3 commit cbfd497
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ exclude = ["contracts"]
# due to https://github.com/rust-lang/cargo/issues/9956
resolver = "2"

[workspace.package]
version = "2.0.1"

[workspace.dependencies]
schemars = "0.8.4"
serde = { version = "1.0.192", default-features = false, features = ["derive", "alloc"] }
2 changes: 1 addition & 1 deletion packages/check/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-check"
version = "2.0.1"
version.workspace = true
authors = ["Mauro Lacy <mauro@lacy.com.es>"]
edition = "2021"
description = "A CLI tool for verifying CosmWasm smart contracts"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-core"
version = "0.0.1"
version.workspace = true
edition = "2021"
description = "Components of cosmwasm-std that can be used in no_std environments"
repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/core"
Expand Down
2 changes: 1 addition & 1 deletion packages/crypto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-crypto"
version = "2.0.1"
version.workspace = true
authors = ["Mauro Lacy <maurolacy@users.noreply.github.com>"]
edition = "2021"
description = "Crypto bindings for cosmwasm contracts"
Expand Down
4 changes: 2 additions & 2 deletions packages/derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-derive"
version = "2.0.1"
version.workspace = true
authors = ["Simon Warta <webmaster128@users.noreply.github.com>"]
edition = "2021"
description = "A package for auto-generated code used for CosmWasm contract development. This is shipped as part of cosmwasm-std. Do not use directly."
Expand All @@ -24,4 +24,4 @@ syn = { version = "2", features = ["full"] }
# "What's even more fun, Cargo packages actually can have cyclic dependencies.
# "(a package can have an indirect dev-dependency on itself)"
# https://users.rust-lang.org/t/does-cargo-support-cyclic-dependencies/35666/3
cosmwasm-std = { path = "../std" }
cosmwasm-std = { version = "2.0.1", path = "../std" }
4 changes: 2 additions & 2 deletions packages/go-gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cosmwasm-std = { path = "../std", version = "2.0.1", features = ["cosmwasm_2_0", "staking", "stargate"] }
cosmwasm-schema = { path = "../schema", version = "2.0.1" }
cosmwasm-std = { version = "2.0.1", path = "../std", features = ["cosmwasm_2_0", "staking", "stargate"] }
cosmwasm-schema = { version = "2.0.1", path = "../schema" }
anyhow = "1"
Inflector = "0.11.4"
indenter = "0.3.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/schema-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-schema-derive"
version = "2.0.1"
version.workspace = true
authors = ["Tomasz Kurcz <tom@confio.gmbh>"]
edition = "2021"
description = "Derive macros for cosmwasm-schema"
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-schema"
version = "2.0.1"
version.workspace = true
authors = ["Simon Warta <webmaster128@users.noreply.github.com>", "Ethan Frey <ethanfrey@users.noreply.github.com>"]
edition = "2021"
description = "A dev-dependency for CosmWasm contracts to generate JSON Schema files."
Expand Down
8 changes: 4 additions & 4 deletions packages/std/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-std"
version = "2.0.1"
version.workspace = true
authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
edition = "2021"
description = "Standard library for Wasm based smart contracts on Cosmos blockchains"
Expand Down Expand Up @@ -55,7 +55,7 @@ cosmwasm_2_1 = ["cosmwasm_2_0"]

[dependencies]
base64 = "0.22.0"
cosmwasm-derive = { path = "../derive", version = "2.0.1" }
cosmwasm-derive = { version = "2.0.1", path = "../derive" }
derivative = { version = "2", features = ["use_core"] }
forward_ref = "1"
hex = "0.4"
Expand All @@ -69,10 +69,10 @@ static_assertions = "1.1.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bech32 = "0.11.0"
cosmwasm-crypto = { path = "../crypto", version = "2.0.1" }
cosmwasm-crypto = { version = "2.0.1", path = "../crypto" }

[dev-dependencies]
cosmwasm-schema = { path = "../schema" }
cosmwasm-schema = { version = "2.0.1", path = "../schema" }
# The chrono dependency is only used in an example, which Rust compiles for us. If this causes trouble, remove it.
chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
crc32fast = "1.3.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/vm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmwasm-vm"
version = "2.0.1"
version.workspace = true
authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
edition = "2021"
description = "VM bindings to run cosmwams contracts"
Expand Down Expand Up @@ -33,8 +33,8 @@ clru = "0.6.1"
crc32fast = "1.3.2"
bech32 = "0.11.0"
# Uses the path when built locally; uses the given version from crates.io when published
cosmwasm-std = { path = "../std", version = "2.0.1", default-features = false, features = ["std"] }
cosmwasm-crypto = { path = "../crypto", version = "2.0.1" }
cosmwasm-std = { version = "2.0.1", path = "../std", default-features = false, features = ["std"] }
cosmwasm-crypto = { version = "2.0.1", path = "../crypto" }
derivative = "2"
hex = "0.4"
schemars = { workspace = true }
Expand Down

0 comments on commit cbfd497

Please sign in to comment.