Merge branch 'master' into go-1.13

Author: jbowes

.travis.yml

@@ -2,8 +2,6 @@ dist: bionic
 language: go
 
 go:
-  - "1.9.x"
-  - "1.10.x"
   - "1.11.x"
   - "1.12.x"
   - "1.13.x"
@@ -12,13 +10,6 @@ branches:
   only:
     - master
 
-env:
-  global:
-    - GO111MODULE=on
-    - GOPROXY=https://proxy.golang.org,direct
-
-install: make bootstrap
-
 after_success:
   # only report coverage for go-version 1.11
   - if [[ $TRAVIS_GO_VERSION =~ ^1\.11 ]] ; then bash <(curl -s https://codecov.io/bash) -f all-cover.txt; fi

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Removed
+
+- Removed support for Go versions that don't include modules.
+
 ## [0.4.0] - 2019-02-19
 
 ### Added

Gopkg.lock

@@ -1,4 +1,3 @@
-HAS_GO_MOD=$(shell go help mod; echo $$?)
 LINTERS=$(shell grep "// lint" tools.go | awk '{gsub(/\"/, "", $$1); print $$1}' | awk -F / '{print $$NF}') \
 	gofmt \
 	vet
@@ -25,23 +24,12 @@ $(foreach cmd_pkg,$(CMD_PKGS),$(eval $(call VENDOR_BIN_TMPL,$(cmd_pkg))))
 $(patsubst %,%-bin,$(filter-out gofmt vet,$(LINTERS))): %-bin: vendor/bin/%
 gofmt-bin vet-bin:
 
-ifeq ($(HAS_GO_MOD),0)
-bootstrap:
-
 vendor: go.sum
 	GO111MODULE=on go mod vendor
-else
-bootstrap:
-	which dep || go get -u github.com/golang/dep/cmd/dep
-
-vendor: Gopkg.lock
-	dep ensure -vendor-only
-endif
 
 mod-update:
 	GO111MODULE=on go get -u -m
 	GO111MODULE=on go mod tidy
-	dep ensure -update
 
 mod-tidy:
 	GO111MODULE=on go mod tidy

Gopkg.toml

@@ -1,6 +1,6 @@
 module github.com/manifoldco/promptui
 
-go 1.13
+go 1.11
 
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
@@ -18,18 +18,17 @@ require (
 	github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a // indirect
 	github.com/mattn/go-colorable v0.0.9 // indirect
 	github.com/mattn/go-isatty v0.0.4 // indirect
-	github.com/nicksnyder/go-i18n v1.10.1 // indirect
+	github.com/nicksnyder/go-i18n v0.0.0-00010101000000-000000000000 // indirect
 	github.com/tsenart/deadcode v0.0.0-20160724212837-210d2dc333e9
 	golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3
 	golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b // indirect
 	golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 // indirect
-	gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c // indirect
+
+	// Do not change this version of kingpin; we will remove it when we stop using gometalinter
+	gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20171010053543-63abe20a23e2 // indirect
+
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
 
-// This version of kingpin is incompatible with the released version of
-// gometalinter until the next release of gometalinter, and possibly until it
-// has go module support, we'll need this exclude, and perhaps some more.
-//
-// After that point, we should be able to remove it.
-// exclude gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c
+// Remove this when we stop using gometalinter and kingpin
+replace github.com/nicksnyder/go-i18n => github.com/nicksnyder/go-i18n v1.10.1

Makefile

@@ -12,6 +12,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWs
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 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=
@@ -49,8 +50,8 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXind
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 h1:bsEj/LXbv3BCtkp/rBj9Wi/0Nde4OMaraIZpndHAhdI=
 golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c h1:vTxShRUnK60yd8DZU+f95p1zSLj814+5CuEh7NjF2/Y=
-gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c/go.mod h1:3HH7i1SgMqlzxCcBmUHW657sD4Kvv9sC3HpL3YukzwA=
+gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20171010053543-63abe20a23e2 h1:5zOHKFi4LqGWG+3d+isqpbPrN/2yhDJnlO+BhRiuR6U=
+gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20171010053543-63abe20a23e2/go.mod h1:3HH7i1SgMqlzxCcBmUHW657sD4Kvv9sC3HpL3YukzwA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=