Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3 #691

Merged
merged 4 commits into from
Aug 3, 2023
Merged

Update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3 #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc28888
update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3
yeastplume Aug 2, 2023
5ac10d0
Merge branch 'master' into versioning
quentinlesceller Aug 2, 2023
c034cc7
tweak for CI trigger
yeastplume Aug 3, 2023
f76e4fe
Merge branch 'versioning' of https://github.com/yeastplume/grin-walle…
yeastplume Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions Cargo.lock
View file
Open in desktop

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

32 changes: 16 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "5.2.0-alpha.1"
version = "5.2.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 Down Expand Up @@ -30,12 +30,12 @@ semver = "0.10"
rustyline = "6"
lazy_static = "1"

grin_wallet_api = { path = "./api", version = "5.2.0-alpha.1" }
grin_wallet_impls = { path = "./impls", version = "5.2.0-alpha.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.2.0-alpha.1" }
grin_wallet_controller = { path = "./controller", version = "5.2.0-alpha.1" }
grin_wallet_config = { path = "./config", version = "5.2.0-alpha.1" }
grin_wallet_util = { path = "./util", version = "5.2.0-alpha.1" }
grin_wallet_api = { path = "./api", version = "5.2.0-beta.1" }
grin_wallet_impls = { path = "./impls", version = "5.2.0-beta.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.2.0-beta.1" }
grin_wallet_controller = { path = "./controller", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "./config", version = "5.2.0-beta.1" }
grin_wallet_util = { path = "./util", version = "5.2.0-beta.1" }


##### Grin Imports
Expand All @@ -48,24 +48,24 @@ grin_wallet_util = { path = "./util", version = "5.2.0-alpha.1" }

# For beta release

# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_keychain = { 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_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_keychain = { 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" }

# For local testing
# grin_core = { path = "../grin/core"}
# grin_keychain = { path = "../grin/keychain"}
# grin_util = { path = "../grin/util"}
# grin_api = { path = "../grin/api"}

#####
######

[build-dependencies]
built = { version = "0.4", features = ["git2"]}
Expand Down
22 changes: 11 additions & 11 deletions api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "5.2.0-alpha.1"
version = "5.2.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -22,10 +22,10 @@ ring = "0.16"
base64 = "0.12"
ed25519-dalek = "1.0.0-pre.4"

grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "5.2.0-beta.1" }
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }

##### Grin Imports

Expand All @@ -36,14 +36,14 @@ grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }

# For beta release

# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_util = { 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_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand Down
12 changes: 6 additions & 6 deletions config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "5.2.0-alpha.1"
version = "5.2.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.5"
dirs = "2.0"

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

##### Grin Imports

Expand All @@ -26,12 +26,12 @@ grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }

# For beta release

# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

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

# For local testing
# grin_core = { path = "../../grin/core"}
Expand Down
32 changes: 16 additions & 16 deletions controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "5.2.0-alpha.1"
version = "5.2.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
Expand Down Expand Up @@ -30,11 +30,11 @@ lazy_static = "1"
thiserror = "1"
qr_code = "1.1.0"

grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_wallet_api = { path = "../api", version = "5.2.0-alpha.1" }
grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
grin_wallet_api = { path = "../api", version = "5.2.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "5.2.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }

##### Grin Imports

Expand All @@ -46,16 +46,16 @@ grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }

# For beta release

# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_keychain = { 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_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_keychain = { 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" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand All @@ -76,10 +76,10 @@ remove_dir_all = "0.7"

# For beta release

# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

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

# For local testing
# grin_chain = { path = "../../grin/chain"}
Expand Down
Loading