Skip to content

Commit 54fa2a2

Browse files
Replace unmaintained gopkg.in/yaml.v3 with go.yaml.in/yaml/v3 (#397)
Fixes #381 This replaces the unmaintained gopkg.in/yaml.v3 library with its maintained fork go.yaml.in/yaml/v3 from https://github.com/yaml/go-yaml/tree/v3/. Signed-off-by: Sascha Schwarze <[email protected]>
1 parent 9b6fad7 commit 54fa2a2

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ go 1.24.0
44

55
require (
66
github.com/BurntSushi/toml v1.5.0
7+
go.yaml.in/yaml/v3 v3.0.4
78
golang.org/x/text v0.31.0
8-
gopkg.in/yaml.v3 v3.0.1
99
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
22
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
3+
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
4+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
35
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
46
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
57
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
68
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
8-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

goi18n/marshal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/BurntSushi/toml"
1010
"github.com/nicksnyder/go-i18n/v2/i18n"
1111
"github.com/nicksnyder/go-i18n/v2/internal/plural"
12+
yaml "go.yaml.in/yaml/v3"
1213
"golang.org/x/text/language"
13-
yaml "gopkg.in/yaml.v3"
1414
)
1515

1616
func writeFile(outdir, label string, langTag language.Tag, format string, messageTemplates map[string]*i18n.MessageTemplate, sourceLanguage bool) (path string, content []byte, err error) {

goi18n/merge_command.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/nicksnyder/go-i18n/v2/i18n"
1313
"github.com/nicksnyder/go-i18n/v2/internal"
1414
"github.com/nicksnyder/go-i18n/v2/internal/plural"
15+
yaml "go.yaml.in/yaml/v3"
1516
"golang.org/x/text/language"
16-
yaml "gopkg.in/yaml.v3"
1717
)
1818

1919
func usageMerge() {

i18n/bundle_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77

88
"github.com/BurntSushi/toml"
9+
yaml "go.yaml.in/yaml/v3"
910
"golang.org/x/text/language"
10-
yaml "gopkg.in/yaml.v3"
1111
)
1212

1313
var simpleMessage = MustNewMessage(map[string]string{

i18n/parse_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"sort"
77
"testing"
88

9+
yaml "go.yaml.in/yaml/v3"
910
"golang.org/x/text/language"
10-
yaml "gopkg.in/yaml.v3"
1111
)
1212

1313
func TestParseMessageFileBytes(t *testing.T) {

0 commit comments

Comments
 (0)