Skip to content

Commit

Permalink
go 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
richard-ramos committed Jan 3, 2024
1 parent 827a5b1 commit ca471bb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ setup: setup-check setup-build setup-dev tidy

setup-check: ##@setup Check if Go compiler is installed.
ifeq (, $(shell which go))
$(error "No Go compiler found! Make sure to install 1.20.0 or newer.")
$(error "No Go compiler found! Make sure to install 1.21.0 or newer.")
endif

setup-dev: ##@setup Install all necessary tools for development
Expand Down
16 changes: 2 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/status-im/status-go

go 1.20
go 1.21

replace github.com/ethereum/go-ethereum v1.10.26 => github.com/status-im/go-ethereum v1.10.25-status.11

Expand All @@ -21,19 +21,7 @@ require (
github.com/cenkalti/backoff/v3 v3.2.2
github.com/davecgh/go-spew v1.1.1
github.com/deckarep/golang-set v1.8.0
github.com/ethereum/go-ethereum v1.10.26
github.com/forPelevin/gomoji v1.1.2
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
github.com/hashicorp/go-version v1.2.0
github.com/imdario/mergo v0.3.12
github.com/ipfs/go-cid v0.4.1
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
github.com/keighl/metabolize v0.0.0-20150915210303-97ab655d4034
github.com/kilic/bls12-381 v0.0.0-20200607163746-32e1441c8a9f
github.com/lib/pq v1.10.4
github.com/libp2p/go-libp2p v0.32.2
According to this comment https://github.com/golang/go/issues/58426#issuecomment-1673306090 looks like the problem is solved in go 1.21, but we can't upgrade to that version because
github.com/libp2p/go-libp2p-pubsub v0.10.0
github.com/lucasb-eyer/go-colorful v1.0.3
github.com/mat/besticon v0.0.0-20210314201728-1579f269edb7
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ in pkgs.mkShell {

buildInputs = with pkgs; [
git jq which
go_1_20 golangci-lint go-junit-report gopls go-bindata gomobileMod
go_1_21 golangci-lint go-junit-report gopls go-bindata gomobileMod
mockgen protobuf3_20 protoc-gen-go
] ++ lib.optional stdenv.isDarwin xcodeWrapper;

Expand Down

0 comments on commit ca471bb

Please sign in to comment.