Skip to content

Commit

Permalink
Merge pull request #184 from CycloneDX/go-1.20
Browse files Browse the repository at this point in the history
feat: raise baseline go version to 1.20
  • Loading branch information
nscuro authored Jun 4, 2024
2 parents 07eb476 + 9166e10 commit 98a070d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
with:
go-version: "1.20"
go-version: "1.22"
check-latest: true
cache: false
- name: Run golangci-lint
Expand All @@ -49,9 +49,9 @@ jobs:
strategy:
matrix:
go:
- "1.18"
- "1.19"
- "1.20"
- "1.21"
- "1.22"
steps:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
with:
go-version: "1.20"
go-version: "1.22"
check-latest: true
- name: Install cyclonedx-gomod
uses: CycloneDX/gh-gomod-generate-sbom@efc74245d6802c8cefd925620515442756c70d8f # tag=v2.0.0
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ Also, checkout the [`examples`](./example_test.go) to get an idea of how this li
| == v0.4.0 | 1.14+ | 1.3 |
| >= v0.5.0, < v0.7.0 | 1.15+ | 1.4 |
| >= v0.7.0, < v0.8.0 | 1.17+ | 1.0-1.4 |
| >= v0.8.0 | 1.18+ | 1.0-1.5 |
| == v0.8.0 | 1.18+ | 1.0-1.5 |
| >= v0.9.0 | 1.20+ | 1.0-1.6 |

We're aiming to support all [officially supported](https://golang.org/doc/devel/release.html#policy) Go versions, plus
an additional older version.
Expand Down
3 changes: 1 addition & 2 deletions decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"encoding/json"
"encoding/xml"
"io"
"io/ioutil"
)

type BOMDecoder interface {
Expand All @@ -41,7 +40,7 @@ type jsonBOMDecoder struct {

// Decode implements the BOMDecoder interface.
func (j jsonBOMDecoder) Decode(bom *BOM) error {
bytes, err := ioutil.ReadAll(j.reader)
bytes, err := io.ReadAll(j.reader)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/CycloneDX/cyclonedx-go

go 1.18
go 1.20

require (
github.com/bradleyjkemp/cupaloy/v2 v2.8.0
Expand Down

0 comments on commit 98a070d

Please sign in to comment.