Skip to content

Commit

Permalink
chore: prepare v2 beta (3/3) (#23034)
Browse files Browse the repository at this point in the history 
(cherry picked from commit 5856fb6)

# Conflicts:
#	server/v2/cometbft/go.mod
#	simapp/v2/go.mod
  • Loading branch information
@julienrbrt @mergify
julienrbrt authored and mergify[bot] committed Dec 20, 2024
1 parent ba8d717 commit d54e7bf
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
9 changes: 9 additions & 0 deletions server/v2/cometbft/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,21 @@ require (
cosmossdk.io/errors v1.0.1
cosmossdk.io/errors/v2 v2.0.0
cosmossdk.io/log v1.5.0
<<<<<<< HEAD
cosmossdk.io/schema v1.0.0 //main
cosmossdk.io/server/v2 v2.0.0-20241220083032-422be7044259 // main
cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 // main
cosmossdk.io/server/v2/stf v1.0.0-beta.1 // main
cosmossdk.io/store/v2 v2.0.0-beta.1 // main
cosmossdk.io/x/consensus v0.2.0-rc.1
=======
cosmossdk.io/schema v1.0.0
cosmossdk.io/server/v2 v2.0.0-beta.1
cosmossdk.io/server/v2/appmanager v1.0.0-beta.1
cosmossdk.io/server/v2/stf v1.0.0-beta.1
cosmossdk.io/store/v2 v2.0.0-beta.1
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
>>>>>>> 5856fb653 (chore: prepare v2 beta (3/3) (#23034))
github.com/cometbft/cometbft v1.0.0
github.com/cometbft/cometbft/api v1.0.0
github.com/cosmos/cosmos-sdk v0.52.0
Expand Down
29 changes: 29 additions & 0 deletions simapp/v2/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
cosmossdk.io/indexer/postgres v0.1.0
cosmossdk.io/log v1.5.0
cosmossdk.io/math v1.4.0
<<<<<<< HEAD
cosmossdk.io/runtime/v2 v2.0.0-20241219154748-69025c556666 // main
cosmossdk.io/server/v2 v2.0.0-20241220083032-422be7044259 // main
cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000
Expand All @@ -37,6 +38,34 @@ require (
cosmossdk.io/x/slashing v0.2.0-rc.1
cosmossdk.io/x/staking v0.2.0-rc.1
cosmossdk.io/x/upgrade v0.2.0-rc.1
=======
cosmossdk.io/runtime/v2 v2.0.0-00010101000000-000000000000
cosmossdk.io/server/v2 v2.0.0-beta.1
cosmossdk.io/server/v2/cometbft v0.0.0-20241015140036-ee3d320eaa55
cosmossdk.io/store/v2 v2.0.0
cosmossdk.io/tools/benchmark v0.0.0-00010101000000-000000000000
cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000
cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000
cosmossdk.io/x/accounts/defaults/lockup v0.0.0-00010101000000-000000000000
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000
cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
cosmossdk.io/x/distribution v0.0.0-20230925135524-a1bc045b3190
cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337
cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f
cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f
cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
cosmossdk.io/x/group v0.0.0-00010101000000-000000000000
cosmossdk.io/x/mint v0.0.0-00010101000000-000000000000
cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f
cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190
cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
>>>>>>> 5856fb653 (chore: prepare v2 beta (3/3) (#23034))
github.com/cometbft/cometbft v1.0.0
// this version is not used as it is always replaced by the latest Cosmos SDK version
github.com/cosmos/cosmos-sdk v0.52.0
Expand Down

0 comments on commit d54e7bf

Please sign in to comment.