Skip to content

Commit

Permalink
Consistent Go version in go.mod and go.work files
Browse files Browse the repository at this point in the history
The repository currently uses Go 1.22 to test samples in the automated
build. This change sets the Go version in all go.mod (and go.work) files
to Go 1.22.0, and removes any Go toolchain entries.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
  • Loading branch information
bestbeforetoday committed Oct 14, 2024
1 parent b931df3 commit 9740c93
Show file tree
Hide file tree
Showing 27 changed files with 775 additions and 1,129 deletions.
2 changes: 1 addition & 1 deletion asset-transfer-abac/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-abac/chaincode-go

go 1.21
go 1.22.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.0.0

Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-basic/chaincode-external/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-basic/chaincode-external

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
4 changes: 1 addition & 3 deletions asset-transfer-basic/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-basic/chaincode-go

go 1.21

toolchain go1.22.4
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-events/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-events/chaincode-go

go 1.21
go 1.22.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.0.0

Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-ledger-queries/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-ledger-queries/chaincode-go

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-private-data/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-private-data/chaincode-go

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-secured-agreement/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/chaincode/tradingMarbles

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion auction-dutch/chaincode-go-auditor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/auction/dutch-auction/chaincode-go-auditor

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion auction-dutch/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/auction/dutch-auction/chaincode-go

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion auction-simple/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/auction/chaincode-go

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion high-throughput/application-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/high-throughput/application-go

go 1.18
go 1.22.0

require github.com/hyperledger/fabric-sdk-go v1.0.0

Expand Down
12 changes: 11 additions & 1 deletion high-throughput/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
module github.com/hyperledger/fabric-samples/high-throughput/chaincode

go 1.12
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a
github.com/hyperledger/fabric-protos-go v0.3.0
)

require (
github.com/golang/protobuf v1.5.2 // 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
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
)
1,102 changes: 0 additions & 1,102 deletions high-throughput/chaincode-go/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion token-erc-1155/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module erc1155

go 1.21
go 1.22.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.0.0

Expand Down
2 changes: 1 addition & 1 deletion token-erc-20/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-erc-20/chaincode-go

go 1.21
go 1.22.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.0.0

Expand Down
2 changes: 1 addition & 1 deletion token-erc-721/chaincode-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-erc-721/chaincode-go

go 1.21
go 1.22.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240618210511-f7903324a8af
Expand Down
2 changes: 1 addition & 1 deletion token-sdk/auditor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-sdk/auditor

go 1.20
go 1.22.0

replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v1.2.9

Expand Down
42 changes: 42 additions & 0 deletions token-sdk/auditor/go.sum

Large diffs are not rendered by default.

78 changes: 77 additions & 1 deletion token-sdk/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,79 @@
module github.com/hyperledger/fabric-samples/token-sdk/e2e

go 1.20
go 1.22.0

require (
github.com/deepmap/oapi-codegen v1.16.3
github.com/stretchr/testify v1.9.0
)

require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
github.com/CloudyKit/jet/v6 v6.2.0 // indirect
github.com/Joker/jade v1.1.3 // indirect
github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/flosch/pongo2/v4 v4.0.2 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.9.1 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/iris-contrib/schema v0.0.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kataras/blocks v0.0.7 // indirect
github.com/kataras/golog v0.1.9 // indirect
github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9 // indirect
github.com/kataras/pio v0.0.12 // indirect
github.com/kataras/sitemap v0.0.6 // indirect
github.com/kataras/tunnel v0.0.4 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/labstack/echo/v4 v4.11.1 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/mailgun/raymond/v2 v2.0.48 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/microcosm-cc/bluemonday v1.0.25 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/schollz/closestmatch v2.1.0+incompatible // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/tdewolff/minify/v2 v2.12.9 // indirect
github.com/tdewolff/parse/v2 v2.6.8 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/yosssi/ace v0.0.5 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 9740c93

Please sign in to comment.