diff --git a/.golangci.yml b/.golangci.yml index 63fadd0..2714f0c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,8 +1,7 @@ run: - build-tags: - - e2e skip-dirs: - vendor + - tint linters-settings: gocritic: disabled-checks: diff --git a/go.mod b/go.mod index 3c73ed2..0433323 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.21 require ( github.com/go-chi/chi/v5 v5.0.10 - github.com/lmittmann/tint v1.0.3 github.com/mattn/go-isatty v0.0.20 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d github.com/mitchellh/mapstructure v1.5.0 diff --git a/go.sum b/go.sum index f3cf937..b357f87 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,6 @@ github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/lmittmann/tint v1.0.3 h1:W5PHeA2D8bBJVvabNfQD/XW9HPLZK1XoPZH0cq8NouQ= -github.com/lmittmann/tint v1.0.3/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= diff --git a/gosmee/app.go b/gosmee/app.go index e8e732f..7cc87c7 100644 --- a/gosmee/app.go +++ b/gosmee/app.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/lmittmann/tint" + "github.com/chmouel/gosmee/tint" "github.com/mattn/go-isatty" "github.com/mgutz/ansi" "github.com/urfave/cli/v2" diff --git a/vendor/github.com/lmittmann/tint/LICENSE b/tint/LICENSE similarity index 100% rename from vendor/github.com/lmittmann/tint/LICENSE rename to tint/LICENSE diff --git a/vendor/github.com/lmittmann/tint/README.md b/tint/README.md similarity index 99% rename from vendor/github.com/lmittmann/tint/README.md rename to tint/README.md index 88a77ac..770e174 100644 --- a/vendor/github.com/lmittmann/tint/README.md +++ b/tint/README.md @@ -18,7 +18,7 @@ that writes tinted (colorized) logs. Its output format is inspired by the `zerol The output format can be customized using [`Options`](https://pkg.go.dev/github.com/lmittmann/tint#Options) which is a drop-in replacement for [`slog.HandlerOptions`](https://pkg.go.dev/log/slog#HandlerOptions). -``` +```shell go get github.com/lmittmann/tint ``` diff --git a/vendor/github.com/lmittmann/tint/buffer.go b/tint/buffer.go similarity index 100% rename from vendor/github.com/lmittmann/tint/buffer.go rename to tint/buffer.go diff --git a/vendor/github.com/lmittmann/tint/handler.go b/tint/handler.go similarity index 99% rename from vendor/github.com/lmittmann/tint/handler.go rename to tint/handler.go index 0cc3190..6ec5f4f 100644 --- a/vendor/github.com/lmittmann/tint/handler.go +++ b/tint/handler.go @@ -57,13 +57,14 @@ import ( "encoding" "fmt" "io" - "log/slog" "path/filepath" "runtime" "strconv" "sync" "time" "unicode" + + "golang.org/x/exp/slog" ) // ANSI modes diff --git a/vendor/modules.txt b/vendor/modules.txt index 7a5988b..4411983 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -14,9 +14,6 @@ github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value -# github.com/lmittmann/tint v1.0.3 -## explicit; go 1.21 -github.com/lmittmann/tint # github.com/mattn/go-colorable v0.1.13 ## explicit; go 1.15 github.com/mattn/go-colorable