Skip to content

Commit 4941af1

Browse files
committed
Updates for Go 1.18
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.
1 parent 4d9ae6b commit 4941af1

File tree

12 files changed

+17
-14
lines changed

12 files changed

+17
-14
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
9-
go: [1.16, 1.17]
9+
go: [1.17, 1.18]
1010
steps:
1111
- name: Set up Go
1212
uses: actions/setup-go@v2

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ https://decred.org/downloads/
7474

7575
### Build from source (all platforms)
7676

77-
- **Install Go 1.15 or 1.16**
77+
- **Install Go 1.17 or 1.18**
7878

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

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

9493
```sh
9594
$ go install decred.org/dcrwallet/v2@master

go.mod

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module decred.org/dcrwallet/v2
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
decred.org/cspp/v2 v2.0.0
@@ -39,3 +39,16 @@ require (
3939
google.golang.org/grpc v1.32.0
4040
google.golang.org/protobuf v1.23.0
4141
)
42+
43+
require (
44+
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
45+
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22 // indirect
46+
github.com/dchest/siphash v1.2.2 // indirect
47+
github.com/decred/base58 v1.0.3 // indirect
48+
github.com/decred/dcrd/database/v3 v3.0.0 // indirect
49+
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect
50+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
51+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
52+
golang.org/x/text v0.3.3 // indirect
53+
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
54+
)

internal/rpchelp/genrpcserverhelp.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// license that can be found in the LICENSE file.
55

66
//go:build generate
7-
// +build generate
87

98
package main
109

internal/rpchelp/helpdescs_en_US.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// license that can be found in the LICENSE file.
55

66
//go:build !generate
7-
// +build !generate
87

98
package rpchelp
109

internal/rpchelp/methods.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// license that can be found in the LICENSE file.
55

66
//go:build !generate
7-
// +build !generate
87

98
package rpchelp
109

signal_unix.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// license that can be found in the LICENSE file.
55

66
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
7-
// +build darwin dragonfly freebsd linux netbsd openbsd solaris
87

98
package main
109

version/version_buildinfo.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.18
6-
// +build go1.18
76

87
package version
98

version/version_nobuildinfo.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.18
6-
// +build !go1.18
76

87
package version
98

wallet/udb/txexample_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// license that can be found in the LICENSE file.
55

66
//go:build ignore
7-
// +build ignore
87

98
package udb
109

0 commit comments

Comments
 (0)