Skip to content

Commit

Permalink
Use workspace for edition, license, repository, and version (#690)
Browse files Browse the repository at this point in the history
* Use workspace for edition, license, repository, and version

* Update schema
  • Loading branch information
JakeHartnell authored Apr 4, 2023
1 parent b09db5a commit 9261bb3
Show file tree
Hide file tree
Showing 41 changed files with 125 additions and 111 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 @@ -13,7 +13,10 @@ members = [
exclude = ["ci/configs/"]

[workspace.package]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/DA0-DA0/dao-contracts"
version = "2.1.0"

[profile.release.package.stake-cw20-external-rewards]
codegen-units = 1
Expand Down
4 changes: 2 additions & 2 deletions ci/bootstrap-env/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "bootstrap-env"
version = "0.2.0"
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
edition = { workspace = true }
repository = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
cosm-orc = { version = "4.0" }
Expand Down
2 changes: 1 addition & 1 deletion ci/integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "integration-tests"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# This crate depends on rand. These are not featured in
# wasm builds of cosmwasm. Despite this crate only being used as a dev
Expand Down
6 changes: 3 additions & 3 deletions contracts/dao-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-core"
version = "2.1.0"
authors = ["ekez <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO core module."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/external/cw-admin-factory/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name ="cw-admin-factory"
version = "2.1.0"
authors = ["Jake Hartnell", "blue-note", "ekez <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A CosmWasm factory contract for instantiating a contract as its own admin."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
8 changes: 4 additions & 4 deletions contracts/external/cw-fund-distributor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "cw-fund-distributor"
version = "0.1.0"
authors = ["bekauz <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A CosmWasm contract for distributing funds to DAO members based on voting power."
edition = { workspace = true }
repository = { workspace = true }
version = "0.1.0"

[lib]
crate-type = ["cdylib", "rlib"]
Expand All @@ -31,4 +31,4 @@ cw-paginate = { workspace = true }
[dev-dependencies]
dao-core = { workspace = true, features = ["library"] }
cw-multi-test = { workspace = true }
cw20-base = { workspace = true, features = ["library"] }
cw20-base = { workspace = true, features = ["library"] }
6 changes: 3 additions & 3 deletions contracts/external/cw-payroll-factory/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name ="cw-payroll-factory"
version = "2.0.0-beta"
authors = ["Jake Hartnell"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A CosmWasm factory contract for instantiating a payroll contract."
edition = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw-payroll-factory",
"contract_version": "2.0.0-beta",
"contract_version": "2.1.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
6 changes: 3 additions & 3 deletions contracts/external/cw-token-swap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "cw-token-swap"
version = "2.1.0"
authors = ["ekez <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A CosmWasm contract for swapping native and cw20 assets."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
8 changes: 5 additions & 3 deletions contracts/external/cw-vesting/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[package]
name = "cw-vesting"
version = "2.1.0"
authors = ["Jake Hartnell", "ekez <[email protected]>", "blue-note"]
edition = "2021"
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down Expand Up @@ -33,4 +35,4 @@ wynd-utils = { workspace = true }
anyhow = { workspace = true }
cw-multi-test = { workspace = true }
cw20-base = { workspace = true }
dao-testing = { workspace = true }
dao-testing = { workspace = true }
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-pre-propose-approval-single"
version = "2.1.0"
authors = ["ekez <[email protected]>", "Jake Hartnell <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module handling a proposal approval flow for for dao-proposal-single."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down Expand Up @@ -40,4 +40,4 @@ dao-testing = { workspace = true }
dao-voting = { workspace = true }
dao-voting-cw4 = { workspace = true }
dao-voting-cw20-staked = { workspace = true }
dao-proposal-single = { workspace = true }
dao-proposal-single = { workspace = true }
6 changes: 3 additions & 3 deletions contracts/pre-propose/dao-pre-propose-approver/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-pre-propose-approver"
version = "2.1.0"
authors = ["ekez <[email protected]>", "Jake Hartnell <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module for automatically making approval proposals for dao-pre-propose-approval-single."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/pre-propose/dao-pre-propose-multiple/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-pre-propose-multiple"
version = "2.1.0"
authors = ["ekez <[email protected]>", "Jake Hartnell <[email protected]>", "blue-note"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module for dao-proposal-multiple for native and cw20 deposits."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
8 changes: 4 additions & 4 deletions contracts/pre-propose/dao-pre-propose-single/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-pre-propose-single"
version = "2.1.0"
authors = ["ekez <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module for dao-proposal-single for native and cw20 deposits."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down Expand Up @@ -38,4 +38,4 @@ dao-interface = { workspace = true }
dao-testing = { workspace = true }
dao-proposal-hooks = { workspace = true }
dao-proposal-single = { workspace = true }
cw-hooks = { workspace = true }
cw-hooks = { workspace = true }
8 changes: 4 additions & 4 deletions contracts/proposal/dao-proposal-condorcet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name ="dao-proposal-condorcet"
version = "0.1.0"
authors = ["ekez <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO proposal module with ranked-choice, Condorcet voting."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = "0.1.0"

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down Expand Up @@ -39,4 +39,4 @@ dao-testing = { workspace = true }
dao-voting-cw4 = { workspace = true }
cw4-group = { workspace = true }
cw4 = { workspace = true }
anyhow = { workspace = true }
anyhow = { workspace = true }
6 changes: 3 additions & 3 deletions contracts/proposal/dao-proposal-multiple/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-proposal-multiple"
version = "2.1.0"
authors = ["blue-note"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO proposal module for multiple choice (a or b or c or ...) voting."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

exclude = [
# Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
Expand Down
8 changes: 4 additions & 4 deletions contracts/proposal/dao-proposal-single/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-proposal-single"
version = "2.1.0"
authors = ["ekez <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO proposal module for single choice (yes / no) voting."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down Expand Up @@ -56,4 +56,4 @@ cw20-base = { workspace = true }
cw721-base = { workspace = true }
cw4 = { workspace = true }
cw4-group = { workspace = true }
cw-core-v1 = { workspace = true, features = ["library"] }
cw-core-v1 = { workspace = true, features = ["library"] }
3 changes: 2 additions & 1 deletion contracts/staking/cw20-stake-external-rewards/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "cw20-stake-external-rewards"
version = "2.1.0"
authors = ["Ben2x4 <[email protected]>", "ekez <[email protected]>"]
edition = "2018"
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
3 changes: 2 additions & 1 deletion contracts/staking/cw20-stake-reward-distributor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "cw20-stake-reward-distributor"
version = "2.1.0"
edition = "2018"
authors = ["Vernon Johnson <[email protected]>, ekez <[email protected]>"]
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/staking/cw20-stake/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "cw20-stake"
version = "2.1.0"
version = { workspace = true }
authors = ["Ben2x4 <[email protected]>"]
edition = "2018"
repository = "https://github.com/DA0-DA0/cw-dao/contracts/cw20-stake"
description = "CW20 token that can be staked and staked balance can be queried at any height"
edition = "2018"
license = { workspace = true }
repository = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/voting/dao-voting-cw20-staked/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-voting-cw20-staked"
version = "2.1.0"
authors = ["Callum Anderson <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO voting module based on staked cw20 tokens."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/voting/dao-voting-cw4/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-voting-cw4"
version = "2.1.0"
authors = ["Callum Anderson <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO voting module based on cw4 membership."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/voting/dao-voting-cw721-staked/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-voting-cw721-staked"
version = "2.1.0"
authors = ["CypherApe [email protected]"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO voting module based on staked cw721 tokens."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/voting/dao-voting-native-staked/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "dao-voting-native-staked"
version = "2.1.0"
authors = ["Callum Anderson <[email protected]>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO voting module based on staked cw721 tokens."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
6 changes: 3 additions & 3 deletions packages/cw-denom/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "cw-denom"
version = "2.1.0"
edition = "2021"
authors = ["ekez [email protected]"]
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A package for validation and handling of cw20 and native Cosmos SDK denominations."
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[dependencies]
cosmwasm-std = { workspace = true }
Expand Down
Loading

0 comments on commit 9261bb3

Please sign in to comment.