Skip to content

Commit 98a070d

Browse files
authored
Merge pull request #184 from CycloneDX/go-1.20
feat: raise baseline go version to 1.20
2 parents 07eb476 + 9166e10 commit 98a070d

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Go
3434
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
3535
with:
36-
go-version: "1.20"
36+
go-version: "1.22"
3737
check-latest: true
3838
cache: false
3939
- name: Run golangci-lint
@@ -49,9 +49,9 @@ jobs:
4949
strategy:
5050
matrix:
5151
go:
52-
- "1.18"
53-
- "1.19"
5452
- "1.20"
53+
- "1.21"
54+
- "1.22"
5555
steps:
5656
- name: Setup Go
5757
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1

.github/workflows/goreleaser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Go
2323
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
2424
with:
25-
go-version: "1.20"
25+
go-version: "1.22"
2626
check-latest: true
2727
- name: Install cyclonedx-gomod
2828
uses: CycloneDX/gh-gomod-generate-sbom@efc74245d6802c8cefd925620515442756c70d8f # tag=v2.0.0

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Also, checkout the [`examples`](./example_test.go) to get an idea of how this li
3232
| == v0.4.0 | 1.14+ | 1.3 |
3333
| >= v0.5.0, < v0.7.0 | 1.15+ | 1.4 |
3434
| >= v0.7.0, < v0.8.0 | 1.17+ | 1.0-1.4 |
35-
| >= v0.8.0 | 1.18+ | 1.0-1.5 |
35+
| == v0.8.0 | 1.18+ | 1.0-1.5 |
36+
| >= v0.9.0 | 1.20+ | 1.0-1.6 |
3637

3738
We're aiming to support all [officially supported](https://golang.org/doc/devel/release.html#policy) Go versions, plus
3839
an additional older version.

decode.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"encoding/json"
2222
"encoding/xml"
2323
"io"
24-
"io/ioutil"
2524
)
2625

2726
type BOMDecoder interface {
@@ -41,7 +40,7 @@ type jsonBOMDecoder struct {
4140

4241
// Decode implements the BOMDecoder interface.
4342
func (j jsonBOMDecoder) Decode(bom *BOM) error {
44-
bytes, err := ioutil.ReadAll(j.reader)
43+
bytes, err := io.ReadAll(j.reader)
4544
if err != nil {
4645
return err
4746
}

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/CycloneDX/cyclonedx-go
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/bradleyjkemp/cupaloy/v2 v2.8.0

0 commit comments

Comments
 (0)