From 83d25bfa00c19022188b1970a98f61d311358cfd Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 7 Jan 2021 11:48:33 -0300 Subject: [PATCH] Refactor: Fix import order It should be: stdlib > libs > app --- args/args_test.go | 4 ++-- cmd/task/task.go | 4 ++-- internal/output/output_test.go | 4 ++-- internal/status/glob.go | 4 ++-- internal/summary/summary_test.go | 4 ++-- task_test.go | 4 ++-- taskfile/precondition_test.go | 4 ++-- taskfile/read/taskfile.go | 6 +++--- taskfile/read/taskvars.go | 4 ++-- taskfile/taskfile_test.go | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/args/args_test.go b/args/args_test.go index 55676f8e..e6ca73ce 100644 --- a/args/args_test.go +++ b/args/args_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/assert" + "github.com/go-task/task/v3/args" "github.com/go-task/task/v3/taskfile" - - "github.com/stretchr/testify/assert" ) func TestArgsV3(t *testing.T) { diff --git a/cmd/task/task.go b/cmd/task/task.go index ec394ca6..a5460280 100644 --- a/cmd/task/task.go +++ b/cmd/task/task.go @@ -9,12 +9,12 @@ import ( "path/filepath" "syscall" + "github.com/spf13/pflag" + "github.com/go-task/task/v3" "github.com/go-task/task/v3/args" "github.com/go-task/task/v3/internal/logger" "github.com/go-task/task/v3/taskfile" - - "github.com/spf13/pflag" ) var ( diff --git a/internal/output/output_test.go b/internal/output/output_test.go index 80b49f61..cbdc48e4 100644 --- a/internal/output/output_test.go +++ b/internal/output/output_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/go-task/task/v3/internal/output" - "github.com/stretchr/testify/assert" + + "github.com/go-task/task/v3/internal/output" ) func TestInterleaved(t *testing.T) { diff --git a/internal/status/glob.go b/internal/status/glob.go index 8b6cb1e4..65d20736 100644 --- a/internal/status/glob.go +++ b/internal/status/glob.go @@ -5,9 +5,9 @@ import ( "path/filepath" "sort" - "github.com/go-task/task/v3/internal/execext" - "github.com/mattn/go-zglob" + + "github.com/go-task/task/v3/internal/execext" ) func globs(dir string, globs []string) ([]string, error) { diff --git a/internal/summary/summary_test.go b/internal/summary/summary_test.go index 30f70ed0..336fc991 100644 --- a/internal/summary/summary_test.go +++ b/internal/summary/summary_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/go-task/task/v3/internal/logger" "github.com/go-task/task/v3/internal/summary" "github.com/go-task/task/v3/taskfile" - - "github.com/stretchr/testify/assert" ) func TestPrintsDependenciesIfPresent(t *testing.T) { diff --git a/task_test.go b/task_test.go index 9613f814..dbfc64b9 100644 --- a/task_test.go +++ b/task_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/go-task/task/v3" "github.com/go-task/task/v3/taskfile" - - "github.com/stretchr/testify/assert" ) // fileContentTest provides a basic reusable test-case for running a Taskfile diff --git a/taskfile/precondition_test.go b/taskfile/precondition_test.go index 7eb84a2d..0d92832e 100644 --- a/taskfile/precondition_test.go +++ b/taskfile/precondition_test.go @@ -3,10 +3,10 @@ package taskfile_test import ( "testing" - "github.com/go-task/task/v3/taskfile" - "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" + + "github.com/go-task/task/v3/taskfile" ) func TestPreconditionParse(t *testing.T) { diff --git a/taskfile/read/taskfile.go b/taskfile/read/taskfile.go index 47fb1ee8..c6171227 100644 --- a/taskfile/read/taskfile.go +++ b/taskfile/read/taskfile.go @@ -7,11 +7,11 @@ import ( "path/filepath" "runtime" - "github.com/go-task/task/v3/internal/templater" - "github.com/go-task/task/v3/taskfile" - "github.com/joho/godotenv" "gopkg.in/yaml.v3" + + "github.com/go-task/task/v3/internal/templater" + "github.com/go-task/task/v3/taskfile" ) var ( diff --git a/taskfile/read/taskvars.go b/taskfile/read/taskvars.go index 1d7fbf0c..84285327 100644 --- a/taskfile/read/taskvars.go +++ b/taskfile/read/taskvars.go @@ -6,9 +6,9 @@ import ( "path/filepath" "runtime" - "github.com/go-task/task/v3/taskfile" - "gopkg.in/yaml.v3" + + "github.com/go-task/task/v3/taskfile" ) // Taskvars reads a Taskvars for a given directory diff --git a/taskfile/taskfile_test.go b/taskfile/taskfile_test.go index 6a13f049..e6b4470f 100644 --- a/taskfile/taskfile_test.go +++ b/taskfile/taskfile_test.go @@ -3,10 +3,10 @@ package taskfile_test import ( "testing" - "github.com/go-task/task/v3/taskfile" - "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" + + "github.com/go-task/task/v3/taskfile" ) func TestCmdParse(t *testing.T) {