Skip to content

Commit

Permalink
update version for master maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
yeastplume committed Jun 5, 2019
1 parent 3136812 commit a1f2e1f
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 41 deletions.
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "1.1.0"
version = "1.1.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -29,13 +29,13 @@ prettytable-rs = "0.7"
log = "0.4"
linefeed = "0.5"

grin_wallet_api = { path = "./api", version = "1.1.0" }
grin_wallet_impls = { path = "./impls", version = "1.1.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0" }
grin_wallet_controller = { path = "./controller", version = "1.1.0" }
grin_wallet_config = { path = "./config", version = "1.1.0" }
grin_wallet_api = { path = "./api", version = "1.1.1-beta.1" }
grin_wallet_impls = { path = "./impls", version = "1.1.1-beta.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "1.1.1-beta.1" }
grin_wallet_controller = { path = "./controller", version = "1.1.1-beta.1" }
grin_wallet_config = { path = "./config", version = "1.1.1-beta.1" }

grin_wallet_util = { path = "./util", version = "1.1.0" }
grin_wallet_util = { path = "./util", version = "1.1.1-beta.1" }

[build-dependencies]
built = "0.3"
10 changes: 5 additions & 5 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "1.1.0"
version = "1.1.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -18,11 +18,11 @@ serde_json = "1"
easy-jsonrpc = "0.5.1"
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
grin_wallet_config = { path = "../config", version = "1.1.0" }
grin_wallet_impls = { path = "../impls", version = "1.1.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.1" }
grin_wallet_config = { path = "../config", version = "1.1.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.1" }

grin_wallet_util = { path = "../util", version = "1.1.0" }
grin_wallet_util = { path = "../util", version = "1.1.0-beta.1" }

[dev-dependencies]
serde_json = "1"
Expand Down
4 changes: 2 additions & 2 deletions config/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "1.1.0"
version = "1.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -16,7 +16,7 @@ serde_derive = "1"
toml = "0.4"
dirs = "1.0.3"

grin_wallet_util = { path = "../util", version = "1.1.0" }
grin_wallet_util = { path = "../util", version = "1.1.0-beta.1" }

[dev-dependencies]
pretty_assertions = "0.5.1"
12 changes: 6 additions & 6 deletions controller/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "1.1.0"
version = "1.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
Expand Down Expand Up @@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] }
easy-jsonrpc = "0.5.1"
lazy_static = "1"

grin_wallet_util = { path = "../util", version = "1.1.0" }
grin_wallet_util = { path = "../util", version = "1.1.0-beta.1" }

grin_wallet_api = { path = "../api", version = "1.1.0" }
grin_wallet_impls = { path = "../impls", version = "1.1.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
grin_wallet_config = { path = "../config", version = "1.1.0" }
grin_wallet_api = { path = "../api", version = "1.1.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.1" }
grin_wallet_config = { path = "../config", version = "1.1.0-beta.1" }
8 changes: 4 additions & 4 deletions impls/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "1.1.0"
version = "1.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
Expand All @@ -26,7 +26,7 @@ tokio-retry = "0.1"
uuid = { version = "0.7", features = ["serde", "v4"] }
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_util = { path = "../util", version = "1.1.0" }
grin_wallet_util = { path = "../util", version = "1.1.0-beta.1" }

grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
grin_wallet_config = { path = "../config", version = "1.1.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.1" }
grin_wallet_config = { path = "../config", version = "1.1.0-beta.1" }
6 changes: 3 additions & 3 deletions libwallet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_libwallet"
version = "1.1.0"
version = "1.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -25,7 +25,7 @@ lazy_static = "1"
strum = "0.15"
strum_macros = "0.15"

grin_wallet_util = { path = "../util", version = "1.1.0" }
grin_wallet_util = { path = "../util", version = "1.1.0-beta.1" }

[dev-dependencies]
grin_wallet_config = { path = "../config", version = "1.1.0" }
grin_wallet_config = { path = "../config", version = "1.1.0-beta.1" }
2 changes: 1 addition & 1 deletion src/bin/grin-wallet.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: grin-wallet
version: "1.1.0"
version: "1.1.1-beta.1"
about: Reference Grin Wallet
author: The Grin Team

Expand Down
26 changes: 13 additions & 13 deletions util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_util"
version = "1.1.0"
version = "1.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Util, for generic utilities and to re-export grin crates"
license = "Apache-2.0"
Expand All @@ -17,12 +17,12 @@ toml = "0.4"
dirs = "1.0.3"

# For Release
grin_core = "1.1.0"
grin_keychain = "1.1.0"
grin_chain = "1.1.0"
grin_util = "1.1.0"
grin_api = "1.1.0"
grin_store = "1.1.0"
#grin_core = "1.1.0"
#grin_keychain = "1.1.0"
#grin_chain = "1.1.0"
#grin_util = "1.1.0"
#grin_api = "1.1.0"
#grin_store = "1.1.0"

# For beta release
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v1.1.0-beta.2" }
Expand All @@ -33,12 +33,12 @@ grin_store = "1.1.0"
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v1.1.0-beta.2" }

# For bleeding edge
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }

# For local testing
#grin_core = { path = "../../grin/core", version= "1.1.0-beta.2"}
Expand Down

0 comments on commit a1f2e1f

Please sign in to comment.