Skip to content

Commit 29d899f

Browse files
authored
Merge pull request #198 from go-task/yaml-v3
Upgrade to go-yaml/yaml v3
2 parents e81e280 + 902a0a0 commit 29d899f

27 files changed

+1765
-702
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ require (
1818
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d // indirect
1919
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
2020
golang.org/x/sys v0.0.0-20180831094639-fa5fdf94c789 // indirect
21-
gopkg.in/yaml.v2 v2.2.1
21+
gopkg.in/yaml.v3 v3.0.0-20190409140830-cdc409dda467
2222
mvdan.cc/sh v2.6.4+incompatible
2323
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ golang.org/x/sys v0.0.0-20180831094639-fa5fdf94c789 h1:T8D7l6WB3tLu+VpKvw06ieD/O
4141
golang.org/x/sys v0.0.0-20180831094639-fa5fdf94c789/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
4242
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4343
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
44-
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
45-
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
44+
gopkg.in/yaml.v3 v3.0.0-20190409140830-cdc409dda467 h1:w3VhdSYz2sIVz54Ta/eDCCfCQ4fQkDgRxMACggArIUw=
45+
gopkg.in/yaml.v3 v3.0.0-20190409140830-cdc409dda467/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
4646
mvdan.cc/sh v2.6.4+incompatible h1:eD6tDeh0pw+/TOTI1BBEryZ02rD2nMcFsgcvde7jffM=
4747
mvdan.cc/sh v2.6.4+incompatible/go.mod h1:IeeQbZq+x2SUGBensq/jge5lLQbS3XT2ktyp3wrt4x8=

internal/taskfile/read/taskfile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/go-task/task/v2/internal/taskfile"
1111

12-
"gopkg.in/yaml.v2"
12+
"gopkg.in/yaml.v3"
1313
)
1414

1515
var (

internal/taskfile/read/taskvars.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/go-task/task/v2/internal/taskfile"
1010

11-
"gopkg.in/yaml.v2"
11+
"gopkg.in/yaml.v3"
1212
)
1313

1414
// Taskvars reads a Taskvars for a given directory

internal/taskfile/taskfile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/go-task/task/v2/internal/taskfile"
77

88
"github.com/stretchr/testify/assert"
9-
"gopkg.in/yaml.v2"
9+
"gopkg.in/yaml.v3"
1010
)
1111

1212
func TestCmdParse(t *testing.T) {

vendor/gopkg.in/yaml.v2/.travis.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

vendor/gopkg.in/yaml.v2/LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

vendor/gopkg.in/yaml.v2/writerc.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

vendor/gopkg.in/yaml.v3/.travis.yml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v2/LICENSE.libyaml renamed to vendor/gopkg.in/yaml.v3/LICENSE

Lines changed: 29 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)