Skip to content

Commit 08e761b

Browse files
applejagjmattheis
authored andcommitted
fix: go1.24 support
Increases minimal go version to go1.22 due to changes in x/tools.
1 parent d273beb commit 08e761b

File tree

6 files changed

+33
-21
lines changed

6 files changed

+33
-21
lines changed

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- uses: actions/setup-go@v5
1010
with:
11-
go-version: 1.22.x
11+
go-version: 1.24.x
1212
- uses: actions/checkout@v4
1313
- uses: golangci/golangci-lint-action@v3
1414
with:
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.22.x
22+
go-version: 1.24.x
2323
- uses: actions/checkout@v4
2424
- run: go build ./cmd/goverter
2525
- run: go test -coverpkg ./... -coverprofile=coverage.txt -covermode=atomic ./...
@@ -30,13 +30,13 @@ jobs:
3030
files: ./filtered-coverage.txt
3131
env:
3232
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
33-
test_go118:
33+
test_go122:
3434
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.repository != github.event.pull_request.head.repo.full_name)
3535
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/setup-go@v5
3838
with:
39-
go-version: 1.18.x
39+
go-version: 1.22.x
4040
- uses: actions/checkout@v4
4141
- run: go build ./cmd/goverter
4242
- run: go test ./...
@@ -48,7 +48,7 @@ jobs:
4848
steps:
4949
- uses: actions/setup-go@v5
5050
with:
51-
go-version: "1.21.x"
51+
go-version: 1.24.x
5252
- uses: actions/checkout@v4
5353
- run: mkdir covdata
5454
- run: GOCOVERDIR="$PWD/covdata" go generate ./...

docs/changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import GH from './GH.vue';
66

77
## unreleased
88

9+
- Fix go1.24 support. <GH issue="186" pr="187"/>
10+
- Increase minimal go version to go1.22 due to breaking changes in x/tools for
11+
go1.24 <GH pr="187"/>
12+
913
## v1.7.0
1014

1115
- Remove default value of [`arg:context:regex`](./reference/arg.md) <GH issue="68" pr="176"/>

example/enum/transform-custom/go.mod

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
module goverter/example
22

3-
go 1.18.0
3+
go 1.22.0
44

55
replace github.com/jmattheis/goverter => ../../../
66

77
require github.com/jmattheis/goverter v1.3.2
88

99
require (
1010
github.com/dave/jennifer v1.6.0 // indirect
11-
golang.org/x/mod v0.14.0 // indirect
12-
golang.org/x/tools v0.17.0 // indirect
11+
golang.org/x/mod v0.21.0 // indirect
12+
golang.org/x/sync v0.8.0 // indirect
13+
golang.org/x/tools v0.25.0 // indirect
1314
)

example/enum/transform-custom/go.sum

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
github.com/dave/jennifer v1.6.0 h1:MQ/6emI2xM7wt0tJzJzyUik2Q3Tcn2eE0vtYgh4GPVI=
22
github.com/dave/jennifer v1.6.0/go.mod h1:AxTG893FiZKqxy3FP1kL80VMshSMuz2G+EgvszgGRnk=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
45
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
57
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
6-
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
7-
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
8-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
9-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
10-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
8+
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
9+
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
10+
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
11+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
12+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
13+
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
14+
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
1115
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
16+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
module github.com/jmattheis/goverter
22

3-
go 1.18
3+
go 1.22.0
44

55
require (
66
github.com/dave/jennifer v1.6.0
77
github.com/stretchr/testify v1.8.1
8-
golang.org/x/tools v0.17.0
8+
golang.org/x/tools v0.25.0
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

1212
require (
1313
github.com/davecgh/go-spew v1.1.1 // indirect
1414
github.com/pmezard/go-difflib v1.0.0 // indirect
15-
golang.org/x/mod v0.14.0 // indirect
15+
golang.org/x/mod v0.21.0 // indirect
16+
golang.org/x/sync v0.8.0 // indirect
1617
)

go.sum

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
1212
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
1313
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
1414
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
15-
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
16-
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
17-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
18-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
19-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
15+
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
16+
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
17+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
18+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
19+
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
20+
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
2021
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2122
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2223
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)