go: Update messages to v21 (#75)

mpkorstanje · web-flow · commit df591e761a44 · 2022-12-17T18:23:39.000+01:00
diff --git a/go/Makefile b/go/Makefile
@@ -48,7 +48,7 @@ bin/gherkin-generate-tokens:
 	go build -o $@ ./gherkin-generate-tokens
 
 bin/gherkin:
-	go build -o $@ -a ./cmd
+	go build -o $@ -a ./main
 
 dialects_builtin.go: ../gherkin-languages.json dialects_builtin.go.jq
 	cat $< | jq --sort-keys --from-file dialects_builtin.go.jq --raw-output --compact-output > $@
diff --git a/go/astbuilder.go b/go/astbuilder.go
@@ -1,7 +1,7 @@
 package gherkin
 
 import (
-	"github.com/cucumber/common/messages/go/v19"
+	"github.com/cucumber/messages/go/v21"
 	"strings"
 )
 
diff --git a/go/bench_test.go b/go/bench_test.go
@@ -1,7 +1,7 @@
 package gherkin
 
 import (
-	messages "github.com/cucumber/common/messages/go/v19"
+	messages "github.com/cucumber/messages/go/v21"
 	"strings"
 	"testing"
 )
diff --git a/go/dialect.go b/go/dialect.go
@@ -1,6 +1,6 @@
 package gherkin
 
-import messages "github.com/cucumber/common/messages/go/v19"
+import messages "github.com/cucumber/messages/go/v21"
 
 type Dialect struct {
 	Language     string
diff --git a/go/dialects_builtin.go b/go/dialects_builtin.go
@@ -1,6 +1,6 @@
 package gherkin
 
-import messages "github.com/cucumber/common/messages/go/v19"
+import messages "github.com/cucumber/messages/go/v21"
 
 // Builtin dialects for af (Afrikaans), am (Armenian), an (Aragonese), ar (Arabic), ast (Asturian), az (Azerbaijani), bg (Bulgarian), bm (Malay), bs (Bosnian), ca (Catalan), cs (Czech), cy-GB (Welsh), da (Danish), de (German), el (Greek), em (Emoji), en (English), en-Scouse (Scouse), en-au (Australian), en-lol (LOLCAT), en-old (Old English), en-pirate (Pirate), en-tx (Texas), eo (Esperanto), es (Spanish), et (Estonian), fa (Persian), fi (Finnish), fr (French), ga (Irish), gj (Gujarati), gl (Galician), he (Hebrew), hi (Hindi), hr (Croatian), ht (Creole), hu (Hungarian), id (Indonesian), is (Icelandic), it (Italian), ja (Japanese), jv (Javanese), ka (Georgian), kn (Kannada), ko (Korean), lt (Lithuanian), lu (Luxemburgish), lv (Latvian), mk-Cyrl (Macedonian), mk-Latn (Macedonian (Latin)), mn (Mongolian), ne (Nepali), nl (Dutch), no (Norwegian), pa (Panjabi), pl (Polish), pt (Portuguese), ro (Romanian), ru (Russian), sk (Slovak), sl (Slovenian), sr-Cyrl (Serbian), sr-Latn (Serbian (Latin)), sv (Swedish), ta (Tamil), th (Thai), te (Telugu), tlh (Klingon), tr (Turkish), tt (Tatar), uk (Ukrainian), ur (Urdu), uz (Uzbek), vi (Vietnamese), zh-CN (Chinese simplified), zh-TW (Chinese traditional), mr (Marathi), amh (Amharic)
 func DialectsBuiltin() DialectProvider {
diff --git a/go/dialects_builtin.go.jq b/go/dialects_builtin.go.jq
@@ -87,7 +87,7 @@
   | add
   )
 | "package gherkin\n\n"
-+ "import messages \"github.com/cucumber/common/messages/go/v19\"\n\n"
++ "import messages \"github.com/cucumber/messages/go/v21\"\n\n"
 + "// Builtin dialects for " + ([ $root | to_entries[] | .key+" ("+.value.name+")" ] | join(", ")) + "\n"
 + "func DialectsBuiltin() DialectProvider {\n"
 + "\treturn builtinDialects\n"
diff --git a/go/example_test.go b/go/example_test.go
@@ -2,7 +2,7 @@ package gherkin
 
 import (
 	"fmt"
-	messages "github.com/cucumber/common/messages/go/v19"
+	messages "github.com/cucumber/messages/go/v21"
 	"os"
 	"strings"
 )
diff --git a/go/gherkin-generate-tokens/gherkin-generate-tokens.go b/go/gherkin-generate-tokens/gherkin-generate-tokens.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/cucumber/common/gherkin/go/v24"
+	gherkin "github.com/cucumber/gherkin/v25"
 	"io"
 	"os"
 	"strings"
diff --git a/go/gherkin.go b/go/gherkin.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"bufio"
 	"fmt"
-	"github.com/cucumber/common/messages/go/v19"
+	"github.com/cucumber/messages/go/v21"
 	"io"
 	"strings"
 )
diff --git a/go/go.mod b/go/go.mod
@@ -1,7 +1,7 @@
-module github.com/cucumber/common/gherkin/go/v24
+module github.com/cucumber/gherkin/v25
 
 require (
-	github.com/cucumber/common/messages/go/v19 v19.1.2
+	github.com/cucumber/messages/go/v21 v21.0.1
 	github.com/stretchr/testify v1.8.1
 )
 
diff --git a/go/go.sum b/go/go.sum
@@ -1,5 +1,5 @@
-github.com/cucumber/common/messages/go/v19 v19.1.2 h1:8/ZkW9rj3KQo/regmI8kcy48tk57m427Olb7Y0lXcN4=
-github.com/cucumber/common/messages/go/v19 v19.1.2/go.mod h1:0KLDvMVmmkEZcWUSKxFHSUSLS1gjujBbPN0p41IwwJ4=
+github.com/cucumber/messages/go/v21 v21.0.1 h1:wzA0LxwjlWQYZd32VTlAVDTkW6inOFmSM+RuOwHZiMI=
+github.com/cucumber/messages/go/v21 v21.0.1/go.mod h1:zheH/2HS9JLVFukdrsPWoPdmUtmYQAQPLk7w5vWsk5s=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/go/main/main.go b/go/main/main.go
@@ -9,8 +9,8 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/cucumber/common/gherkin/go/v24"
-	"github.com/cucumber/common/messages/go/v19"
+	gherkin "github.com/cucumber/gherkin/v25"
+	"github.com/cucumber/messages/go/v21"
 	"os"
 )
 
diff --git a/go/messages.go b/go/messages.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cucumber/common/messages/go/v19"
+	"github.com/cucumber/messages/go/v21"
 	"io"
 	"io/ioutil"
 	"strings"
diff --git a/go/messages_test.go b/go/messages_test.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/cucumber/common/messages/go/v19"
+	"github.com/cucumber/messages/go/v21"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"
diff --git a/go/pickles.go b/go/pickles.go
@@ -1,7 +1,7 @@
 package gherkin
 
 import (
-	"github.com/cucumber/common/messages/go/v19"
+	"github.com/cucumber/messages/go/v21"
 	"strings"
 )
 
diff --git a/go/pickles_test.go b/go/pickles_test.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cucumber/common/messages/go/v19"
+	"github.com/cucumber/messages/go/v21"
 	"os"
 	"strings"
 )

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package gherkin`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/cucumber/common/messages/go/v19"`
	`4`	`+ "github.com/cucumber/messages/go/v21"`
`5`	`5`	`"strings"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@`
`87`	`87`	`\| add`
`88`	`88`	`)`
`89`	`89`	`\| "package gherkin\n\n"`
`90`		`-+ "import messages \"github.com/cucumber/common/messages/go/v19\"\n\n"`
	`90`	`++ "import messages \"github.com/cucumber/messages/go/v21\"\n\n"`
`91`	`91`	`+ "// Builtin dialects for " + ([ $root \| to_entries[] \| .key+" ("+.value.name+")" ] \| join(", ")) + "\n"`
`92`	`92`	`+ "func DialectsBuiltin() DialectProvider {\n"`
`93`	`93`	`+ "\treturn builtinDialects\n"`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package gherkin`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- messages "github.com/cucumber/common/messages/go/v19"`
	`5`	`+ messages "github.com/cucumber/messages/go/v21"`
`6`	`6`	`"os"`
`7`	`7`	`"strings"`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package gherkin`
`3`	`3`	`import (`
`4`	`4`	`"bufio"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/cucumber/common/messages/go/v19"`
	`6`	`+ "github.com/cucumber/messages/go/v21"`
`7`	`7`	`"io"`
`8`	`8`	`"strings"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-module github.com/cucumber/common/gherkin/go/v24`
	`1`	`+module github.com/cucumber/gherkin/v25`
`2`	`2`
`3`	`3`	`require (`
`4`		`- github.com/cucumber/common/messages/go/v19 v19.1.2`
	`4`	`+ github.com/cucumber/messages/go/v21 v21.0.1`
`5`	`5`	`github.com/stretchr/testify v1.8.1`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package gherkin`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/cucumber/common/messages/go/v19"`
	`6`	`+ "github.com/cucumber/messages/go/v21"`
`7`	`7`	`"os"`
`8`	`8`	`"strings"`
`9`	`9`	`)`