From b669223afdd611f7049dae772e5609ab707fcad8 Mon Sep 17 00:00:00 2001 From: gedi Date: Wed, 2 Mar 2016 15:26:07 +0200 Subject: [PATCH] BC break was introduced in gherkin-go master, use gopkg.in for explicit version --- .travis.yml | 5 +++-- Makefile | 2 +- examples/api/README.md | 4 ++-- examples/api/api_test.go | 2 +- examples/db/api_test.go | 3 +-- fmt.go | 2 +- fmt_pretty.go | 2 +- fmt_progress.go | 2 +- fmt_test.go | 2 +- stepdef.go | 2 +- suite.go | 2 +- suite_test.go | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0850482..c04a05d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ go: - 1.2 - 1.3 - 1.4 - - release + - 1.5 + - 1.6 - tip script: @@ -13,7 +14,7 @@ script: - (go version | grep "go1.1") || go get github.com/golang/lint/golint # pull all external dependencies - - go get github.com/cucumber/gherkin-go + - go get gopkg.in/cucumber/gherkin-go.v3 - go get github.com/shiena/ansicolor # run standard go tests diff --git a/Makefile b/Makefile index 2d321bc..b833909 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,6 @@ test: deps: @echo "updating all dependencies" - go get -u github.com/cucumber/gherkin-go + go get -u gopkg.in/cucumber/gherkin-go.v3 go get -u github.com/shiena/ansicolor diff --git a/examples/api/README.md b/examples/api/README.md index 1abb8f4..ca50967 100644 --- a/examples/api/README.md +++ b/examples/api/README.md @@ -57,7 +57,7 @@ package main import ( "github.com/DATA-DOG/godog" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) type apiFeature struct { @@ -99,7 +99,7 @@ import ( "net/http/httptest" "github.com/DATA-DOG/godog" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) type apiFeature struct { diff --git a/examples/api/api_test.go b/examples/api/api_test.go index a96d03a..5d47498 100644 --- a/examples/api/api_test.go +++ b/examples/api/api_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "github.com/DATA-DOG/godog" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) type apiFeature struct { diff --git a/examples/db/api_test.go b/examples/db/api_test.go index 6eb1809..2557135 100644 --- a/examples/db/api_test.go +++ b/examples/db/api_test.go @@ -8,9 +8,8 @@ import ( "net/http/httptest" "strings" - "github.com/DATA-DOG/go-txdb" "github.com/DATA-DOG/godog" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) func init() { diff --git a/fmt.go b/fmt.go index a6810a1..00686ce 100644 --- a/fmt.go +++ b/fmt.go @@ -10,7 +10,7 @@ import ( "time" "unicode" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) // some snippet formatting regexps diff --git a/fmt_pretty.go b/fmt_pretty.go index da75ddb..840dc24 100644 --- a/fmt_pretty.go +++ b/fmt_pretty.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) func init() { diff --git a/fmt_progress.go b/fmt_progress.go index 50f1333..45ab28b 100644 --- a/fmt_progress.go +++ b/fmt_progress.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) func init() { diff --git a/fmt_test.go b/fmt_test.go index b6b5bd3..ac40f8e 100644 --- a/fmt_test.go +++ b/fmt_test.go @@ -1,6 +1,6 @@ package godog -import "github.com/cucumber/gherkin-go" +import "gopkg.in/cucumber/gherkin-go.v3" type testFormatter struct { basefmt diff --git a/stepdef.go b/stepdef.go index 202195d..a2ffff9 100644 --- a/stepdef.go +++ b/stepdef.go @@ -7,7 +7,7 @@ import ( "runtime" "strconv" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) // StepDef is a registered step definition diff --git a/suite.go b/suite.go index 16fe5a6..8fc8e6b 100644 --- a/suite.go +++ b/suite.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) var errorInterface = reflect.TypeOf((*error)(nil)).Elem() diff --git a/suite_test.go b/suite_test.go index 9b438c1..ba37e6e 100644 --- a/suite_test.go +++ b/suite_test.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/cucumber/gherkin-go" + "gopkg.in/cucumber/gherkin-go.v3" ) func SuiteContext(s *Suite) {