diff --git a/Gopkg.lock b/Gopkg.lock index bc90b27..0059602 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -9,12 +9,12 @@ revision = "6d212800a42e8ab5c146b8ace3490ee17e5225f9" [[projects]] - digest = "1:d09c52eca43710d509b486aa0cd103d7c2bcaf557e2bf4e27da026da375fdf77" + digest = "1:2d641073d2edd47f54d6951d31b16e4ec6d37ec7efac1320f8d1d820c83fcbb8" name = "github.com/diegobernardes/ttlcache" packages = ["."] pruneopts = "UT" - revision = "dcd0e0a06d7f417ad46b69b438142fe5dedba09b" - version = "1.3.0" + revision = "86f5295f63277ee497ff52f7480e09abd313d12e" + version = "1.4.0" [[projects]] digest = "1:7e20e81aa450d3aaeabde0582330f26654204c6031d7eb37f4dbda821f113de7" diff --git a/Gopkg.toml b/Gopkg.toml index 2e3e142..fbaf0df 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -27,7 +27,7 @@ [[constraint]] name = "github.com/diegobernardes/ttlcache" - version = "~1.3.0" + version = "~1.4.0" [[constraint]] name = "github.com/fortytw2/leaktest" diff --git a/makefile b/makefile index 5eaaf62..553e35a 100644 --- a/makefile +++ b/makefile @@ -4,13 +4,12 @@ TEST_OPTIONS?=-race -cover .PHONY: setup setup: ## Install all the build and lint dependencies - go get -u gopkg.in/alecthomas/gometalinter.v2 + go get -u github.com/golangci/golangci-lint/cmd/golangci-lint go get -u github.com/golang/dep/cmd/dep go get -u golang.org/x/tools/cmd/cover go get -u golang.org/x/tools/cmd/goimports go get -u github.com/AlekSi/gocoverutil dep ensure - gometalinter.v2 --install --update .PHONY: test test: ## Run all the tests @@ -27,13 +26,7 @@ fmt: ## gofmt and goimports all go files .PHONY: lint lint: ## Run all the linters - ## global lint tests - gometalinter.v2 --vendor --enable-all --line-length=120 \ - --disable=golint \ - --disable=errcheck \ - --cyclo-over=15 \ - --deadline=10m \ - ./... + golangci-lint run --deadline=15m # Absolutely awesome: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html .PHONY: help