Skip to content

Commit

Permalink
Merge pull request #171 from relab/update-dependencies-go121
Browse files Browse the repository at this point in the history
deps: Updated to Go 1.21 and upgraded dependencies
  • Loading branch information
meling authored Feb 2, 2024
2 parents dfa195f + 07fe0c1 commit d9b97fe
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 340 deletions.
1 change: 1 addition & 0 deletions .vscode/gorums.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ gorumsexample
grpc
Hein
ICDCS
Idents
Idxs
Iface
Ingve
Expand Down
2 changes: 1 addition & 1 deletion cmd/protoc-gen-gorums/gengorums/gorums_bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func GenerateBundleFile(dst string) {
fmt.Printf("\nReview changes above; to revert use:\n")
fmt.Printf("mv %s.bak %s\n", dst, dst)
}
err = os.WriteFile(dst, []byte(staticContent), 0666)
err = os.WriteFile(dst, []byte(staticContent), 0o666)
if err != nil {
log.Fatal(err)
}
Expand Down
26 changes: 13 additions & 13 deletions examples/go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
module github.com/relab/gorums/examples

go 1.17
go 1.21

require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/relab/gorums v0.7.0
golang.org/x/term v0.5.0
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
golang.org/x/term v0.16.0
google.golang.org/grpc v1.61.0
google.golang.org/protobuf v1.32.0
)

require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 // indirect
)

replace github.com/relab/gorums => ../
182 changes: 26 additions & 156 deletions examples/go.sum

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/relab/gorums

go 1.17
go 1.21

require (
github.com/google/go-cmp v0.5.6
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/tools v0.1.12
google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb
google.golang.org/grpc v1.43.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
google.golang.org/protobuf v1.27.1
github.com/google/go-cmp v0.6.0
golang.org/x/sync v0.6.0
golang.org/x/tools v0.17.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe
google.golang.org/grpc v1.61.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.32.0
)

require (
github.com/golang/protobuf v1.5.2 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
)
180 changes: 24 additions & 156 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mgr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestManagerAddNode(t *testing.T) {
// Proto definition in tests/dummy/dummy.proto
type dummySrv struct{}

func (_ dummySrv) Test(ctx gorums.ServerCtx, _ *dummy.Empty) (resp *dummy.Empty, err error) {
func (dummySrv) Test(ctx gorums.ServerCtx, _ *dummy.Empty) (resp *dummy.Empty, err error) {
return nil, nil
}

Expand Down

0 comments on commit d9b97fe

Please sign in to comment.