From 3cbc89769d89782d03a46a56caf66bc811052d90 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Sun, 4 Nov 2018 21:23:35 -0200 Subject: [PATCH] Re-write import paths to v2 --- cmd/task/task.go | 4 ++-- go.mod | 2 +- help.go | 2 +- internal/args/args.go | 2 +- internal/args/args_test.go | 4 ++-- internal/compiler/compiler.go | 2 +- internal/compiler/env.go | 2 +- internal/compiler/v1/compiler_v1.go | 10 +++++----- internal/compiler/v2/compiler_v2.go | 10 +++++----- internal/output/output_test.go | 2 +- internal/taskfile/read/taskfile.go | 2 +- internal/taskfile/read/taskvars.go | 2 +- internal/taskfile/taskfile_test.go | 2 +- internal/templater/templater.go | 2 +- status.go | 6 +++--- task.go | 18 +++++++++--------- task_test.go | 4 ++-- variables.go | 4 ++-- watch.go | 2 +- 19 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cmd/task/task.go b/cmd/task/task.go index 40950ffe..57c3637d 100644 --- a/cmd/task/task.go +++ b/cmd/task/task.go @@ -7,8 +7,8 @@ import ( "os/signal" "syscall" - "github.com/go-task/task" - "github.com/go-task/task/internal/args" + "github.com/go-task/task/v2" + "github.com/go-task/task/v2/internal/args" "github.com/spf13/pflag" ) diff --git a/go.mod b/go.mod index e211c486..147fffb5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/go-task/task +module github.com/go-task/task/v2 require ( github.com/Masterminds/semver v0.0.0-20180807142431-c84ddcca87bf diff --git a/help.go b/help.go index 50b31fae..79417609 100644 --- a/help.go +++ b/help.go @@ -5,7 +5,7 @@ import ( "sort" "text/tabwriter" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" ) // PrintTasksHelp prints help os tasks that have a description diff --git a/internal/args/args.go b/internal/args/args.go index 2e1a8cd7..da731891 100644 --- a/internal/args/args.go +++ b/internal/args/args.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" ) var ( diff --git a/internal/args/args_test.go b/internal/args/args_test.go index f6d42d97..86b230fb 100644 --- a/internal/args/args_test.go +++ b/internal/args/args_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/go-task/task/internal/args" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/args" + "github.com/go-task/task/v2/internal/taskfile" "github.com/stretchr/testify/assert" ) diff --git a/internal/compiler/compiler.go b/internal/compiler/compiler.go index efe121cb..aa31d893 100644 --- a/internal/compiler/compiler.go +++ b/internal/compiler/compiler.go @@ -1,7 +1,7 @@ package compiler import ( - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" ) // Compiler handles compilation of a task before its execution. diff --git a/internal/compiler/env.go b/internal/compiler/env.go index aa39e72b..4a9ecf4c 100644 --- a/internal/compiler/env.go +++ b/internal/compiler/env.go @@ -4,7 +4,7 @@ import ( "os" "strings" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" ) // GetEnviron the all return all environment variables encapsulated on a diff --git a/internal/compiler/v1/compiler_v1.go b/internal/compiler/v1/compiler_v1.go index 4213a4b3..7b3bb703 100644 --- a/internal/compiler/v1/compiler_v1.go +++ b/internal/compiler/v1/compiler_v1.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/go-task/task/internal/compiler" - "github.com/go-task/task/internal/execext" - "github.com/go-task/task/internal/logger" - "github.com/go-task/task/internal/taskfile" - "github.com/go-task/task/internal/templater" + "github.com/go-task/task/v2/internal/compiler" + "github.com/go-task/task/v2/internal/execext" + "github.com/go-task/task/v2/internal/logger" + "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v2/internal/templater" ) var _ compiler.Compiler = &CompilerV1{} diff --git a/internal/compiler/v2/compiler_v2.go b/internal/compiler/v2/compiler_v2.go index 7cad6c90..c61b4b43 100644 --- a/internal/compiler/v2/compiler_v2.go +++ b/internal/compiler/v2/compiler_v2.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/go-task/task/internal/compiler" - "github.com/go-task/task/internal/execext" - "github.com/go-task/task/internal/logger" - "github.com/go-task/task/internal/taskfile" - "github.com/go-task/task/internal/templater" + "github.com/go-task/task/v2/internal/compiler" + "github.com/go-task/task/v2/internal/execext" + "github.com/go-task/task/v2/internal/logger" + "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v2/internal/templater" ) var _ compiler.Compiler = &CompilerV2{} diff --git a/internal/output/output_test.go b/internal/output/output_test.go index e2efd2db..8bc514ae 100644 --- a/internal/output/output_test.go +++ b/internal/output/output_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/go-task/task/internal/output" + "github.com/go-task/task/v2/internal/output" "github.com/stretchr/testify/assert" ) diff --git a/internal/taskfile/read/taskfile.go b/internal/taskfile/read/taskfile.go index 9c7c971a..40e5d68f 100644 --- a/internal/taskfile/read/taskfile.go +++ b/internal/taskfile/read/taskfile.go @@ -7,7 +7,7 @@ import ( "path/filepath" "runtime" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" "gopkg.in/yaml.v2" ) diff --git a/internal/taskfile/read/taskvars.go b/internal/taskfile/read/taskvars.go index 8d3e2eb2..b2022140 100644 --- a/internal/taskfile/read/taskvars.go +++ b/internal/taskfile/read/taskvars.go @@ -6,7 +6,7 @@ import ( "path/filepath" "runtime" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" "gopkg.in/yaml.v2" ) diff --git a/internal/taskfile/taskfile_test.go b/internal/taskfile/taskfile_test.go index 9c5e0150..0fed779d 100644 --- a/internal/taskfile/taskfile_test.go +++ b/internal/taskfile/taskfile_test.go @@ -3,7 +3,7 @@ package taskfile_test import ( "testing" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" diff --git a/internal/templater/templater.go b/internal/templater/templater.go index dfd6572b..65a2fde2 100644 --- a/internal/templater/templater.go +++ b/internal/templater/templater.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" ) // Templater is a help struct that allow us to call "replaceX" funcs multiple diff --git a/status.go b/status.go index 0459efee..5ba7cfda 100644 --- a/status.go +++ b/status.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/go-task/task/internal/execext" - "github.com/go-task/task/internal/status" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/execext" + "github.com/go-task/task/v2/internal/status" + "github.com/go-task/task/v2/internal/taskfile" ) // Status returns an error if any the of given tasks is not up-to-date diff --git a/task.go b/task.go index e8ba9381..d9d90a90 100644 --- a/task.go +++ b/task.go @@ -7,15 +7,15 @@ import ( "os" "sync/atomic" - "github.com/go-task/task/internal/compiler" - compilerv1 "github.com/go-task/task/internal/compiler/v1" - compilerv2 "github.com/go-task/task/internal/compiler/v2" - "github.com/go-task/task/internal/execext" - "github.com/go-task/task/internal/logger" - "github.com/go-task/task/internal/output" - "github.com/go-task/task/internal/taskfile" - "github.com/go-task/task/internal/taskfile/read" - "github.com/go-task/task/internal/taskfile/version" + "github.com/go-task/task/v2/internal/compiler" + compilerv1 "github.com/go-task/task/v2/internal/compiler/v1" + compilerv2 "github.com/go-task/task/v2/internal/compiler/v2" + "github.com/go-task/task/v2/internal/execext" + "github.com/go-task/task/v2/internal/logger" + "github.com/go-task/task/v2/internal/output" + "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile/read" + "github.com/go-task/task/v2/internal/taskfile/version" "github.com/Masterminds/semver" "golang.org/x/sync/errgroup" diff --git a/task_test.go b/task_test.go index 9b0bbb1a..31d0b2ea 100644 --- a/task_test.go +++ b/task_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/go-task/task" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2" + "github.com/go-task/task/v2/internal/taskfile" "github.com/mitchellh/go-homedir" "github.com/stretchr/testify/assert" diff --git a/variables.go b/variables.go index 5968fb7b..8e8e6947 100644 --- a/variables.go +++ b/variables.go @@ -3,8 +3,8 @@ package task import ( "path/filepath" - "github.com/go-task/task/internal/taskfile" - "github.com/go-task/task/internal/templater" + "github.com/go-task/task/v2/internal/taskfile" + "github.com/go-task/task/v2/internal/templater" "mvdan.cc/sh/shell" ) diff --git a/watch.go b/watch.go index 9660c057..14eda036 100644 --- a/watch.go +++ b/watch.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/go-task/task/internal/taskfile" + "github.com/go-task/task/v2/internal/taskfile" "github.com/mattn/go-zglob" "github.com/radovskyb/watcher" )