diff --git a/Makefile b/Makefile index ebedc3569ce..a16fb2c2b61 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/go.mod b/go.mod index 33fc2794499..2d019199e1e 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 diff --git a/shell.nix b/shell.nix index 82cd66328c2..93eb528f73a 100644 --- a/shell.nix +++ b/shell.nix @@ -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;