Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Go version to 1.21 #45

Merged
merged 5 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.21

- name: Build
run: go build -v ./...
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger-labs/cc-tools)](https://goreportcard.com/report/github.com/hyperledger-labs/cc-tools)
[![GoDoc](https://godoc.org/github.com/hyperledger-labs/cc-tools?status.svg)](https://godoc.org/github.com/hyperledger-labs/cc-tools)

This project is a GoLedger open-source project aimed at providing tools for Hyperledger Fabric chaincode development in Golang. This might have breaking changes before we arrive at release v1.0.0.
This project is a GoLedger open-source project aimed at providing tools for Hyperledger Fabric chaincode development in Golang.

## Getting Started

Expand Down
31 changes: 19 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,30 +1,37 @@
module github.com/hyperledger-labs/cc-tools

go 1.14
go 1.21

require (
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.4 // indirect
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
github.com/hyperledger/fabric v2.1.1+incompatible
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210603161043-af0e3898842a
github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31
github.com/stretchr/testify v1.6.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/miekg/pkcs11 v1.0.3 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/viper v1.7.1 // indirect
github.com/stretchr/testify v1.6.1
github.com/sykesm/zap-logfmt v0.0.4 // indirect
go.uber.org/atomic v1.6.0 // indirect
go.uber.org/multierr v1.5.0 // indirect
go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b // indirect
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/grpc v1.35.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
93 changes: 28 additions & 65 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestMain(m *testing.M) {

tx.InitHeader(tx.Header{
Name: "CC Tools Test",
Version: "v0.8.1",
Version: "v1.0.0",
Colors: map[string][]string{
"@default": {"#4267B2", "#34495E", "#ECF0F1"},
},
Expand Down
4 changes: 2 additions & 2 deletions test/tx_getHeader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func TestGetHeader(t *testing.T) {
stub := mock.NewMockStub("org1MSP", new(testCC))

expectedResponse := map[string]interface{}{
"ccToolsVersion": "v0.8.1",
"ccToolsVersion": "v1.0.0",
"colors": []interface{}{
"#4267B2",
"#34495E",
Expand All @@ -20,7 +20,7 @@ func TestGetHeader(t *testing.T) {
"name": "CC Tools Test",
"orgMSP": "org1MSP",
"orgTitle": "CC Tools Demo",
"version": "v0.8.1",
"version": "v1.0.0",
}
err := invokeAndVerify(stub, "getHeader", nil, expectedResponse, 200)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion transactions/getHeader.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var header Header

func InitHeader(h Header) {
header = h
header.CCToolsVersion = "v0.8.1"
header.CCToolsVersion = "v1.0.0"
}

// GetHeader returns data in CCHeader
Expand Down
Loading