Skip to content

Commit

Permalink
Updates for Go 1.18
Browse files Browse the repository at this point in the history
Bump module version to Go 1.17.

Remove all +build directives now that the minimum supported Go version
understands //go:build.

Run 'go mod tidy' to include all indirect requirements in the go.mod
file.

Remove references to older Go versions in the README.

Update build matrix to test with 1.18, and remove 1.16.
  • Loading branch information
jrick committed Mar 15, 2022
1 parent 4d9ae6b commit 4941af1
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [1.16, 1.17]
go: [1.17, 1.18]
steps:
- name: Set up Go
uses: actions/setup-go@v2
Expand Down
5 changes: 2 additions & 3 deletions README.md
Expand Up @@ -74,7 +74,7 @@ https://decred.org/downloads/

### Build from source (all platforms)

- **Install Go 1.15 or 1.16**
- **Install Go 1.17 or 1.18**

Installation instructions can be found here: https://golang.org/doc/install.
Ensure Go was installed properly and is a supported version:
Expand All @@ -88,8 +88,7 @@ https://decred.org/downloads/
- **Build or Update dcrwallet**

Since dcrwallet is a single Go module, it's possible to use a single command
to download, build, and install without needing to clone the repo. If using Go
1.16, run
to download, build, and install without needing to clone the repo. Run:

```sh
$ go install decred.org/dcrwallet/v2@master
Expand Down
15 changes: 14 additions & 1 deletion go.mod
@@ -1,6 +1,6 @@
module decred.org/dcrwallet/v2

go 1.16
go 1.17

require (
decred.org/cspp/v2 v2.0.0
Expand Down Expand Up @@ -39,3 +39,16 @@ require (
google.golang.org/grpc v1.32.0
google.golang.org/protobuf v1.23.0
)

require (
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22 // indirect
github.com/dchest/siphash v1.2.2 // indirect
github.com/decred/base58 v1.0.3 // indirect
github.com/decred/dcrd/database/v3 v3.0.0 // indirect
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
golang.org/x/text v0.3.3 // indirect
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
)
1 change: 0 additions & 1 deletion internal/rpchelp/genrpcserverhelp.go
Expand Up @@ -4,7 +4,6 @@
// license that can be found in the LICENSE file.

//go:build generate
// +build generate

package main

Expand Down
1 change: 0 additions & 1 deletion internal/rpchelp/helpdescs_en_US.go
Expand Up @@ -4,7 +4,6 @@
// license that can be found in the LICENSE file.

//go:build !generate
// +build !generate

package rpchelp

Expand Down
1 change: 0 additions & 1 deletion internal/rpchelp/methods.go
Expand Up @@ -4,7 +4,6 @@
// license that can be found in the LICENSE file.

//go:build !generate
// +build !generate

package rpchelp

Expand Down
1 change: 0 additions & 1 deletion signal_unix.go
Expand Up @@ -4,7 +4,6 @@
// license that can be found in the LICENSE file.

//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
// +build darwin dragonfly freebsd linux netbsd openbsd solaris

package main

Expand Down
1 change: 0 additions & 1 deletion version/version_buildinfo.go
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build go1.18
// +build go1.18

package version

Expand Down
1 change: 0 additions & 1 deletion version/version_nobuildinfo.go
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build !go1.18
// +build !go1.18

package version

Expand Down
1 change: 0 additions & 1 deletion wallet/udb/txexample_test.go
Expand Up @@ -4,7 +4,6 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package udb

Expand Down
1 change: 0 additions & 1 deletion wallet/udb/txquery_test.go
Expand Up @@ -4,7 +4,6 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package udb

Expand Down
1 change: 0 additions & 1 deletion wallet/walletdb/example_test.go
Expand Up @@ -5,7 +5,6 @@

// Test must be updated for API changes.
//go:build disabled
// +build disabled

package walletdb_test

Expand Down

0 comments on commit 4941af1

Please sign in to comment.