diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml index cd052368a2ad..6e6dff421716 100644 --- a/.golangci.next.reference.yml +++ b/.golangci.next.reference.yml @@ -1699,10 +1699,10 @@ linters: # Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`). # Default: [] funcs: - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf shadow: # Whether to be strict about shadowing; can be noisy. # Default: false diff --git a/.golangci.reference.yml b/.golangci.reference.yml index fb0895eb3700..383389ce9cd8 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -1929,10 +1929,10 @@ linters-settings: # Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`). # Default: [] funcs: - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf shadow: # Whether to be strict about shadowing; can be noisy. # Default: false diff --git a/.golangci.yml b/.golangci.yml index a01799a1cd3f..87fd0e952196 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -110,10 +110,10 @@ linters: settings: printf: funcs: - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf + - (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf enable: - nilness - shadow @@ -198,7 +198,7 @@ formatters: replacement: 'any' goimports: local-prefixes: - - github.com/golangci/golangci-lint + - github.com/golangci/golangci-lint/v2 exclusions: paths: - test/testdata_etc # test files diff --git a/cmd/golangci-lint/main.go b/cmd/golangci-lint/main.go index 019a0748d2cb..f7f3091dc653 100644 --- a/cmd/golangci-lint/main.go +++ b/cmd/golangci-lint/main.go @@ -6,8 +6,8 @@ import ( "os" "runtime/debug" - "github.com/golangci/golangci-lint/pkg/commands" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/commands" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) var ( diff --git a/docs/src/docs/welcome/install.mdx b/docs/src/docs/welcome/install.mdx index 0dbd7b18fec0..2d57c4424ea2 100644 --- a/docs/src/docs/welcome/install.mdx +++ b/docs/src/docs/welcome/install.mdx @@ -161,7 +161,7 @@ These installations aren't recommended because of the following points: 7. It's slower than binary installation. ```bash -go install github.com/golangci/golangci-lint/cmd/golangci-lint@{.LatestVersion} +go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@{.LatestVersion} ``` ## Next diff --git a/go.mod b/go.mod index 814b9d1a94ed..faba42dbd1a0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/golangci/golangci-lint +module github.com/golangci/golangci-lint/v2 go 1.23.0 diff --git a/internal/cache/cache.go b/internal/cache/cache.go index 41eb5c82be78..627993d2ecb9 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -14,9 +14,9 @@ import ( "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/internal/go/cache" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/internal/go/cache" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) type HashMode int diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go index 616e6344a281..df5271d12eb0 100644 --- a/internal/cache/cache_test.go +++ b/internal/cache/cache_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) func setupCache(t *testing.T) *Cache { diff --git a/internal/go/cache/cache.go b/internal/go/cache/cache.go index 3c3adf904c82..67c3e48f91a6 100644 --- a/internal/go/cache/cache.go +++ b/internal/go/cache/cache.go @@ -24,8 +24,8 @@ import ( "github.com/rogpeppe/go-internal/lockedfile" - "github.com/golangci/golangci-lint/internal/go/mmap" - "github.com/golangci/golangci-lint/internal/go/robustio" + "github.com/golangci/golangci-lint/v2/internal/go/mmap" + "github.com/golangci/golangci-lint/v2/internal/go/robustio" ) // An ActionID is a cache action key, the hash of a complete description of a diff --git a/internal/go/cache/cache_test.go b/internal/go/cache/cache_test.go index 208abcedc923..185dafc3aaf6 100644 --- a/internal/go/cache/cache_test.go +++ b/internal/go/cache/cache_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/golangci/golangci-lint/internal/go/testenv" + "github.com/golangci/golangci-lint/v2/internal/go/testenv" ) func init() { diff --git a/internal/go/cache/prog.go b/internal/go/cache/prog.go index a93740a3cf5d..8b317b021073 100644 --- a/internal/go/cache/prog.go +++ b/internal/go/cache/prog.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "github.com/golangci/golangci-lint/internal/go/quoted" + "github.com/golangci/golangci-lint/v2/internal/go/quoted" ) // ProgCache implements Cache via JSON messages over stdin/stdout to a child diff --git a/internal/x/tools/diff/myers/diff.go b/internal/x/tools/diff/myers/diff.go index 4f280036a6d2..2a0b722058af 100644 --- a/internal/x/tools/diff/myers/diff.go +++ b/internal/x/tools/diff/myers/diff.go @@ -8,7 +8,7 @@ package myers import ( "strings" - "github.com/golangci/golangci-lint/internal/x/tools/diff" + "github.com/golangci/golangci-lint/v2/internal/x/tools/diff" ) // Sources: diff --git a/internal/x/tools/diff/ndiff.go b/internal/x/tools/diff/ndiff.go index f7aa2b79f6b4..b429a69ee1f9 100644 --- a/internal/x/tools/diff/ndiff.go +++ b/internal/x/tools/diff/ndiff.go @@ -8,7 +8,7 @@ import ( "bytes" "unicode/utf8" - "github.com/golangci/golangci-lint/internal/x/tools/diff/lcs" + "github.com/golangci/golangci-lint/v2/internal/x/tools/diff/lcs" ) // Strings computes the differences between two strings. diff --git a/pkg/commands/cache.go b/pkg/commands/cache.go index 4f2c812dce91..13e895057358 100644 --- a/pkg/commands/cache.go +++ b/pkg/commands/cache.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/internal/cache" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type cacheCommand struct { diff --git a/pkg/commands/config.go b/pkg/commands/config.go index 2d25545779d7..eba00fe0d770 100644 --- a/pkg/commands/config.go +++ b/pkg/commands/config.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type pathOptions struct { diff --git a/pkg/commands/config_verify.go b/pkg/commands/config_verify.go index 76e09581cab9..ef7a4e094dbb 100644 --- a/pkg/commands/config_verify.go +++ b/pkg/commands/config_verify.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/pflag" "gopkg.in/yaml.v3" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) type verifyOptions struct { diff --git a/pkg/commands/custom.go b/pkg/commands/custom.go index 1bc9f9014615..a53197ce3457 100644 --- a/pkg/commands/custom.go +++ b/pkg/commands/custom.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/golangci/golangci-lint/pkg/commands/internal" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const envKeepTempFiles = "CUSTOM_GCL_KEEP_TEMP_FILES" diff --git a/pkg/commands/flagsets.go b/pkg/commands/flagsets.go index e7f60eae9771..2ef165852d02 100644 --- a/pkg/commands/flagsets.go +++ b/pkg/commands/flagsets.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/commands/internal" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) const defaultMaxIssuesPerLinter = 50 diff --git a/pkg/commands/fmt.go b/pkg/commands/fmt.go index 66ba197f05f6..355c0404b370 100644 --- a/pkg/commands/fmt.go +++ b/pkg/commands/fmt.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformat" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result/processors" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformat" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result/processors" ) type fmtOptions struct { diff --git a/pkg/commands/formatters.go b/pkg/commands/formatters.go index 74c95e7f8db0..0c64056550be 100644 --- a/pkg/commands/formatters.go +++ b/pkg/commands/formatters.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type formattersHelp struct { diff --git a/pkg/commands/help.go b/pkg/commands/help.go index 8accd001b269..bb5696e7c944 100644 --- a/pkg/commands/help.go +++ b/pkg/commands/help.go @@ -8,8 +8,8 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type helpOptions struct { diff --git a/pkg/commands/help_formatters.go b/pkg/commands/help_formatters.go index f9320aaf170b..e41cea368ba2 100644 --- a/pkg/commands/help_formatters.go +++ b/pkg/commands/help_formatters.go @@ -9,11 +9,11 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type formatterHelp struct { diff --git a/pkg/commands/help_linters.go b/pkg/commands/help_linters.go index 62da72811452..b4e647700dba 100644 --- a/pkg/commands/help_linters.go +++ b/pkg/commands/help_linters.go @@ -10,11 +10,11 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type linterHelp struct { diff --git a/pkg/commands/internal/builder.go b/pkg/commands/internal/builder.go index e95c0d2477e1..c008f1930ff6 100644 --- a/pkg/commands/internal/builder.go +++ b/pkg/commands/internal/builder.go @@ -12,7 +12,7 @@ import ( "time" "unicode" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) // Builder runs all the required commands to build a binary. diff --git a/pkg/commands/internal/migrate/fakeloader/fakeloader.go b/pkg/commands/internal/migrate/fakeloader/fakeloader.go index d1e718478136..fd17449b5737 100644 --- a/pkg/commands/internal/migrate/fakeloader/fakeloader.go +++ b/pkg/commands/internal/migrate/fakeloader/fakeloader.go @@ -6,8 +6,8 @@ import ( "github.com/go-viper/mapstructure/v2" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/parser" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/parser" + "github.com/golangci/golangci-lint/v2/pkg/config" ) // Load is used to keep case of configuration. diff --git a/pkg/commands/internal/migrate/migrate.go b/pkg/commands/internal/migrate/migrate.go index a1d01081ba0a..69b6c7c425d4 100644 --- a/pkg/commands/internal/migrate/migrate.go +++ b/pkg/commands/internal/migrate/migrate.go @@ -1,9 +1,9 @@ package migrate import ( - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func ToConfig(old *versionone.Config) *versiontwo.Config { diff --git a/pkg/commands/internal/migrate/migrate_formatters.go b/pkg/commands/internal/migrate/migrate_formatters.go index 2575fedc1426..8836e6db8886 100644 --- a/pkg/commands/internal/migrate/migrate_formatters.go +++ b/pkg/commands/internal/migrate/migrate_formatters.go @@ -4,9 +4,9 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toFormatters(old *versionone.Config) versiontwo.Formatters { diff --git a/pkg/commands/internal/migrate/migrate_issues.go b/pkg/commands/internal/migrate/migrate_issues.go index 31c9aacd1f55..eab9d17c6411 100644 --- a/pkg/commands/internal/migrate/migrate_issues.go +++ b/pkg/commands/internal/migrate/migrate_issues.go @@ -1,8 +1,8 @@ package migrate import ( - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toIssues(old *versionone.Config) versiontwo.Issues { diff --git a/pkg/commands/internal/migrate/migrate_linter_names.go b/pkg/commands/internal/migrate/migrate_linter_names.go index eb075d2073a7..495f73f5ef6d 100644 --- a/pkg/commands/internal/migrate/migrate_linter_names.go +++ b/pkg/commands/internal/migrate/migrate_linter_names.go @@ -4,8 +4,8 @@ import ( "cmp" "slices" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" ) type LinterInfo struct { diff --git a/pkg/commands/internal/migrate/migrate_linter_names_test.go b/pkg/commands/internal/migrate/migrate_linter_names_test.go index 360258ee93e4..e90e9e58ea32 100644 --- a/pkg/commands/internal/migrate/migrate_linter_names_test.go +++ b/pkg/commands/internal/migrate/migrate_linter_names_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" ) func Test_disableAllFilter(t *testing.T) { diff --git a/pkg/commands/internal/migrate/migrate_linters.go b/pkg/commands/internal/migrate/migrate_linters.go index 80fd96dbacfd..0e16c900abf8 100644 --- a/pkg/commands/internal/migrate/migrate_linters.go +++ b/pkg/commands/internal/migrate/migrate_linters.go @@ -1,9 +1,9 @@ package migrate import ( - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toLinters(old *versionone.Config) versiontwo.Linters { diff --git a/pkg/commands/internal/migrate/migrate_linters_exclusions.go b/pkg/commands/internal/migrate/migrate_linters_exclusions.go index 65eb6e82251b..aac4d381a94f 100644 --- a/pkg/commands/internal/migrate/migrate_linters_exclusions.go +++ b/pkg/commands/internal/migrate/migrate_linters_exclusions.go @@ -3,11 +3,11 @@ package migrate import ( "slices" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result/processors" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result/processors" ) func toExclusions(old *versionone.Config) versiontwo.LinterExclusions { diff --git a/pkg/commands/internal/migrate/migrate_linters_settings.go b/pkg/commands/internal/migrate/migrate_linters_settings.go index 1605ff13c6c9..2566a671ad77 100644 --- a/pkg/commands/internal/migrate/migrate_linters_settings.go +++ b/pkg/commands/internal/migrate/migrate_linters_settings.go @@ -4,9 +4,9 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toLinterSettings(old versionone.LintersSettings) versiontwo.LintersSettings { diff --git a/pkg/commands/internal/migrate/migrate_output.go b/pkg/commands/internal/migrate/migrate_output.go index c2ee009edb3e..e76f8e447138 100644 --- a/pkg/commands/internal/migrate/migrate_output.go +++ b/pkg/commands/internal/migrate/migrate_output.go @@ -3,9 +3,9 @@ package migrate import ( "slices" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toOutput(old *versionone.Config) versiontwo.Output { diff --git a/pkg/commands/internal/migrate/migrate_run.go b/pkg/commands/internal/migrate/migrate_run.go index ebedecd5b7e9..88db447095f0 100644 --- a/pkg/commands/internal/migrate/migrate_run.go +++ b/pkg/commands/internal/migrate/migrate_run.go @@ -1,9 +1,9 @@ package migrate import ( - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toRun(old *versionone.Config) versiontwo.Run { diff --git a/pkg/commands/internal/migrate/migrate_severity.go b/pkg/commands/internal/migrate/migrate_severity.go index 00fd0f858662..6db40bca782f 100644 --- a/pkg/commands/internal/migrate/migrate_severity.go +++ b/pkg/commands/internal/migrate/migrate_severity.go @@ -1,8 +1,8 @@ package migrate import ( - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo" ) func toSeverity(old *versionone.Config) versiontwo.Severity { diff --git a/pkg/commands/internal/migrate/migrate_test.go b/pkg/commands/internal/migrate/migrate_test.go index 9880a4dbcb1f..461d60ab54e6 100644 --- a/pkg/commands/internal/migrate/migrate_test.go +++ b/pkg/commands/internal/migrate/migrate_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/fakeloader" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/parser" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/fakeloader" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/parser" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" ) type fakeFile struct { diff --git a/pkg/commands/internal/migrate/versionone/linters_settings.go b/pkg/commands/internal/migrate/versionone/linters_settings.go index bff3cf7df13a..49427c447530 100644 --- a/pkg/commands/internal/migrate/versionone/linters_settings.go +++ b/pkg/commands/internal/migrate/versionone/linters_settings.go @@ -5,7 +5,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" ) type LintersSettings struct { diff --git a/pkg/commands/internal/migrate/versionone/output.go b/pkg/commands/internal/migrate/versionone/output.go index 07a5671d1a71..408a07ab6577 100644 --- a/pkg/commands/internal/migrate/versionone/output.go +++ b/pkg/commands/internal/migrate/versionone/output.go @@ -3,7 +3,7 @@ package versionone import ( "strings" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" ) type Output struct { diff --git a/pkg/commands/linters.go b/pkg/commands/linters.go index 606d93bbfa40..3578bc4fbbdd 100644 --- a/pkg/commands/linters.go +++ b/pkg/commands/linters.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type lintersHelp struct { diff --git a/pkg/commands/migrate.go b/pkg/commands/migrate.go index de2a3ab6ac0b..700822a78ab7 100644 --- a/pkg/commands/migrate.go +++ b/pkg/commands/migrate.go @@ -13,13 +13,13 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/fakeloader" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/parser" - "github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/fakeloader" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/parser" + "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type migrateOptions struct { diff --git a/pkg/commands/root.go b/pkg/commands/root.go index e739cc12f57a..e3dcc527b118 100644 --- a/pkg/commands/root.go +++ b/pkg/commands/root.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) func Execute(info BuildInfo) error { diff --git a/pkg/commands/run.go b/pkg/commands/run.go index 20ff2df9a0d3..6ae7f3bf71bd 100644 --- a/pkg/commands/run.go +++ b/pkg/commands/run.go @@ -27,20 +27,20 @@ import ( "go.uber.org/automaxprocs/maxprocs" "gopkg.in/yaml.v3" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goanalysis/load" - "github.com/golangci/golangci-lint/pkg/goutil" - "github.com/golangci/golangci-lint/pkg/lint" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/printers" - "github.com/golangci/golangci-lint/pkg/report" - "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/internal/cache" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/load" + "github.com/golangci/golangci-lint/v2/pkg/goutil" + "github.com/golangci/golangci-lint/v2/pkg/lint" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/printers" + "github.com/golangci/golangci-lint/v2/pkg/report" + "github.com/golangci/golangci-lint/v2/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) const defaultTimeout = 0 * time.Minute diff --git a/pkg/config/base_loader.go b/pkg/config/base_loader.go index 61e07be0019d..9ad332ac2398 100644 --- a/pkg/config/base_loader.go +++ b/pkg/config/base_loader.go @@ -11,9 +11,9 @@ import ( "github.com/mitchellh/go-homedir" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type BaseConfig interface { diff --git a/pkg/config/loader.go b/pkg/config/loader.go index 90f0fbba840d..25e985e11231 100644 --- a/pkg/config/loader.go +++ b/pkg/config/loader.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goutil" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goutil" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) var errConfigDisabled = errors.New("config is disabled by --no-config") diff --git a/pkg/config/run.go b/pkg/config/run.go index dcd6a20e2ff6..dcddf0cb61da 100644 --- a/pkg/config/run.go +++ b/pkg/config/run.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/golangci/golangci-lint/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" ) // Run encapsulates the config options for running the linter analysis. diff --git a/pkg/fsutils/filecache.go b/pkg/fsutils/filecache.go index e8e5ba19b780..e91b58748d39 100644 --- a/pkg/fsutils/filecache.go +++ b/pkg/fsutils/filecache.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type FileCache struct { diff --git a/pkg/goanalysis/issue.go b/pkg/goanalysis/issue.go index 854e7d15f0c1..c41702595c55 100644 --- a/pkg/goanalysis/issue.go +++ b/pkg/goanalysis/issue.go @@ -5,7 +5,7 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) type Issue struct { diff --git a/pkg/goanalysis/linter.go b/pkg/goanalysis/linter.go index 13d3a09a585a..80ccfe456408 100644 --- a/pkg/goanalysis/linter.go +++ b/pkg/goanalysis/linter.go @@ -9,8 +9,8 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const ( diff --git a/pkg/goanalysis/metalinter.go b/pkg/goanalysis/metalinter.go index c2a7949974ce..4db143baddb3 100644 --- a/pkg/goanalysis/metalinter.go +++ b/pkg/goanalysis/metalinter.go @@ -6,8 +6,8 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) type MetaLinter struct { diff --git a/pkg/goanalysis/pkgerrors/errors.go b/pkg/goanalysis/pkgerrors/errors.go index 7da659e80376..05d2c5238f8b 100644 --- a/pkg/goanalysis/pkgerrors/errors.go +++ b/pkg/goanalysis/pkgerrors/errors.go @@ -6,8 +6,8 @@ import ( "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) type IllTypedError struct { diff --git a/pkg/goanalysis/pkgerrors/parse.go b/pkg/goanalysis/pkgerrors/parse.go index b25b50f713ed..8c49a55929ed 100644 --- a/pkg/goanalysis/pkgerrors/parse.go +++ b/pkg/goanalysis/pkgerrors/parse.go @@ -9,7 +9,7 @@ import ( "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func parseError(srcErr packages.Error) (*result.Issue, error) { diff --git a/pkg/goanalysis/runner.go b/pkg/goanalysis/runner.go index 7cff0149a4c0..808c9d2ad68c 100644 --- a/pkg/goanalysis/runner.go +++ b/pkg/goanalysis/runner.go @@ -16,11 +16,11 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/golangci/golangci-lint/internal/errorutil" - "github.com/golangci/golangci-lint/pkg/goanalysis/load" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/internal/cache" + "github.com/golangci/golangci-lint/v2/internal/errorutil" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/load" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) var ( diff --git a/pkg/goanalysis/runner_action.go b/pkg/goanalysis/runner_action.go index 2e1c4142285e..2c332d83e85f 100644 --- a/pkg/goanalysis/runner_action.go +++ b/pkg/goanalysis/runner_action.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime/debug" - "github.com/golangci/golangci-lint/internal/errorutil" + "github.com/golangci/golangci-lint/v2/internal/errorutil" ) type actionAllocator struct { diff --git a/pkg/goanalysis/runner_action_cache.go b/pkg/goanalysis/runner_action_cache.go index e06ea2979cae..2cf4dcfcab2f 100644 --- a/pkg/goanalysis/runner_action_cache.go +++ b/pkg/goanalysis/runner_action_cache.go @@ -8,7 +8,7 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/types/objectpath" - "github.com/golangci/golangci-lint/internal/cache" + "github.com/golangci/golangci-lint/v2/internal/cache" ) type Fact struct { diff --git a/pkg/goanalysis/runner_checker.go b/pkg/goanalysis/runner_checker.go index 376a37f03967..569002ed4b9f 100644 --- a/pkg/goanalysis/runner_checker.go +++ b/pkg/goanalysis/runner_checker.go @@ -18,9 +18,9 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/internal/x/tools/analysisflags" - "github.com/golangci/golangci-lint/internal/x/tools/analysisinternal" - "github.com/golangci/golangci-lint/pkg/goanalysis/pkgerrors" + "github.com/golangci/golangci-lint/v2/internal/x/tools/analysisflags" + "github.com/golangci/golangci-lint/v2/internal/x/tools/analysisinternal" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/pkgerrors" ) // NOTE(ldez) altered: custom fields; remove 'once' and 'duration'. diff --git a/pkg/goanalysis/runner_loadingpackage.go b/pkg/goanalysis/runner_loadingpackage.go index fca4b8c3adbc..0bf8f3fbb362 100644 --- a/pkg/goanalysis/runner_loadingpackage.go +++ b/pkg/goanalysis/runner_loadingpackage.go @@ -17,9 +17,9 @@ import ( "golang.org/x/tools/go/gcexportdata" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/goanalysis/load" - "github.com/golangci/golangci-lint/pkg/goutil" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/load" + "github.com/golangci/golangci-lint/v2/pkg/goutil" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const unsafePkgName = "unsafe" diff --git a/pkg/goanalysis/runners.go b/pkg/goanalysis/runners.go index 3a9a35dec153..5ffc1529363b 100644 --- a/pkg/goanalysis/runners.go +++ b/pkg/goanalysis/runners.go @@ -8,11 +8,11 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/goanalysis/pkgerrors" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/pkgerrors" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) type runAnalyzersConfig interface { diff --git a/pkg/goanalysis/runners_cache.go b/pkg/goanalysis/runners_cache.go index 4366155b02ae..9673197c9ec9 100644 --- a/pkg/goanalysis/runners_cache.go +++ b/pkg/goanalysis/runners_cache.go @@ -11,9 +11,9 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/internal/cache" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func saveIssuesToCache(allPkgs []*packages.Package, pkgsFromCache map[*packages.Package]bool, diff --git a/pkg/goformat/runner.go b/pkg/goformat/runner.go index 7bb0460268a5..ebf4dc993c86 100644 --- a/pkg/goformat/runner.go +++ b/pkg/goformat/runner.go @@ -14,11 +14,11 @@ import ( "github.com/rogpeppe/go-internal/diff" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result/processors" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result/processors" ) type Runner struct { diff --git a/pkg/goformatters/analyzer.go b/pkg/goformatters/analyzer.go index c0ea66e7e66c..d6d92d5b9c24 100644 --- a/pkg/goformatters/analyzer.go +++ b/pkg/goformatters/analyzer.go @@ -9,9 +9,9 @@ import ( "github.com/rogpeppe/go-internal/diff" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters/internal" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/internal" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) // NewAnalyzer converts a [Formatter] to an [analysis.Analyzer]. diff --git a/pkg/goformatters/gci/gci.go b/pkg/goformatters/gci/gci.go index 4b8c19c29004..3eba10f103c9 100644 --- a/pkg/goformatters/gci/gci.go +++ b/pkg/goformatters/gci/gci.go @@ -8,9 +8,9 @@ import ( "github.com/daixiang0/gci/pkg/log" "github.com/ldez/grignotin/gomod" - "github.com/golangci/golangci-lint/pkg/config" - gcicfgi "github.com/golangci/golangci-lint/pkg/goformatters/gci/internal/config" - "github.com/golangci/golangci-lint/pkg/goformatters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + gcicfgi "github.com/golangci/golangci-lint/v2/pkg/goformatters/gci/internal/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/internal" ) const Name = "gci" diff --git a/pkg/goformatters/gci/internal/config/config.go b/pkg/goformatters/gci/internal/config/config.go index 9acbce3a006b..c859b442fc23 100644 --- a/pkg/goformatters/gci/internal/config/config.go +++ b/pkg/goformatters/gci/internal/config/config.go @@ -9,7 +9,7 @@ import ( "github.com/daixiang0/gci/pkg/config" "github.com/daixiang0/gci/pkg/section" - sectioni "github.com/golangci/golangci-lint/pkg/goformatters/gci/internal/section" + sectioni "github.com/golangci/golangci-lint/v2/pkg/goformatters/gci/internal/section" ) var defaultOrder = map[string]int{ diff --git a/pkg/goformatters/gofmt/gofmt.go b/pkg/goformatters/gofmt/gofmt.go index 9005c751d2e2..4d5ff863291c 100644 --- a/pkg/goformatters/gofmt/gofmt.go +++ b/pkg/goformatters/gofmt/gofmt.go @@ -3,7 +3,7 @@ package gofmt import ( "github.com/golangci/gofmt/gofmt" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) const Name = "gofmt" diff --git a/pkg/goformatters/gofumpt/gofumpt.go b/pkg/goformatters/gofumpt/gofumpt.go index 37548f948a4c..d8f5f2f73574 100644 --- a/pkg/goformatters/gofumpt/gofumpt.go +++ b/pkg/goformatters/gofumpt/gofumpt.go @@ -5,7 +5,7 @@ import ( gofumpt "mvdan.cc/gofumpt/format" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) const Name = "gofumpt" diff --git a/pkg/goformatters/goimports/goimports.go b/pkg/goformatters/goimports/goimports.go index b1c9dff5d10a..5b7edf2e476b 100644 --- a/pkg/goformatters/goimports/goimports.go +++ b/pkg/goformatters/goimports/goimports.go @@ -5,7 +5,7 @@ import ( "golang.org/x/tools/imports" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) const Name = "goimports" diff --git a/pkg/goformatters/golines/golines.go b/pkg/goformatters/golines/golines.go index c61391abcc9a..ffd5b5f8112a 100644 --- a/pkg/goformatters/golines/golines.go +++ b/pkg/goformatters/golines/golines.go @@ -3,7 +3,7 @@ package golines import ( "github.com/golangci/golines" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) const Name = "golines" diff --git a/pkg/goformatters/internal/commons.go b/pkg/goformatters/internal/commons.go index 5320e786b56b..f18819e2f1fa 100644 --- a/pkg/goformatters/internal/commons.go +++ b/pkg/goformatters/internal/commons.go @@ -1,6 +1,6 @@ package internal -import "github.com/golangci/golangci-lint/pkg/logutils" +import "github.com/golangci/golangci-lint/v2/pkg/logutils" // FormatterLogger must be used only when the context logger is not available. var FormatterLogger = logutils.NewStderrLog(logutils.DebugKeyFormatter) diff --git a/pkg/goformatters/internal/diff.go b/pkg/goformatters/internal/diff.go index 75d65b73adcf..7b9f80bc4228 100644 --- a/pkg/goformatters/internal/diff.go +++ b/pkg/goformatters/internal/diff.go @@ -11,8 +11,8 @@ import ( diffpkg "github.com/sourcegraph/go-diff/diff" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type Change struct { diff --git a/pkg/goformatters/internal/diff_test.go b/pkg/goformatters/internal/diff_test.go index 1b8dad10db5d..09deb8c7243d 100644 --- a/pkg/goformatters/internal/diff_test.go +++ b/pkg/goformatters/internal/diff_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) func Test_parse(t *testing.T) { diff --git a/pkg/goformatters/meta_formatter.go b/pkg/goformatters/meta_formatter.go index eea022e75f9d..718caaa96003 100644 --- a/pkg/goformatters/meta_formatter.go +++ b/pkg/goformatters/meta_formatter.go @@ -6,13 +6,13 @@ import ( "go/format" "slices" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters/gci" - "github.com/golangci/golangci-lint/pkg/goformatters/gofmt" - "github.com/golangci/golangci-lint/pkg/goformatters/gofumpt" - "github.com/golangci/golangci-lint/pkg/goformatters/goimports" - "github.com/golangci/golangci-lint/pkg/goformatters/golines" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gci" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofmt" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofumpt" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/goimports" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/golines" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type MetaFormatter struct { diff --git a/pkg/golinters/asasalint/asasalint.go b/pkg/golinters/asasalint/asasalint.go index ade349610a46..5f33428c2224 100644 --- a/pkg/golinters/asasalint/asasalint.go +++ b/pkg/golinters/asasalint/asasalint.go @@ -4,9 +4,9 @@ import ( "github.com/alingse/asasalint" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) func New(settings *config.AsasalintSettings) *goanalysis.Linter { diff --git a/pkg/golinters/asasalint/asasalint_integration_test.go b/pkg/golinters/asasalint/asasalint_integration_test.go index b6431cae3649..5a1d49850082 100644 --- a/pkg/golinters/asasalint/asasalint_integration_test.go +++ b/pkg/golinters/asasalint/asasalint_integration_test.go @@ -3,7 +3,7 @@ package asasalint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/asciicheck/asciicheck.go b/pkg/golinters/asciicheck/asciicheck.go index 675dfc478087..b5cdaa80bbeb 100644 --- a/pkg/golinters/asciicheck/asciicheck.go +++ b/pkg/golinters/asciicheck/asciicheck.go @@ -4,7 +4,7 @@ import ( "github.com/tdakkota/asciicheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/asciicheck/asciicheck_integration_test.go b/pkg/golinters/asciicheck/asciicheck_integration_test.go index dca7e1698ec1..5c7a05a7bb37 100644 --- a/pkg/golinters/asciicheck/asciicheck_integration_test.go +++ b/pkg/golinters/asciicheck/asciicheck_integration_test.go @@ -3,7 +3,7 @@ package asciicheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/bidichk/bidichk.go b/pkg/golinters/bidichk/bidichk.go index c6315965c4ec..2d2a8d664fa4 100644 --- a/pkg/golinters/bidichk/bidichk.go +++ b/pkg/golinters/bidichk/bidichk.go @@ -6,8 +6,8 @@ import ( "github.com/breml/bidichk/pkg/bidichk" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.BiDiChkSettings) *goanalysis.Linter { diff --git a/pkg/golinters/bidichk/bidichk_integration_test.go b/pkg/golinters/bidichk/bidichk_integration_test.go index 142ffe1b12be..76fb8638b69c 100644 --- a/pkg/golinters/bidichk/bidichk_integration_test.go +++ b/pkg/golinters/bidichk/bidichk_integration_test.go @@ -3,7 +3,7 @@ package bidichk import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/bodyclose/bodyclose.go b/pkg/golinters/bodyclose/bodyclose.go index c520e88db345..0c86fbe76513 100644 --- a/pkg/golinters/bodyclose/bodyclose.go +++ b/pkg/golinters/bodyclose/bodyclose.go @@ -4,7 +4,7 @@ import ( "github.com/timakin/bodyclose/passes/bodyclose" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/bodyclose/bodyclose_integration_test.go b/pkg/golinters/bodyclose/bodyclose_integration_test.go index e4b47c90c66f..9782d66eeb6c 100644 --- a/pkg/golinters/bodyclose/bodyclose_integration_test.go +++ b/pkg/golinters/bodyclose/bodyclose_integration_test.go @@ -3,7 +3,7 @@ package bodyclose import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/canonicalheader/canonicalheader.go b/pkg/golinters/canonicalheader/canonicalheader.go index d721916a49cd..bda1dfbd20d3 100644 --- a/pkg/golinters/canonicalheader/canonicalheader.go +++ b/pkg/golinters/canonicalheader/canonicalheader.go @@ -4,7 +4,7 @@ import ( "github.com/lasiar/canonicalheader" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/canonicalheader/canonicalheader_test.go b/pkg/golinters/canonicalheader/canonicalheader_test.go index de9139a3a693..7bd07ba46b52 100644 --- a/pkg/golinters/canonicalheader/canonicalheader_test.go +++ b/pkg/golinters/canonicalheader/canonicalheader_test.go @@ -3,7 +3,7 @@ package canonicalheader_test import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/containedctx/containedctx.go b/pkg/golinters/containedctx/containedctx.go index 6fdb4ea6e186..6bdb08350dd7 100644 --- a/pkg/golinters/containedctx/containedctx.go +++ b/pkg/golinters/containedctx/containedctx.go @@ -4,7 +4,7 @@ import ( "github.com/sivchari/containedctx" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/containedctx/containedctx_integration_test.go b/pkg/golinters/containedctx/containedctx_integration_test.go index 9bc23d88ed4d..e5d73bbf469c 100644 --- a/pkg/golinters/containedctx/containedctx_integration_test.go +++ b/pkg/golinters/containedctx/containedctx_integration_test.go @@ -3,7 +3,7 @@ package containedctx import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/contextcheck/contextcheck.go b/pkg/golinters/contextcheck/contextcheck.go index a34c518b2c0f..9d01fb7a2038 100644 --- a/pkg/golinters/contextcheck/contextcheck.go +++ b/pkg/golinters/contextcheck/contextcheck.go @@ -4,8 +4,8 @@ import ( "github.com/kkHAIKE/contextcheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/contextcheck/contextcheck_integration_test.go b/pkg/golinters/contextcheck/contextcheck_integration_test.go index e5a1cdc09fef..40ffaf3ea57d 100644 --- a/pkg/golinters/contextcheck/contextcheck_integration_test.go +++ b/pkg/golinters/contextcheck/contextcheck_integration_test.go @@ -3,7 +3,7 @@ package contextcheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/copyloopvar/copyloopvar.go b/pkg/golinters/copyloopvar/copyloopvar.go index adb4ee728465..f6ca96f99567 100644 --- a/pkg/golinters/copyloopvar/copyloopvar.go +++ b/pkg/golinters/copyloopvar/copyloopvar.go @@ -4,8 +4,8 @@ import ( "github.com/karamaru-alpha/copyloopvar" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.CopyLoopVarSettings) *goanalysis.Linter { diff --git a/pkg/golinters/copyloopvar/copyloopvar_integration_test.go b/pkg/golinters/copyloopvar/copyloopvar_integration_test.go index 348fc893e824..849921758223 100644 --- a/pkg/golinters/copyloopvar/copyloopvar_integration_test.go +++ b/pkg/golinters/copyloopvar/copyloopvar_integration_test.go @@ -3,7 +3,7 @@ package copyloopvar import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/cyclop/cyclop.go b/pkg/golinters/cyclop/cyclop.go index d405cb7b8760..41db272cd4e3 100644 --- a/pkg/golinters/cyclop/cyclop.go +++ b/pkg/golinters/cyclop/cyclop.go @@ -4,8 +4,8 @@ import ( "github.com/bkielbasa/cyclop/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.CyclopSettings) *goanalysis.Linter { diff --git a/pkg/golinters/cyclop/cyclop_integration_test.go b/pkg/golinters/cyclop/cyclop_integration_test.go index 2e1568142ea0..313ee3314a59 100644 --- a/pkg/golinters/cyclop/cyclop_integration_test.go +++ b/pkg/golinters/cyclop/cyclop_integration_test.go @@ -3,7 +3,7 @@ package cyclop import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/decorder/decorder.go b/pkg/golinters/decorder/decorder.go index a05f6a32573f..03a7853c27e2 100644 --- a/pkg/golinters/decorder/decorder.go +++ b/pkg/golinters/decorder/decorder.go @@ -6,8 +6,8 @@ import ( "gitlab.com/bosi/decorder" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.DecorderSettings) *goanalysis.Linter { diff --git a/pkg/golinters/decorder/decorder_integration_test.go b/pkg/golinters/decorder/decorder_integration_test.go index 78d7a1a9a453..03b50dc2d8e9 100644 --- a/pkg/golinters/decorder/decorder_integration_test.go +++ b/pkg/golinters/decorder/decorder_integration_test.go @@ -3,7 +3,7 @@ package decorder import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/depguard/depguard.go b/pkg/golinters/depguard/depguard.go index 194405999689..ab0863d6a064 100644 --- a/pkg/golinters/depguard/depguard.go +++ b/pkg/golinters/depguard/depguard.go @@ -6,10 +6,10 @@ import ( "github.com/OpenPeeDeeP/depguard/v2" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" ) func New(settings *config.DepGuardSettings, basePath string) *goanalysis.Linter { diff --git a/pkg/golinters/depguard/depguard_integration_test.go b/pkg/golinters/depguard/depguard_integration_test.go index 4c541f2e6555..093dc901b81c 100644 --- a/pkg/golinters/depguard/depguard_integration_test.go +++ b/pkg/golinters/depguard/depguard_integration_test.go @@ -3,7 +3,7 @@ package depguard import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/dogsled/dogsled.go b/pkg/golinters/dogsled/dogsled.go index afa8152facbd..23d48ba57274 100644 --- a/pkg/golinters/dogsled/dogsled.go +++ b/pkg/golinters/dogsled/dogsled.go @@ -7,8 +7,8 @@ import ( "golang.org/x/tools/go/analysis/passes/inspect" "golang.org/x/tools/go/ast/inspector" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "dogsled" diff --git a/pkg/golinters/dogsled/dogsled_integration_test.go b/pkg/golinters/dogsled/dogsled_integration_test.go index b84b5529941e..3d1ba0da1cf9 100644 --- a/pkg/golinters/dogsled/dogsled_integration_test.go +++ b/pkg/golinters/dogsled/dogsled_integration_test.go @@ -3,7 +3,7 @@ package dogsled import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/dupl/dupl.go b/pkg/golinters/dupl/dupl.go index 6d1a9809c741..993bfd6f2326 100644 --- a/pkg/golinters/dupl/dupl.go +++ b/pkg/golinters/dupl/dupl.go @@ -8,12 +8,12 @@ import ( duplAPI "github.com/golangci/dupl/lib" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "dupl" diff --git a/pkg/golinters/dupl/dupl_integration_test.go b/pkg/golinters/dupl/dupl_integration_test.go index ea0a14a964e5..8b1882198519 100644 --- a/pkg/golinters/dupl/dupl_integration_test.go +++ b/pkg/golinters/dupl/dupl_integration_test.go @@ -3,7 +3,7 @@ package dupl import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/dupword/dupword.go b/pkg/golinters/dupword/dupword.go index a2bcc34d40d0..62851475f608 100644 --- a/pkg/golinters/dupword/dupword.go +++ b/pkg/golinters/dupword/dupword.go @@ -6,8 +6,8 @@ import ( "github.com/Abirdcfly/dupword" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.DupWordSettings) *goanalysis.Linter { diff --git a/pkg/golinters/dupword/dupword_integration_test.go b/pkg/golinters/dupword/dupword_integration_test.go index 89d84ba7e9fb..83b93d12bc9c 100644 --- a/pkg/golinters/dupword/dupword_integration_test.go +++ b/pkg/golinters/dupword/dupword_integration_test.go @@ -3,7 +3,7 @@ package dupword import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/durationcheck/durationcheck.go b/pkg/golinters/durationcheck/durationcheck.go index 88f22c27c029..d3e74231f5b3 100644 --- a/pkg/golinters/durationcheck/durationcheck.go +++ b/pkg/golinters/durationcheck/durationcheck.go @@ -4,7 +4,7 @@ import ( "github.com/charithe/durationcheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/durationcheck/durationcheck_integration_test.go b/pkg/golinters/durationcheck/durationcheck_integration_test.go index f684f9c2f660..9aba873a27e6 100644 --- a/pkg/golinters/durationcheck/durationcheck_integration_test.go +++ b/pkg/golinters/durationcheck/durationcheck_integration_test.go @@ -3,7 +3,7 @@ package durationcheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/err113/err113.go b/pkg/golinters/err113/err113.go index 2600128be155..78ef99d6a1a9 100644 --- a/pkg/golinters/err113/err113.go +++ b/pkg/golinters/err113/err113.go @@ -4,7 +4,7 @@ import ( "github.com/Djarvur/go-err113" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/err113/err113_integration_test.go b/pkg/golinters/err113/err113_integration_test.go index 30dbd2cf3cca..eb1dd128f94c 100644 --- a/pkg/golinters/err113/err113_integration_test.go +++ b/pkg/golinters/err113/err113_integration_test.go @@ -3,7 +3,7 @@ package err113 import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/errcheck/errcheck.go b/pkg/golinters/errcheck/errcheck.go index 16d9eb36c974..56d00c350b4f 100644 --- a/pkg/golinters/errcheck/errcheck.go +++ b/pkg/golinters/errcheck/errcheck.go @@ -10,11 +10,11 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "errcheck" diff --git a/pkg/golinters/errcheck/errcheck_integration_test.go b/pkg/golinters/errcheck/errcheck_integration_test.go index 704b382354d3..315cac3109fe 100644 --- a/pkg/golinters/errcheck/errcheck_integration_test.go +++ b/pkg/golinters/errcheck/errcheck_integration_test.go @@ -3,7 +3,7 @@ package errcheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/errchkjson/errchkjson.go b/pkg/golinters/errchkjson/errchkjson.go index 506113d6d572..a705406e49f5 100644 --- a/pkg/golinters/errchkjson/errchkjson.go +++ b/pkg/golinters/errchkjson/errchkjson.go @@ -4,8 +4,8 @@ import ( "github.com/breml/errchkjson" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.ErrChkJSONSettings) *goanalysis.Linter { diff --git a/pkg/golinters/errchkjson/errchkjson_integration_test.go b/pkg/golinters/errchkjson/errchkjson_integration_test.go index 4e89dab86e68..a384351809b4 100644 --- a/pkg/golinters/errchkjson/errchkjson_integration_test.go +++ b/pkg/golinters/errchkjson/errchkjson_integration_test.go @@ -3,7 +3,7 @@ package errchkjson import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/errname/errname.go b/pkg/golinters/errname/errname.go index f868854c1286..36d6f12356fd 100644 --- a/pkg/golinters/errname/errname.go +++ b/pkg/golinters/errname/errname.go @@ -4,7 +4,7 @@ import ( "github.com/Antonboom/errname/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/errname/errname_integration_test.go b/pkg/golinters/errname/errname_integration_test.go index 62b0422c7f78..c3fe61cfb673 100644 --- a/pkg/golinters/errname/errname_integration_test.go +++ b/pkg/golinters/errname/errname_integration_test.go @@ -3,7 +3,7 @@ package errname import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/errorlint/errorlint.go b/pkg/golinters/errorlint/errorlint.go index 14851adc2847..7560bc0af90b 100644 --- a/pkg/golinters/errorlint/errorlint.go +++ b/pkg/golinters/errorlint/errorlint.go @@ -4,8 +4,8 @@ import ( "github.com/polyfloyd/go-errorlint/errorlint" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.ErrorLintSettings) *goanalysis.Linter { diff --git a/pkg/golinters/errorlint/errorlint_integration_test.go b/pkg/golinters/errorlint/errorlint_integration_test.go index 9d358088cb0d..0fbb1df1cfa6 100644 --- a/pkg/golinters/errorlint/errorlint_integration_test.go +++ b/pkg/golinters/errorlint/errorlint_integration_test.go @@ -3,7 +3,7 @@ package errorlint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/exhaustive/exhaustive.go b/pkg/golinters/exhaustive/exhaustive.go index 1e73bc274d81..be77e54a4bc6 100644 --- a/pkg/golinters/exhaustive/exhaustive.go +++ b/pkg/golinters/exhaustive/exhaustive.go @@ -4,8 +4,8 @@ import ( "github.com/nishanths/exhaustive" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.ExhaustiveSettings) *goanalysis.Linter { diff --git a/pkg/golinters/exhaustive/exhaustive_integration_test.go b/pkg/golinters/exhaustive/exhaustive_integration_test.go index 2c06bc619f7d..8ee852a5be97 100644 --- a/pkg/golinters/exhaustive/exhaustive_integration_test.go +++ b/pkg/golinters/exhaustive/exhaustive_integration_test.go @@ -3,7 +3,7 @@ package exhaustive import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/exhaustruct/exhaustruct.go b/pkg/golinters/exhaustruct/exhaustruct.go index 53ad87154fef..9b742129969d 100644 --- a/pkg/golinters/exhaustruct/exhaustruct.go +++ b/pkg/golinters/exhaustruct/exhaustruct.go @@ -4,9 +4,9 @@ import ( "github.com/GaijinEntertainment/go-exhaustruct/v3/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) func New(settings *config.ExhaustructSettings) *goanalysis.Linter { diff --git a/pkg/golinters/exhaustruct/exhaustruct_integration_test.go b/pkg/golinters/exhaustruct/exhaustruct_integration_test.go index 5d094b1a394b..c981ed003b9b 100644 --- a/pkg/golinters/exhaustruct/exhaustruct_integration_test.go +++ b/pkg/golinters/exhaustruct/exhaustruct_integration_test.go @@ -3,7 +3,7 @@ package exhaustruct import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/exptostd/exptostd.go b/pkg/golinters/exptostd/exptostd.go index 2de8ea98c2b8..731a4a0ccad7 100644 --- a/pkg/golinters/exptostd/exptostd.go +++ b/pkg/golinters/exptostd/exptostd.go @@ -4,7 +4,7 @@ import ( "github.com/ldez/exptostd" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/exptostd/exptostd_integration_test.go b/pkg/golinters/exptostd/exptostd_integration_test.go index 8c8e325e2aa3..a417837da4a0 100644 --- a/pkg/golinters/exptostd/exptostd_integration_test.go +++ b/pkg/golinters/exptostd/exptostd_integration_test.go @@ -3,7 +3,7 @@ package exptostd import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/fatcontext/fatcontext.go b/pkg/golinters/fatcontext/fatcontext.go index 2ffacacd39a7..8f34064dc057 100644 --- a/pkg/golinters/fatcontext/fatcontext.go +++ b/pkg/golinters/fatcontext/fatcontext.go @@ -4,8 +4,8 @@ import ( "github.com/Crocmagnon/fatcontext/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.FatcontextSettings) *goanalysis.Linter { diff --git a/pkg/golinters/fatcontext/fatcontext_integration_test.go b/pkg/golinters/fatcontext/fatcontext_integration_test.go index 38028322cc3f..36e12976f1f4 100644 --- a/pkg/golinters/fatcontext/fatcontext_integration_test.go +++ b/pkg/golinters/fatcontext/fatcontext_integration_test.go @@ -3,7 +3,7 @@ package fatcontext import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/forbidigo/forbidigo.go b/pkg/golinters/forbidigo/forbidigo.go index e9741a633d85..45f9088fa97d 100644 --- a/pkg/golinters/forbidigo/forbidigo.go +++ b/pkg/golinters/forbidigo/forbidigo.go @@ -7,9 +7,9 @@ import ( "golang.org/x/tools/go/analysis" "gopkg.in/yaml.v3" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const linterName = "forbidigo" diff --git a/pkg/golinters/forbidigo/forbidigo_integration_test.go b/pkg/golinters/forbidigo/forbidigo_integration_test.go index 180b1f4ed6f3..ea4b45df8a8c 100644 --- a/pkg/golinters/forbidigo/forbidigo_integration_test.go +++ b/pkg/golinters/forbidigo/forbidigo_integration_test.go @@ -3,7 +3,7 @@ package forbidigo import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/forcetypeassert/forcetypeassert.go b/pkg/golinters/forcetypeassert/forcetypeassert.go index 98abad7e0d1d..e82355380c25 100644 --- a/pkg/golinters/forcetypeassert/forcetypeassert.go +++ b/pkg/golinters/forcetypeassert/forcetypeassert.go @@ -4,7 +4,7 @@ import ( "github.com/gostaticanalysis/forcetypeassert" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/forcetypeassert/forcetypeassert_integration_test.go b/pkg/golinters/forcetypeassert/forcetypeassert_integration_test.go index e412f9f60b08..29719a543b8e 100644 --- a/pkg/golinters/forcetypeassert/forcetypeassert_integration_test.go +++ b/pkg/golinters/forcetypeassert/forcetypeassert_integration_test.go @@ -3,7 +3,7 @@ package forcetypeassert import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/funlen/funlen.go b/pkg/golinters/funlen/funlen.go index bdadcece4600..8fb662c9ed77 100644 --- a/pkg/golinters/funlen/funlen.go +++ b/pkg/golinters/funlen/funlen.go @@ -4,8 +4,8 @@ import ( "github.com/ultraware/funlen" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) type Config struct { diff --git a/pkg/golinters/funlen/funlen_integration_test.go b/pkg/golinters/funlen/funlen_integration_test.go index f84d390c715c..4612fa89758f 100644 --- a/pkg/golinters/funlen/funlen_integration_test.go +++ b/pkg/golinters/funlen/funlen_integration_test.go @@ -3,7 +3,7 @@ package funlen import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gci/gci.go b/pkg/golinters/gci/gci.go index b79f1a370cc3..627a4e6849f2 100644 --- a/pkg/golinters/gci/gci.go +++ b/pkg/golinters/gci/gci.go @@ -3,11 +3,11 @@ package gci import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters" - gcibase "github.com/golangci/golangci-lint/pkg/goformatters/gci" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + gcibase "github.com/golangci/golangci-lint/v2/pkg/goformatters/gci" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "gci" diff --git a/pkg/golinters/gci/gci_integration_test.go b/pkg/golinters/gci/gci_integration_test.go index 8d099b7b5af2..ea6c3c22ee1a 100644 --- a/pkg/golinters/gci/gci_integration_test.go +++ b/pkg/golinters/gci/gci_integration_test.go @@ -3,7 +3,7 @@ package gci import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gci/testdata/fix/in/gci.go b/pkg/golinters/gci/testdata/fix/in/gci.go index fe8dd32389b3..8f8c0a319ed5 100644 --- a/pkg/golinters/gci/testdata/fix/in/gci.go +++ b/pkg/golinters/gci/testdata/fix/in/gci.go @@ -3,7 +3,7 @@ package gci import ( - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" "golang.org/x/tools/go/analysis" "fmt" diff --git a/pkg/golinters/gci/testdata/fix/out/gci.go b/pkg/golinters/gci/testdata/fix/out/gci.go index 9a06317edc8f..505a941d5a2e 100644 --- a/pkg/golinters/gci/testdata/fix/out/gci.go +++ b/pkg/golinters/gci/testdata/fix/out/gci.go @@ -6,7 +6,7 @@ import ( "fmt" gcicfg "github.com/daixiang0/gci/pkg/config" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" "golang.org/x/tools/go/analysis" ) diff --git a/pkg/golinters/gci/testdata/gci.go b/pkg/golinters/gci/testdata/gci.go index 8f8b8a1190aa..3874c372d6c4 100644 --- a/pkg/golinters/gci/testdata/gci.go +++ b/pkg/golinters/gci/testdata/gci.go @@ -3,7 +3,7 @@ package testdata import ( "golang.org/x/tools/go/analysis" // want "File is not properly formatted" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" "fmt" "errors" gcicfg "github.com/daixiang0/gci/pkg/config" diff --git a/pkg/golinters/gci/testdata/gci_cgo.go b/pkg/golinters/gci/testdata/gci_cgo.go index 5cc0115bdd9c..7c3002714a7f 100644 --- a/pkg/golinters/gci/testdata/gci_cgo.go +++ b/pkg/golinters/gci/testdata/gci_cgo.go @@ -13,7 +13,7 @@ import "C" import ( "golang.org/x/tools/go/analysis" // want "File is not properly formatted" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" "fmt" "errors" gcicfg "github.com/daixiang0/gci/pkg/config" diff --git a/pkg/golinters/ginkgolinter/ginkgolinter.go b/pkg/golinters/ginkgolinter/ginkgolinter.go index 6826b77b6bc6..f4521cdaf81f 100644 --- a/pkg/golinters/ginkgolinter/ginkgolinter.go +++ b/pkg/golinters/ginkgolinter/ginkgolinter.go @@ -5,8 +5,8 @@ import ( "github.com/nunnatsa/ginkgolinter/types" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.GinkgoLinterSettings) *goanalysis.Linter { diff --git a/pkg/golinters/ginkgolinter/ginkgolinter_integration_test.go b/pkg/golinters/ginkgolinter/ginkgolinter_integration_test.go index 23fd75794469..d7f84be6c563 100644 --- a/pkg/golinters/ginkgolinter/ginkgolinter_integration_test.go +++ b/pkg/golinters/ginkgolinter/ginkgolinter_integration_test.go @@ -3,7 +3,7 @@ package ginkgolinter import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives.go b/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives.go index be604d805b4b..97534848d802 100644 --- a/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives.go +++ b/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives.go @@ -4,7 +4,7 @@ import ( "4d63.com/gocheckcompilerdirectives/checkcompilerdirectives" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives_integration_test.go b/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives_integration_test.go index bc441dcc3bb3..07c1ce4afbee 100644 --- a/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives_integration_test.go +++ b/pkg/golinters/gocheckcompilerdirectives/gocheckcompilerdirectives_integration_test.go @@ -3,7 +3,7 @@ package gocheckcompilerdirectives import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gochecknoglobals/gochecknoglobals.go b/pkg/golinters/gochecknoglobals/gochecknoglobals.go index e893dfcbb69e..8d850a2de59f 100644 --- a/pkg/golinters/gochecknoglobals/gochecknoglobals.go +++ b/pkg/golinters/gochecknoglobals/gochecknoglobals.go @@ -4,7 +4,7 @@ import ( "4d63.com/gochecknoglobals/checknoglobals" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/gochecknoglobals/gochecknoglobals_integration_test.go b/pkg/golinters/gochecknoglobals/gochecknoglobals_integration_test.go index 98aa5bbdf172..39d4721409f2 100644 --- a/pkg/golinters/gochecknoglobals/gochecknoglobals_integration_test.go +++ b/pkg/golinters/gochecknoglobals/gochecknoglobals_integration_test.go @@ -3,7 +3,7 @@ package gochecknoglobals import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gochecknoinits/gochecknoinits.go b/pkg/golinters/gochecknoinits/gochecknoinits.go index 510a06c91dd2..b5fa6f0d4117 100644 --- a/pkg/golinters/gochecknoinits/gochecknoinits.go +++ b/pkg/golinters/gochecknoinits/gochecknoinits.go @@ -7,8 +7,8 @@ import ( "golang.org/x/tools/go/analysis/passes/inspect" "golang.org/x/tools/go/ast/inspector" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "gochecknoinits" diff --git a/pkg/golinters/gochecknoinits/gochecknoinits_integration_test.go b/pkg/golinters/gochecknoinits/gochecknoinits_integration_test.go index 0a819b96af86..6a9192b9ed95 100644 --- a/pkg/golinters/gochecknoinits/gochecknoinits_integration_test.go +++ b/pkg/golinters/gochecknoinits/gochecknoinits_integration_test.go @@ -3,7 +3,7 @@ package gochecknoinits import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gochecksumtype/gochecksumtype.go b/pkg/golinters/gochecksumtype/gochecksumtype.go index cbc58731265f..78cbd574d20b 100644 --- a/pkg/golinters/gochecksumtype/gochecksumtype.go +++ b/pkg/golinters/gochecksumtype/gochecksumtype.go @@ -8,10 +8,10 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "gochecksumtype" diff --git a/pkg/golinters/gochecksumtype/gochecksumtype_integration_test.go b/pkg/golinters/gochecksumtype/gochecksumtype_integration_test.go index bc78a3bf64e1..7fb686293bb7 100644 --- a/pkg/golinters/gochecksumtype/gochecksumtype_integration_test.go +++ b/pkg/golinters/gochecksumtype/gochecksumtype_integration_test.go @@ -3,7 +3,7 @@ package gochecksumtype import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gocognit/gocognit.go b/pkg/golinters/gocognit/gocognit.go index 5fe0f90f09f7..689a70a12383 100644 --- a/pkg/golinters/gocognit/gocognit.go +++ b/pkg/golinters/gocognit/gocognit.go @@ -8,11 +8,11 @@ import ( "github.com/uudashr/gocognit" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "gocognit" diff --git a/pkg/golinters/gocognit/gocognit_integration_test.go b/pkg/golinters/gocognit/gocognit_integration_test.go index 6786f500d72f..ae4b06450de2 100644 --- a/pkg/golinters/gocognit/gocognit_integration_test.go +++ b/pkg/golinters/gocognit/gocognit_integration_test.go @@ -3,7 +3,7 @@ package gocognit import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/goconst/goconst.go b/pkg/golinters/goconst/goconst.go index 11a8cd50c264..26196f6929d6 100644 --- a/pkg/golinters/goconst/goconst.go +++ b/pkg/golinters/goconst/goconst.go @@ -7,11 +7,11 @@ import ( goconstAPI "github.com/jgautheron/goconst" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "goconst" diff --git a/pkg/golinters/goconst/goconst_integration_test.go b/pkg/golinters/goconst/goconst_integration_test.go index d115170dcb78..fa6498ce5892 100644 --- a/pkg/golinters/goconst/goconst_integration_test.go +++ b/pkg/golinters/goconst/goconst_integration_test.go @@ -3,7 +3,7 @@ package goconst import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gocritic/gocritic.go b/pkg/golinters/gocritic/gocritic.go index 0b9be7d2eedc..4fcd9b124385 100644 --- a/pkg/golinters/gocritic/gocritic.go +++ b/pkg/golinters/gocritic/gocritic.go @@ -17,11 +17,11 @@ import ( _ "github.com/quasilyte/go-ruleguard/dsl" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const linterName = "gocritic" diff --git a/pkg/golinters/gocritic/gocritic_integration_test.go b/pkg/golinters/gocritic/gocritic_integration_test.go index f029679ddb6a..85558f4ca37a 100644 --- a/pkg/golinters/gocritic/gocritic_integration_test.go +++ b/pkg/golinters/gocritic/gocritic_integration_test.go @@ -3,7 +3,7 @@ package gocritic import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gocritic/gocritic_test.go b/pkg/golinters/gocritic/gocritic_test.go index ec9aae6421e2..b742afc9de53 100644 --- a/pkg/golinters/gocritic/gocritic_test.go +++ b/pkg/golinters/gocritic/gocritic_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) // https://go-critic.com/overview.html diff --git a/pkg/golinters/gocyclo/gocyclo.go b/pkg/golinters/gocyclo/gocyclo.go index 51333dc154a4..05691695d2aa 100644 --- a/pkg/golinters/gocyclo/gocyclo.go +++ b/pkg/golinters/gocyclo/gocyclo.go @@ -7,11 +7,11 @@ import ( "github.com/fzipp/gocyclo" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "gocyclo" diff --git a/pkg/golinters/gocyclo/gocyclo_integration_test.go b/pkg/golinters/gocyclo/gocyclo_integration_test.go index f32502c922de..1d133f6fda28 100644 --- a/pkg/golinters/gocyclo/gocyclo_integration_test.go +++ b/pkg/golinters/gocyclo/gocyclo_integration_test.go @@ -3,7 +3,7 @@ package gocyclo import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/godot/godot.go b/pkg/golinters/godot/godot.go index 44bb54cfb53d..04e86211de33 100644 --- a/pkg/golinters/godot/godot.go +++ b/pkg/golinters/godot/godot.go @@ -6,8 +6,8 @@ import ( "github.com/tetafro/godot" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "godot" diff --git a/pkg/golinters/godot/godot_integration_test.go b/pkg/golinters/godot/godot_integration_test.go index bec8b7bb7b0d..2f72941ab263 100644 --- a/pkg/golinters/godot/godot_integration_test.go +++ b/pkg/golinters/godot/godot_integration_test.go @@ -3,7 +3,7 @@ package godot import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/godox/godox.go b/pkg/golinters/godox/godox.go index 589789d1460a..e734c691b3da 100644 --- a/pkg/golinters/godox/godox.go +++ b/pkg/golinters/godox/godox.go @@ -7,8 +7,8 @@ import ( "github.com/matoous/godox" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "godox" diff --git a/pkg/golinters/godox/godox_integration_test.go b/pkg/golinters/godox/godox_integration_test.go index 88e5b2c2c8f8..ae76f2a05886 100644 --- a/pkg/golinters/godox/godox_integration_test.go +++ b/pkg/golinters/godox/godox_integration_test.go @@ -3,7 +3,7 @@ package godox import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gofmt/gofmt.go b/pkg/golinters/gofmt/gofmt.go index 221224294906..63b690018ecd 100644 --- a/pkg/golinters/gofmt/gofmt.go +++ b/pkg/golinters/gofmt/gofmt.go @@ -3,11 +3,11 @@ package gofmt import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters" - gofmtbase "github.com/golangci/golangci-lint/pkg/goformatters/gofmt" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + gofmtbase "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofmt" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "gofmt" diff --git a/pkg/golinters/gofmt/gofmt_integration_test.go b/pkg/golinters/gofmt/gofmt_integration_test.go index 603bcb2c0eec..9c72e4b4d7af 100644 --- a/pkg/golinters/gofmt/gofmt_integration_test.go +++ b/pkg/golinters/gofmt/gofmt_integration_test.go @@ -3,7 +3,7 @@ package gofmt import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gofumpt/gofumpt.go b/pkg/golinters/gofumpt/gofumpt.go index c6fdb81b331b..d799be7a39fd 100644 --- a/pkg/golinters/gofumpt/gofumpt.go +++ b/pkg/golinters/gofumpt/gofumpt.go @@ -3,11 +3,11 @@ package gofumpt import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters" - gofumptbase "github.com/golangci/golangci-lint/pkg/goformatters/gofumpt" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + gofumptbase "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofumpt" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "gofumpt" diff --git a/pkg/golinters/gofumpt/gofumpt_integration_test.go b/pkg/golinters/gofumpt/gofumpt_integration_test.go index c69953bd5992..2092ad3512d3 100644 --- a/pkg/golinters/gofumpt/gofumpt_integration_test.go +++ b/pkg/golinters/gofumpt/gofumpt_integration_test.go @@ -3,7 +3,7 @@ package gofumpt import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/goheader/goheader.go b/pkg/golinters/goheader/goheader.go index d24ad453e06b..491e54a7819c 100644 --- a/pkg/golinters/goheader/goheader.go +++ b/pkg/golinters/goheader/goheader.go @@ -7,9 +7,9 @@ import ( goheader "github.com/denis-tingaikin/go-header" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "goheader" diff --git a/pkg/golinters/goheader/goheader_integration_test.go b/pkg/golinters/goheader/goheader_integration_test.go index b34458b75444..1a2fe8223572 100644 --- a/pkg/golinters/goheader/goheader_integration_test.go +++ b/pkg/golinters/goheader/goheader_integration_test.go @@ -3,7 +3,7 @@ package goheader import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/goimports/goimports.go b/pkg/golinters/goimports/goimports.go index d7ba98559acf..3aa8cde56a94 100644 --- a/pkg/golinters/goimports/goimports.go +++ b/pkg/golinters/goimports/goimports.go @@ -3,11 +3,11 @@ package goimports import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters" - goimportsbase "github.com/golangci/golangci-lint/pkg/goformatters/goimports" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + goimportsbase "github.com/golangci/golangci-lint/v2/pkg/goformatters/goimports" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "goimports" diff --git a/pkg/golinters/goimports/goimports_integration_test.go b/pkg/golinters/goimports/goimports_integration_test.go index 08aa3cefc624..c2dc5fca1d9a 100644 --- a/pkg/golinters/goimports/goimports_integration_test.go +++ b/pkg/golinters/goimports/goimports_integration_test.go @@ -3,7 +3,7 @@ package goimports import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/goimports/testdata/goimports.go b/pkg/golinters/goimports/testdata/goimports.go index f5f3ab763582..883a1a6279dc 100644 --- a/pkg/golinters/goimports/testdata/goimports.go +++ b/pkg/golinters/goimports/testdata/goimports.go @@ -3,7 +3,7 @@ package testdata import ( "fmt" // want "File is not properly formatted" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) func Bar() { diff --git a/pkg/golinters/goimports/testdata/goimports_cgo.go b/pkg/golinters/goimports/testdata/goimports_cgo.go index a6254a3b8c6f..9613c4ffe3cb 100644 --- a/pkg/golinters/goimports/testdata/goimports_cgo.go +++ b/pkg/golinters/goimports/testdata/goimports_cgo.go @@ -14,7 +14,7 @@ import "C" import ( "fmt" "unsafe" // want "File is not properly formatted" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) func _() { diff --git a/pkg/golinters/goimports/testdata/goimports_local.go b/pkg/golinters/goimports/testdata/goimports_local.go index a5b44bf372d6..a59f51376b07 100644 --- a/pkg/golinters/goimports/testdata/goimports_local.go +++ b/pkg/golinters/goimports/testdata/goimports_local.go @@ -4,7 +4,7 @@ package testdata import ( "fmt" - "github.com/golangci/golangci-lint/pkg/config" // want "File is not properly formatted" + "github.com/golangci/golangci-lint/v2/pkg/config" // want "File is not properly formatted" "golang.org/x/tools/go/analysis" ) diff --git a/pkg/golinters/golines/golines.go b/pkg/golinters/golines/golines.go index 54ea310045e2..0b3acc53bb40 100644 --- a/pkg/golinters/golines/golines.go +++ b/pkg/golinters/golines/golines.go @@ -3,11 +3,11 @@ package golines import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters" - golinesbase "github.com/golangci/golangci-lint/pkg/goformatters/golines" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + golinesbase "github.com/golangci/golangci-lint/v2/pkg/goformatters/golines" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "golines" diff --git a/pkg/golinters/golines/golines_integration_test.go b/pkg/golinters/golines/golines_integration_test.go index b2aee2cd6e82..4248ac6bc255 100644 --- a/pkg/golinters/golines/golines_integration_test.go +++ b/pkg/golinters/golines/golines_integration_test.go @@ -3,7 +3,7 @@ package golines import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gomoddirectives/gomoddirectives.go b/pkg/golinters/gomoddirectives/gomoddirectives.go index f8f47ba2b473..86f94e2560ea 100644 --- a/pkg/golinters/gomoddirectives/gomoddirectives.go +++ b/pkg/golinters/gomoddirectives/gomoddirectives.go @@ -7,11 +7,11 @@ import ( "github.com/ldez/gomoddirectives" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "gomoddirectives" diff --git a/pkg/golinters/gomodguard/gomodguard.go b/pkg/golinters/gomodguard/gomodguard.go index 8bddebc16291..e38a6c9b90e4 100644 --- a/pkg/golinters/gomodguard/gomodguard.go +++ b/pkg/golinters/gomodguard/gomodguard.go @@ -6,11 +6,11 @@ import ( "github.com/ryancurrah/gomodguard" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const ( diff --git a/pkg/golinters/gomodguard/gomodguard_integration_test.go b/pkg/golinters/gomodguard/gomodguard_integration_test.go index 2ac44b6be6cd..b21b114c23ad 100644 --- a/pkg/golinters/gomodguard/gomodguard_integration_test.go +++ b/pkg/golinters/gomodguard/gomodguard_integration_test.go @@ -3,7 +3,7 @@ package gomodguard import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/goprintffuncname/goprintffuncname.go b/pkg/golinters/goprintffuncname/goprintffuncname.go index c206ffaa3e24..b1436347806c 100644 --- a/pkg/golinters/goprintffuncname/goprintffuncname.go +++ b/pkg/golinters/goprintffuncname/goprintffuncname.go @@ -4,7 +4,7 @@ import ( "github.com/golangci/go-printf-func-name/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/goprintffuncname/goprintffuncname_integration_test.go b/pkg/golinters/goprintffuncname/goprintffuncname_integration_test.go index d8aade2ee840..45ffb33c8a48 100644 --- a/pkg/golinters/goprintffuncname/goprintffuncname_integration_test.go +++ b/pkg/golinters/goprintffuncname/goprintffuncname_integration_test.go @@ -3,7 +3,7 @@ package goprintffuncname import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gosec/gosec.go b/pkg/golinters/gosec/gosec.go index 148fd9426888..95b445e87038 100644 --- a/pkg/golinters/gosec/gosec.go +++ b/pkg/golinters/gosec/gosec.go @@ -16,10 +16,10 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "gosec" diff --git a/pkg/golinters/gosec/gosec_integration_test.go b/pkg/golinters/gosec/gosec_integration_test.go index 0642d7896297..dc383342d18a 100644 --- a/pkg/golinters/gosec/gosec_integration_test.go +++ b/pkg/golinters/gosec/gosec_integration_test.go @@ -3,7 +3,7 @@ package gosec import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/gosec/gosec_test.go b/pkg/golinters/gosec/gosec_test.go index c7e31f2782e4..75343cff81a5 100644 --- a/pkg/golinters/gosec/gosec_test.go +++ b/pkg/golinters/gosec/gosec_test.go @@ -6,7 +6,7 @@ import ( "github.com/securego/gosec/v2" "github.com/stretchr/testify/assert" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) func Test_toGosecConfig(t *testing.T) { diff --git a/pkg/golinters/gosmopolitan/gosmopolitan.go b/pkg/golinters/gosmopolitan/gosmopolitan.go index 0b91515d5282..6c574403f694 100644 --- a/pkg/golinters/gosmopolitan/gosmopolitan.go +++ b/pkg/golinters/gosmopolitan/gosmopolitan.go @@ -6,8 +6,8 @@ import ( "github.com/xen0n/gosmopolitan" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.GosmopolitanSettings) *goanalysis.Linter { diff --git a/pkg/golinters/gosmopolitan/gosmopolitan_integration_test.go b/pkg/golinters/gosmopolitan/gosmopolitan_integration_test.go index 4c7f39d33080..c20c28e95e9f 100644 --- a/pkg/golinters/gosmopolitan/gosmopolitan_integration_test.go +++ b/pkg/golinters/gosmopolitan/gosmopolitan_integration_test.go @@ -3,7 +3,7 @@ package gosmopolitan import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/govet/govet.go b/pkg/golinters/govet/govet.go index 7518f10f00af..3ffdc22ebb2a 100644 --- a/pkg/golinters/govet/govet.go +++ b/pkg/golinters/govet/govet.go @@ -53,9 +53,9 @@ import ( "golang.org/x/tools/go/analysis/passes/unusedwrite" "golang.org/x/tools/go/analysis/passes/waitgroup" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) var ( diff --git a/pkg/golinters/govet/govet_integration_test.go b/pkg/golinters/govet/govet_integration_test.go index 65256d7ffe05..ff24632050fa 100644 --- a/pkg/golinters/govet/govet_integration_test.go +++ b/pkg/golinters/govet/govet_integration_test.go @@ -3,7 +3,7 @@ package govet import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/govet/govet_test.go b/pkg/golinters/govet/govet_test.go index a6e8a19130df..ec7072795f74 100644 --- a/pkg/golinters/govet/govet_test.go +++ b/pkg/golinters/govet/govet_test.go @@ -13,7 +13,7 @@ import ( "golang.org/x/tools/go/analysis/passes/cgocall" "golang.org/x/tools/go/analysis/passes/shadow" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) func TestGovet(t *testing.T) { diff --git a/pkg/golinters/grouper/grouper.go b/pkg/golinters/grouper/grouper.go index e0a3f794a7d1..853e2d3e7f70 100644 --- a/pkg/golinters/grouper/grouper.go +++ b/pkg/golinters/grouper/grouper.go @@ -4,8 +4,8 @@ import ( grouper "github.com/leonklingele/grouper/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.GrouperSettings) *goanalysis.Linter { diff --git a/pkg/golinters/grouper/grouper_integration_test.go b/pkg/golinters/grouper/grouper_integration_test.go index 2474f98c8895..194563c1c42b 100644 --- a/pkg/golinters/grouper/grouper_integration_test.go +++ b/pkg/golinters/grouper/grouper_integration_test.go @@ -3,7 +3,7 @@ package grouper import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/iface/iface.go b/pkg/golinters/iface/iface.go index 31f88160eafd..a3c2816d4385 100644 --- a/pkg/golinters/iface/iface.go +++ b/pkg/golinters/iface/iface.go @@ -8,8 +8,8 @@ import ( "github.com/uudashr/iface/unused" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.IfaceSettings) *goanalysis.Linter { diff --git a/pkg/golinters/iface/iface_integration_test.go b/pkg/golinters/iface/iface_integration_test.go index f77c05b937f9..81c3de9bfde6 100644 --- a/pkg/golinters/iface/iface_integration_test.go +++ b/pkg/golinters/iface/iface_integration_test.go @@ -3,7 +3,7 @@ package iface import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/importas/importas.go b/pkg/golinters/importas/importas.go index b7c6c35aeaa6..a86db68ce04e 100644 --- a/pkg/golinters/importas/importas.go +++ b/pkg/golinters/importas/importas.go @@ -8,9 +8,9 @@ import ( "github.com/julz/importas" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" ) func New(settings *config.ImportAsSettings) *goanalysis.Linter { diff --git a/pkg/golinters/importas/importas_integration_test.go b/pkg/golinters/importas/importas_integration_test.go index 3441db4dbac0..60eb84bb531c 100644 --- a/pkg/golinters/importas/importas_integration_test.go +++ b/pkg/golinters/importas/importas_integration_test.go @@ -3,7 +3,7 @@ package importas import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/inamedparam/inamedparam.go b/pkg/golinters/inamedparam/inamedparam.go index 5cf06a08cc81..0a67c970deca 100644 --- a/pkg/golinters/inamedparam/inamedparam.go +++ b/pkg/golinters/inamedparam/inamedparam.go @@ -4,8 +4,8 @@ import ( "github.com/macabu/inamedparam" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.INamedParamSettings) *goanalysis.Linter { diff --git a/pkg/golinters/inamedparam/inamedparam_integration_test.go b/pkg/golinters/inamedparam/inamedparam_integration_test.go index 97235458041e..c64914abb0de 100644 --- a/pkg/golinters/inamedparam/inamedparam_integration_test.go +++ b/pkg/golinters/inamedparam/inamedparam_integration_test.go @@ -3,7 +3,7 @@ package inamedparam import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/ineffassign/ineffassign.go b/pkg/golinters/ineffassign/ineffassign.go index ba86fb90e374..bbe01ba1f37a 100644 --- a/pkg/golinters/ineffassign/ineffassign.go +++ b/pkg/golinters/ineffassign/ineffassign.go @@ -4,7 +4,7 @@ import ( "github.com/gordonklaus/ineffassign/pkg/ineffassign" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/ineffassign/ineffassign_integration_test.go b/pkg/golinters/ineffassign/ineffassign_integration_test.go index d2bfc191bf9e..c0849d819ec6 100644 --- a/pkg/golinters/ineffassign/ineffassign_integration_test.go +++ b/pkg/golinters/ineffassign/ineffassign_integration_test.go @@ -3,7 +3,7 @@ package ineffassign import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/interfacebloat/interfacebloat.go b/pkg/golinters/interfacebloat/interfacebloat.go index 88927a3d9bcf..fbafb3ac7343 100644 --- a/pkg/golinters/interfacebloat/interfacebloat.go +++ b/pkg/golinters/interfacebloat/interfacebloat.go @@ -4,8 +4,8 @@ import ( "github.com/sashamelentyev/interfacebloat/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.InterfaceBloatSettings) *goanalysis.Linter { diff --git a/pkg/golinters/interfacebloat/interfacebloat_integration_test.go b/pkg/golinters/interfacebloat/interfacebloat_integration_test.go index 031b62f90033..7c23cf07922b 100644 --- a/pkg/golinters/interfacebloat/interfacebloat_integration_test.go +++ b/pkg/golinters/interfacebloat/interfacebloat_integration_test.go @@ -3,7 +3,7 @@ package interfacebloat import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/internal/commons.go b/pkg/golinters/internal/commons.go index f00b6ceb8160..ebc211902dc8 100644 --- a/pkg/golinters/internal/commons.go +++ b/pkg/golinters/internal/commons.go @@ -1,6 +1,6 @@ package internal -import "github.com/golangci/golangci-lint/pkg/logutils" +import "github.com/golangci/golangci-lint/v2/pkg/logutils" // LinterLogger must be use only when the context logger is not available. var LinterLogger = logutils.NewStderrLog(logutils.DebugKeyLinter) diff --git a/pkg/golinters/internal/util.go b/pkg/golinters/internal/util.go index 7525f2f2c530..2e5fb29f91c9 100644 --- a/pkg/golinters/internal/util.go +++ b/pkg/golinters/internal/util.go @@ -6,8 +6,8 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func FormatCode(code string, _ *config.Config) string { diff --git a/pkg/golinters/intrange/intrange.go b/pkg/golinters/intrange/intrange.go index d5ffd43453eb..c75be9b63446 100644 --- a/pkg/golinters/intrange/intrange.go +++ b/pkg/golinters/intrange/intrange.go @@ -4,7 +4,7 @@ import ( "github.com/ckaznocha/intrange" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/intrange/intrange_integration_test.go b/pkg/golinters/intrange/intrange_integration_test.go index d5e8aae77fc8..a782ade5438e 100644 --- a/pkg/golinters/intrange/intrange_integration_test.go +++ b/pkg/golinters/intrange/intrange_integration_test.go @@ -3,7 +3,7 @@ package intrange import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/ireturn/ireturn.go b/pkg/golinters/ireturn/ireturn.go index 57de57111e0d..44c28700b370 100644 --- a/pkg/golinters/ireturn/ireturn.go +++ b/pkg/golinters/ireturn/ireturn.go @@ -6,8 +6,8 @@ import ( "github.com/butuzov/ireturn/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.IreturnSettings) *goanalysis.Linter { diff --git a/pkg/golinters/ireturn/ireturn_integration_test.go b/pkg/golinters/ireturn/ireturn_integration_test.go index 05f97a582cd0..0bd4d3d27b52 100644 --- a/pkg/golinters/ireturn/ireturn_integration_test.go +++ b/pkg/golinters/ireturn/ireturn_integration_test.go @@ -3,7 +3,7 @@ package ireturn import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/lll/lll.go b/pkg/golinters/lll/lll.go index bad3b0c4e25d..eb435baa754c 100644 --- a/pkg/golinters/lll/lll.go +++ b/pkg/golinters/lll/lll.go @@ -11,8 +11,8 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "lll" diff --git a/pkg/golinters/lll/lll_integration_test.go b/pkg/golinters/lll/lll_integration_test.go index 25ebf40d9e03..f1b1e30c0c3e 100644 --- a/pkg/golinters/lll/lll_integration_test.go +++ b/pkg/golinters/lll/lll_integration_test.go @@ -3,7 +3,7 @@ package lll import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/lll/testdata/lll_import_multi.go b/pkg/golinters/lll/testdata/lll_import_multi.go index da39f72ee31f..3e69e7ac92b0 100644 --- a/pkg/golinters/lll/testdata/lll_import_multi.go +++ b/pkg/golinters/lll/testdata/lll_import_multi.go @@ -4,8 +4,8 @@ package testdata import ( - anotherVeryLongImportAliasNameForTest "github.com/golangci/golangci-lint/internal/golinters" - veryLongImportAliasNameForTest "github.com/golangci/golangci-lint/internal/golinters" + anotherVeryLongImportAliasNameForTest "github.com/golangci/golangci-lint/v2/internal/golinters" + veryLongImportAliasNameForTest "github.com/golangci/golangci-lint/v2/internal/golinters" ) func LllMultiImport() { diff --git a/pkg/golinters/lll/testdata/lll_import_single.go b/pkg/golinters/lll/testdata/lll_import_single.go index dfd694c40f16..53237609b75c 100644 --- a/pkg/golinters/lll/testdata/lll_import_single.go +++ b/pkg/golinters/lll/testdata/lll_import_single.go @@ -3,7 +3,7 @@ //golangcitest:expected_exitcode 0 package testdata -import veryLongImportAliasNameForTest "github.com/golangci/golangci-lint/internal/golinters" +import veryLongImportAliasNameForTest "github.com/golangci/golangci-lint/v2/internal/golinters" func LllSingleImport() { _ = veryLongImportAliasNameForTest.NewLLL(nil) diff --git a/pkg/golinters/loggercheck/loggercheck.go b/pkg/golinters/loggercheck/loggercheck.go index 84c8d7363517..a5dd4da48cd6 100644 --- a/pkg/golinters/loggercheck/loggercheck.go +++ b/pkg/golinters/loggercheck/loggercheck.go @@ -4,8 +4,8 @@ import ( "github.com/timonwong/loggercheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.LoggerCheckSettings) *goanalysis.Linter { diff --git a/pkg/golinters/loggercheck/loggercheck_integration_test.go b/pkg/golinters/loggercheck/loggercheck_integration_test.go index 7bbd1fe295ad..a46287edf3a8 100644 --- a/pkg/golinters/loggercheck/loggercheck_integration_test.go +++ b/pkg/golinters/loggercheck/loggercheck_integration_test.go @@ -3,7 +3,7 @@ package loggercheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/maintidx/maintidx.go b/pkg/golinters/maintidx/maintidx.go index 799c51c8740f..4e541f888dfa 100644 --- a/pkg/golinters/maintidx/maintidx.go +++ b/pkg/golinters/maintidx/maintidx.go @@ -4,8 +4,8 @@ import ( "github.com/yagipy/maintidx" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.MaintIdxSettings) *goanalysis.Linter { diff --git a/pkg/golinters/maintidx/maintidx_integration_test.go b/pkg/golinters/maintidx/maintidx_integration_test.go index cd8f25cfd20c..003604b66166 100644 --- a/pkg/golinters/maintidx/maintidx_integration_test.go +++ b/pkg/golinters/maintidx/maintidx_integration_test.go @@ -3,7 +3,7 @@ package maintidx import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/makezero/makezero.go b/pkg/golinters/makezero/makezero.go index b5ab4515e546..04b4fe93dadf 100644 --- a/pkg/golinters/makezero/makezero.go +++ b/pkg/golinters/makezero/makezero.go @@ -6,8 +6,8 @@ import ( "github.com/ashanbrown/makezero/makezero" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "makezero" diff --git a/pkg/golinters/makezero/makezero_integration_test.go b/pkg/golinters/makezero/makezero_integration_test.go index 388077d8d24d..8805b065fba9 100644 --- a/pkg/golinters/makezero/makezero_integration_test.go +++ b/pkg/golinters/makezero/makezero_integration_test.go @@ -3,7 +3,7 @@ package makezero import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/mirror/mirror.go b/pkg/golinters/mirror/mirror.go index e15dfa3a5a58..9badb0c1ed68 100644 --- a/pkg/golinters/mirror/mirror.go +++ b/pkg/golinters/mirror/mirror.go @@ -4,7 +4,7 @@ import ( "github.com/butuzov/mirror" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/mirror/mirror_integration_test.go b/pkg/golinters/mirror/mirror_integration_test.go index 926e3ea125db..97b45cc99c1c 100644 --- a/pkg/golinters/mirror/mirror_integration_test.go +++ b/pkg/golinters/mirror/mirror_integration_test.go @@ -3,7 +3,7 @@ package mirror import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/misspell/misspell.go b/pkg/golinters/misspell/misspell.go index df282fa042f8..9a170c9537b7 100644 --- a/pkg/golinters/misspell/misspell.go +++ b/pkg/golinters/misspell/misspell.go @@ -10,9 +10,9 @@ import ( "github.com/golangci/misspell" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "misspell" diff --git a/pkg/golinters/misspell/misspell_integration_test.go b/pkg/golinters/misspell/misspell_integration_test.go index f211f9c04795..8eaf30005fb5 100644 --- a/pkg/golinters/misspell/misspell_integration_test.go +++ b/pkg/golinters/misspell/misspell_integration_test.go @@ -3,7 +3,7 @@ package misspell import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/misspell/misspell_test.go b/pkg/golinters/misspell/misspell_test.go index 33cd2ad82004..b0a6dad911cc 100644 --- a/pkg/golinters/misspell/misspell_test.go +++ b/pkg/golinters/misspell/misspell_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) func Test_appendExtraWords(t *testing.T) { diff --git a/pkg/golinters/mnd/mnd.go b/pkg/golinters/mnd/mnd.go index fe64653b91b0..744186bc3e63 100644 --- a/pkg/golinters/mnd/mnd.go +++ b/pkg/golinters/mnd/mnd.go @@ -4,8 +4,8 @@ import ( mnd "github.com/tommy-muehle/go-mnd/v2" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.MndSettings) *goanalysis.Linter { diff --git a/pkg/golinters/mnd/mnd_integration_test.go b/pkg/golinters/mnd/mnd_integration_test.go index b0c15f50fd30..8b1d63a250f0 100644 --- a/pkg/golinters/mnd/mnd_integration_test.go +++ b/pkg/golinters/mnd/mnd_integration_test.go @@ -3,7 +3,7 @@ package mnd import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/musttag/musttag.go b/pkg/golinters/musttag/musttag.go index a4e9ceff28fe..030707327b7f 100644 --- a/pkg/golinters/musttag/musttag.go +++ b/pkg/golinters/musttag/musttag.go @@ -4,8 +4,8 @@ import ( "go-simpler.org/musttag" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.MustTagSettings) *goanalysis.Linter { diff --git a/pkg/golinters/musttag/musttag_integration_test.go b/pkg/golinters/musttag/musttag_integration_test.go index fcb4643fd4c9..eb795c21f838 100644 --- a/pkg/golinters/musttag/musttag_integration_test.go +++ b/pkg/golinters/musttag/musttag_integration_test.go @@ -3,7 +3,7 @@ package musttag import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nakedret/nakedret.go b/pkg/golinters/nakedret/nakedret.go index e69fa5e9f59a..1b278872e612 100644 --- a/pkg/golinters/nakedret/nakedret.go +++ b/pkg/golinters/nakedret/nakedret.go @@ -4,8 +4,8 @@ import ( "github.com/alexkohler/nakedret/v2" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.NakedretSettings) *goanalysis.Linter { diff --git a/pkg/golinters/nakedret/nakedret_integration_test.go b/pkg/golinters/nakedret/nakedret_integration_test.go index ac0edaf84753..5e121aa9bf90 100644 --- a/pkg/golinters/nakedret/nakedret_integration_test.go +++ b/pkg/golinters/nakedret/nakedret_integration_test.go @@ -3,7 +3,7 @@ package nakedret import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nestif/nestif.go b/pkg/golinters/nestif/nestif.go index b72538fd1674..1a6b55cafc22 100644 --- a/pkg/golinters/nestif/nestif.go +++ b/pkg/golinters/nestif/nestif.go @@ -4,8 +4,8 @@ import ( "github.com/nakabonne/nestif" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "nestif" diff --git a/pkg/golinters/nestif/nestif_integration_test.go b/pkg/golinters/nestif/nestif_integration_test.go index b9fde385df1e..4cc0be7fe2ab 100644 --- a/pkg/golinters/nestif/nestif_integration_test.go +++ b/pkg/golinters/nestif/nestif_integration_test.go @@ -3,7 +3,7 @@ package nestif import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nilerr/nilerr.go b/pkg/golinters/nilerr/nilerr.go index c9e466905e86..9345b945be11 100644 --- a/pkg/golinters/nilerr/nilerr.go +++ b/pkg/golinters/nilerr/nilerr.go @@ -4,7 +4,7 @@ import ( "github.com/gostaticanalysis/nilerr" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/nilerr/nilerr_integration_test.go b/pkg/golinters/nilerr/nilerr_integration_test.go index 500c472664f2..ffdd61a9253c 100644 --- a/pkg/golinters/nilerr/nilerr_integration_test.go +++ b/pkg/golinters/nilerr/nilerr_integration_test.go @@ -3,7 +3,7 @@ package nilerr import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nilnesserr/nilnesserr.go b/pkg/golinters/nilnesserr/nilnesserr.go index 8349377b7b69..b54992e29bb5 100644 --- a/pkg/golinters/nilnesserr/nilnesserr.go +++ b/pkg/golinters/nilnesserr/nilnesserr.go @@ -4,8 +4,8 @@ import ( "github.com/alingse/nilnesserr" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/nilnesserr/nilnesserr_integration_test.go b/pkg/golinters/nilnesserr/nilnesserr_integration_test.go index 10824feff52c..baae15697ccf 100644 --- a/pkg/golinters/nilnesserr/nilnesserr_integration_test.go +++ b/pkg/golinters/nilnesserr/nilnesserr_integration_test.go @@ -3,7 +3,7 @@ package nilnesserr import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nilnil/nilnil.go b/pkg/golinters/nilnil/nilnil.go index ed25dec71fbd..be5b4ae269b2 100644 --- a/pkg/golinters/nilnil/nilnil.go +++ b/pkg/golinters/nilnil/nilnil.go @@ -4,8 +4,8 @@ import ( "github.com/Antonboom/nilnil/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.NilNilSettings) *goanalysis.Linter { diff --git a/pkg/golinters/nilnil/nilnil_integration_test.go b/pkg/golinters/nilnil/nilnil_integration_test.go index 175ea4f6eec5..b61f4ab3f294 100644 --- a/pkg/golinters/nilnil/nilnil_integration_test.go +++ b/pkg/golinters/nilnil/nilnil_integration_test.go @@ -3,7 +3,7 @@ package nilnil import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nlreturn/nlreturn.go b/pkg/golinters/nlreturn/nlreturn.go index 509218808501..ce2130c52c81 100644 --- a/pkg/golinters/nlreturn/nlreturn.go +++ b/pkg/golinters/nlreturn/nlreturn.go @@ -4,8 +4,8 @@ import ( "github.com/ssgreg/nlreturn/v2/pkg/nlreturn" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.NlreturnSettings) *goanalysis.Linter { diff --git a/pkg/golinters/nlreturn/nlreturn_integration_test.go b/pkg/golinters/nlreturn/nlreturn_integration_test.go index 55522191f4cb..e6e85d60c820 100644 --- a/pkg/golinters/nlreturn/nlreturn_integration_test.go +++ b/pkg/golinters/nlreturn/nlreturn_integration_test.go @@ -3,7 +3,7 @@ package nlreturn import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/noctx/noctx.go b/pkg/golinters/noctx/noctx.go index 8a063c613c31..b0c5f9b50040 100644 --- a/pkg/golinters/noctx/noctx.go +++ b/pkg/golinters/noctx/noctx.go @@ -4,7 +4,7 @@ import ( "github.com/sonatard/noctx" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/noctx/noctx_integration_test.go b/pkg/golinters/noctx/noctx_integration_test.go index e9116cc90f2e..bdd306bea1f7 100644 --- a/pkg/golinters/noctx/noctx_integration_test.go +++ b/pkg/golinters/noctx/noctx_integration_test.go @@ -3,7 +3,7 @@ package noctx import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nolintlint/internal/nolintlint.go b/pkg/golinters/nolintlint/internal/nolintlint.go index 21cd20124f83..2be7c5c144ea 100644 --- a/pkg/golinters/nolintlint/internal/nolintlint.go +++ b/pkg/golinters/nolintlint/internal/nolintlint.go @@ -8,8 +8,8 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const LinterName = "nolintlint" diff --git a/pkg/golinters/nolintlint/internal/nolintlint_test.go b/pkg/golinters/nolintlint/internal/nolintlint_test.go index 0780882bdbba..788d6b5a84dd 100644 --- a/pkg/golinters/nolintlint/internal/nolintlint_test.go +++ b/pkg/golinters/nolintlint/internal/nolintlint_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestLinter_Run(t *testing.T) { diff --git a/pkg/golinters/nolintlint/nolintlint.go b/pkg/golinters/nolintlint/nolintlint.go index e1c878628d61..f19b8324c295 100644 --- a/pkg/golinters/nolintlint/nolintlint.go +++ b/pkg/golinters/nolintlint/nolintlint.go @@ -6,12 +6,11 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - nolintlint "github.com/golangci/golangci-lint/pkg/golinters/nolintlint/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + nolintlint "github.com/golangci/golangci-lint/v2/pkg/golinters/nolintlint/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" ) const LinterName = nolintlint.LinterName diff --git a/pkg/golinters/nolintlint/nolintlint_integration_test.go b/pkg/golinters/nolintlint/nolintlint_integration_test.go index 6c175d529a67..93890ec7fccb 100644 --- a/pkg/golinters/nolintlint/nolintlint_integration_test.go +++ b/pkg/golinters/nolintlint/nolintlint_integration_test.go @@ -3,7 +3,7 @@ package nolintlint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nonamedreturns/nonamedreturns.go b/pkg/golinters/nonamedreturns/nonamedreturns.go index 42a618e64154..91354f6a4492 100644 --- a/pkg/golinters/nonamedreturns/nonamedreturns.go +++ b/pkg/golinters/nonamedreturns/nonamedreturns.go @@ -4,8 +4,8 @@ import ( "github.com/firefart/nonamedreturns/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.NoNamedReturnsSettings) *goanalysis.Linter { diff --git a/pkg/golinters/nonamedreturns/nonamedreturns_integration_test.go b/pkg/golinters/nonamedreturns/nonamedreturns_integration_test.go index c91a292b91a1..9f0601e173b7 100644 --- a/pkg/golinters/nonamedreturns/nonamedreturns_integration_test.go +++ b/pkg/golinters/nonamedreturns/nonamedreturns_integration_test.go @@ -3,7 +3,7 @@ package nonamedreturns import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/nosprintfhostport/nosprintfhostport.go b/pkg/golinters/nosprintfhostport/nosprintfhostport.go index 8f06ae1f6d19..cca70680cf6c 100644 --- a/pkg/golinters/nosprintfhostport/nosprintfhostport.go +++ b/pkg/golinters/nosprintfhostport/nosprintfhostport.go @@ -4,7 +4,7 @@ import ( "github.com/stbenjam/no-sprintf-host-port/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/nosprintfhostport/nosprintfhostport_integration_test.go b/pkg/golinters/nosprintfhostport/nosprintfhostport_integration_test.go index d685d1524147..913cb525f849 100644 --- a/pkg/golinters/nosprintfhostport/nosprintfhostport_integration_test.go +++ b/pkg/golinters/nosprintfhostport/nosprintfhostport_integration_test.go @@ -3,7 +3,7 @@ package nosprintfhostport import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/paralleltest/paralleltest.go b/pkg/golinters/paralleltest/paralleltest.go index 0c908fa38ffb..8c811ca511af 100644 --- a/pkg/golinters/paralleltest/paralleltest.go +++ b/pkg/golinters/paralleltest/paralleltest.go @@ -4,8 +4,8 @@ import ( "github.com/kunwardeep/paralleltest/pkg/paralleltest" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.ParallelTestSettings) *goanalysis.Linter { diff --git a/pkg/golinters/paralleltest/paralleltest_integration_test.go b/pkg/golinters/paralleltest/paralleltest_integration_test.go index 9cf0ea6f2624..ec684b020d19 100644 --- a/pkg/golinters/paralleltest/paralleltest_integration_test.go +++ b/pkg/golinters/paralleltest/paralleltest_integration_test.go @@ -3,7 +3,7 @@ package paralleltest import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/perfsprint/perfsprint.go b/pkg/golinters/perfsprint/perfsprint.go index c0ea235dcaee..f870ee00115a 100644 --- a/pkg/golinters/perfsprint/perfsprint.go +++ b/pkg/golinters/perfsprint/perfsprint.go @@ -4,8 +4,8 @@ import ( "github.com/catenacyber/perfsprint/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.PerfSprintSettings) *goanalysis.Linter { diff --git a/pkg/golinters/perfsprint/perfsprint_integration_test.go b/pkg/golinters/perfsprint/perfsprint_integration_test.go index 038b72d6cb41..1f91a8f59416 100644 --- a/pkg/golinters/perfsprint/perfsprint_integration_test.go +++ b/pkg/golinters/perfsprint/perfsprint_integration_test.go @@ -3,7 +3,7 @@ package perfsprint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/prealloc/prealloc.go b/pkg/golinters/prealloc/prealloc.go index 17e86c98ee0a..1ceba6007ce0 100644 --- a/pkg/golinters/prealloc/prealloc.go +++ b/pkg/golinters/prealloc/prealloc.go @@ -6,9 +6,9 @@ import ( "github.com/alexkohler/prealloc/pkg" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) const linterName = "prealloc" diff --git a/pkg/golinters/prealloc/prealloc_integration_test.go b/pkg/golinters/prealloc/prealloc_integration_test.go index bb5207c3f780..545844810f23 100644 --- a/pkg/golinters/prealloc/prealloc_integration_test.go +++ b/pkg/golinters/prealloc/prealloc_integration_test.go @@ -3,7 +3,7 @@ package prealloc import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/predeclared/predeclared.go b/pkg/golinters/predeclared/predeclared.go index 61d6b1b11c93..9bde9d2f3baa 100644 --- a/pkg/golinters/predeclared/predeclared.go +++ b/pkg/golinters/predeclared/predeclared.go @@ -6,8 +6,8 @@ import ( "github.com/nishanths/predeclared/passes/predeclared" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.PredeclaredSettings) *goanalysis.Linter { diff --git a/pkg/golinters/predeclared/predeclared_integration_test.go b/pkg/golinters/predeclared/predeclared_integration_test.go index dfd42eb7d147..843ff784f20a 100644 --- a/pkg/golinters/predeclared/predeclared_integration_test.go +++ b/pkg/golinters/predeclared/predeclared_integration_test.go @@ -3,7 +3,7 @@ package predeclared import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/promlinter/promlinter.go b/pkg/golinters/promlinter/promlinter.go index 5decbbc7c3de..ab2c9c569dea 100644 --- a/pkg/golinters/promlinter/promlinter.go +++ b/pkg/golinters/promlinter/promlinter.go @@ -7,10 +7,10 @@ import ( "github.com/yeya24/promlinter" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "promlinter" diff --git a/pkg/golinters/promlinter/promlinter_integration_test.go b/pkg/golinters/promlinter/promlinter_integration_test.go index 3aa64fe5b68d..ffcedcadcf0b 100644 --- a/pkg/golinters/promlinter/promlinter_integration_test.go +++ b/pkg/golinters/promlinter/promlinter_integration_test.go @@ -3,7 +3,7 @@ package promlinter import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/protogetter/protogetter.go b/pkg/golinters/protogetter/protogetter.go index 423e4ca9ef7b..c13c98af5792 100644 --- a/pkg/golinters/protogetter/protogetter.go +++ b/pkg/golinters/protogetter/protogetter.go @@ -4,8 +4,8 @@ import ( "github.com/ghostiam/protogetter" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.ProtoGetterSettings) *goanalysis.Linter { diff --git a/pkg/golinters/protogetter/protogetter_integration_test.go b/pkg/golinters/protogetter/protogetter_integration_test.go index b139aa244b66..c02bfdd69cfe 100644 --- a/pkg/golinters/protogetter/protogetter_integration_test.go +++ b/pkg/golinters/protogetter/protogetter_integration_test.go @@ -3,7 +3,7 @@ package protogetter import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/reassign/reassign.go b/pkg/golinters/reassign/reassign.go index cfc85635e2be..7d9f84285b89 100644 --- a/pkg/golinters/reassign/reassign.go +++ b/pkg/golinters/reassign/reassign.go @@ -7,8 +7,8 @@ import ( "github.com/curioswitch/go-reassign" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.ReassignSettings) *goanalysis.Linter { diff --git a/pkg/golinters/reassign/reassign_integration_test.go b/pkg/golinters/reassign/reassign_integration_test.go index 5b1337a9a587..f166723cd1bc 100644 --- a/pkg/golinters/reassign/reassign_integration_test.go +++ b/pkg/golinters/reassign/reassign_integration_test.go @@ -3,7 +3,7 @@ package reassign import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/recvcheck/recvcheck.go b/pkg/golinters/recvcheck/recvcheck.go index 3af4885b40d0..ed1eb0b78765 100644 --- a/pkg/golinters/recvcheck/recvcheck.go +++ b/pkg/golinters/recvcheck/recvcheck.go @@ -4,8 +4,8 @@ import ( "github.com/raeperd/recvcheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.RecvcheckSettings) *goanalysis.Linter { diff --git a/pkg/golinters/recvcheck/recvcheck_integration_test.go b/pkg/golinters/recvcheck/recvcheck_integration_test.go index 7e0931b1a572..8d109360392e 100644 --- a/pkg/golinters/recvcheck/recvcheck_integration_test.go +++ b/pkg/golinters/recvcheck/recvcheck_integration_test.go @@ -3,7 +3,7 @@ package recvcheck_test import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/revive/revive.go b/pkg/golinters/revive/revive.go index 1a6b44787a9b..0b4d4372e315 100644 --- a/pkg/golinters/revive/revive.go +++ b/pkg/golinters/revive/revive.go @@ -19,12 +19,12 @@ import ( "github.com/mgechev/revive/rule" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "revive" diff --git a/pkg/golinters/revive/revive_integration_test.go b/pkg/golinters/revive/revive_integration_test.go index 6f882a15fa67..baf0160710ba 100644 --- a/pkg/golinters/revive/revive_integration_test.go +++ b/pkg/golinters/revive/revive_integration_test.go @@ -3,7 +3,7 @@ package revive import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/rowserrcheck/rowserrcheck.go b/pkg/golinters/rowserrcheck/rowserrcheck.go index 3fe824467341..2bd975ddf28f 100644 --- a/pkg/golinters/rowserrcheck/rowserrcheck.go +++ b/pkg/golinters/rowserrcheck/rowserrcheck.go @@ -4,8 +4,8 @@ import ( "github.com/jingyugao/rowserrcheck/passes/rowserr" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.RowsErrCheckSettings) *goanalysis.Linter { diff --git a/pkg/golinters/rowserrcheck/rowserrcheck_integration_test.go b/pkg/golinters/rowserrcheck/rowserrcheck_integration_test.go index d7b6bc1038f9..7ea5b3e218e3 100644 --- a/pkg/golinters/rowserrcheck/rowserrcheck_integration_test.go +++ b/pkg/golinters/rowserrcheck/rowserrcheck_integration_test.go @@ -3,7 +3,7 @@ package rowserrcheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/sloglint/sloglint.go b/pkg/golinters/sloglint/sloglint.go index 486662577935..01e75e44ab48 100644 --- a/pkg/golinters/sloglint/sloglint.go +++ b/pkg/golinters/sloglint/sloglint.go @@ -4,8 +4,8 @@ import ( "go-simpler.org/sloglint" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.SlogLintSettings) *goanalysis.Linter { diff --git a/pkg/golinters/sloglint/sloglint_integration_test.go b/pkg/golinters/sloglint/sloglint_integration_test.go index 818dd22c4f1f..d97178303060 100644 --- a/pkg/golinters/sloglint/sloglint_integration_test.go +++ b/pkg/golinters/sloglint/sloglint_integration_test.go @@ -3,7 +3,7 @@ package sloglint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/spancheck/spancheck.go b/pkg/golinters/spancheck/spancheck.go index efdc1d0bf662..264623058b1e 100644 --- a/pkg/golinters/spancheck/spancheck.go +++ b/pkg/golinters/spancheck/spancheck.go @@ -4,8 +4,8 @@ import ( "github.com/jjti/go-spancheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.SpancheckSettings) *goanalysis.Linter { diff --git a/pkg/golinters/spancheck/spancheck_integration_test.go b/pkg/golinters/spancheck/spancheck_integration_test.go index c05bc9af6486..0375bd94997b 100644 --- a/pkg/golinters/spancheck/spancheck_integration_test.go +++ b/pkg/golinters/spancheck/spancheck_integration_test.go @@ -3,7 +3,7 @@ package spancheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/sqlclosecheck/sqlclosecheck.go b/pkg/golinters/sqlclosecheck/sqlclosecheck.go index 5eb32ff9dbe3..7f7e70c71401 100644 --- a/pkg/golinters/sqlclosecheck/sqlclosecheck.go +++ b/pkg/golinters/sqlclosecheck/sqlclosecheck.go @@ -4,7 +4,7 @@ import ( "github.com/ryanrolds/sqlclosecheck/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/sqlclosecheck/sqlclosecheck_integration_test.go b/pkg/golinters/sqlclosecheck/sqlclosecheck_integration_test.go index 09a6c99eef12..38fde7a3a0a5 100644 --- a/pkg/golinters/sqlclosecheck/sqlclosecheck_integration_test.go +++ b/pkg/golinters/sqlclosecheck/sqlclosecheck_integration_test.go @@ -3,7 +3,7 @@ package sqlclosecheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/staticcheck/staticcheck.go b/pkg/golinters/staticcheck/staticcheck.go index f66d2c84fe2b..645655c9294d 100644 --- a/pkg/golinters/staticcheck/staticcheck.go +++ b/pkg/golinters/staticcheck/staticcheck.go @@ -13,8 +13,8 @@ import ( "honnef.co/go/tools/staticcheck" "honnef.co/go/tools/stylecheck" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.StaticCheckSettings) *goanalysis.Linter { diff --git a/pkg/golinters/staticcheck/staticcheck_integration_test.go b/pkg/golinters/staticcheck/staticcheck_integration_test.go index f0d7fba8a84c..4950e61a0f2e 100644 --- a/pkg/golinters/staticcheck/staticcheck_integration_test.go +++ b/pkg/golinters/staticcheck/staticcheck_integration_test.go @@ -3,7 +3,7 @@ package staticcheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/tagalign/tagalign.go b/pkg/golinters/tagalign/tagalign.go index 7c8a0c8b02e6..412d69b937ef 100644 --- a/pkg/golinters/tagalign/tagalign.go +++ b/pkg/golinters/tagalign/tagalign.go @@ -4,8 +4,8 @@ import ( "github.com/4meepo/tagalign" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.TagAlignSettings) *goanalysis.Linter { diff --git a/pkg/golinters/tagalign/tagalign_integration_test.go b/pkg/golinters/tagalign/tagalign_integration_test.go index 2dc10120ece9..13118986d562 100644 --- a/pkg/golinters/tagalign/tagalign_integration_test.go +++ b/pkg/golinters/tagalign/tagalign_integration_test.go @@ -3,7 +3,7 @@ package tagalign import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/tagliatelle/tagliatelle.go b/pkg/golinters/tagliatelle/tagliatelle.go index 08215c3a53fc..f6357e0e3747 100644 --- a/pkg/golinters/tagliatelle/tagliatelle.go +++ b/pkg/golinters/tagliatelle/tagliatelle.go @@ -4,8 +4,8 @@ import ( "github.com/ldez/tagliatelle" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.TagliatelleSettings) *goanalysis.Linter { diff --git a/pkg/golinters/tagliatelle/tagliatelle_integration_test.go b/pkg/golinters/tagliatelle/tagliatelle_integration_test.go index ee5eb0e15fac..7abe8b5a337b 100644 --- a/pkg/golinters/tagliatelle/tagliatelle_integration_test.go +++ b/pkg/golinters/tagliatelle/tagliatelle_integration_test.go @@ -3,7 +3,7 @@ package tagliatelle import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/testableexamples/testableexamples.go b/pkg/golinters/testableexamples/testableexamples.go index 6b76271dbab5..38334a096237 100644 --- a/pkg/golinters/testableexamples/testableexamples.go +++ b/pkg/golinters/testableexamples/testableexamples.go @@ -4,7 +4,7 @@ import ( "github.com/maratori/testableexamples/pkg/testableexamples" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/testableexamples/testableexamples_integration_test.go b/pkg/golinters/testableexamples/testableexamples_integration_test.go index e614803aa6bf..01bb55fe7aab 100644 --- a/pkg/golinters/testableexamples/testableexamples_integration_test.go +++ b/pkg/golinters/testableexamples/testableexamples_integration_test.go @@ -3,7 +3,7 @@ package testableexamples import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/testifylint/testifylint.go b/pkg/golinters/testifylint/testifylint.go index b3f2f0bd4697..b5eb30048e8b 100644 --- a/pkg/golinters/testifylint/testifylint.go +++ b/pkg/golinters/testifylint/testifylint.go @@ -4,8 +4,8 @@ import ( "github.com/Antonboom/testifylint/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.TestifylintSettings) *goanalysis.Linter { diff --git a/pkg/golinters/testifylint/testifylint_integration_test.go b/pkg/golinters/testifylint/testifylint_integration_test.go index 0bb1fb3e026c..903457dc3598 100644 --- a/pkg/golinters/testifylint/testifylint_integration_test.go +++ b/pkg/golinters/testifylint/testifylint_integration_test.go @@ -3,7 +3,7 @@ package testifylint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/testpackage/testpackage.go b/pkg/golinters/testpackage/testpackage.go index f617da553644..ddd5ce95cd15 100644 --- a/pkg/golinters/testpackage/testpackage.go +++ b/pkg/golinters/testpackage/testpackage.go @@ -6,8 +6,8 @@ import ( "github.com/maratori/testpackage/pkg/testpackage" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.TestpackageSettings) *goanalysis.Linter { diff --git a/pkg/golinters/testpackage/testpackage_integration_test.go b/pkg/golinters/testpackage/testpackage_integration_test.go index 871b10afaf24..5512cbbf80cf 100644 --- a/pkg/golinters/testpackage/testpackage_integration_test.go +++ b/pkg/golinters/testpackage/testpackage_integration_test.go @@ -3,7 +3,7 @@ package testpackage import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/thelper/thelper.go b/pkg/golinters/thelper/thelper.go index 04503b9ce0c1..d9058582d83c 100644 --- a/pkg/golinters/thelper/thelper.go +++ b/pkg/golinters/thelper/thelper.go @@ -8,9 +8,9 @@ import ( "github.com/kulti/thelper/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/golinters/internal" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/golinters/internal" ) func New(settings *config.ThelperSettings) *goanalysis.Linter { diff --git a/pkg/golinters/thelper/thelper_integration_test.go b/pkg/golinters/thelper/thelper_integration_test.go index 5ff8792da8c8..062bd67e6ce0 100644 --- a/pkg/golinters/thelper/thelper_integration_test.go +++ b/pkg/golinters/thelper/thelper_integration_test.go @@ -3,7 +3,7 @@ package thelper import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/tparallel/tparallel.go b/pkg/golinters/tparallel/tparallel.go index 4f7c43a99d1b..f3ce2fcf7975 100644 --- a/pkg/golinters/tparallel/tparallel.go +++ b/pkg/golinters/tparallel/tparallel.go @@ -4,7 +4,7 @@ import ( "github.com/moricho/tparallel" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/tparallel/tparallel_integration_test.go b/pkg/golinters/tparallel/tparallel_integration_test.go index 7b57d308da09..aedf2b6e3165 100644 --- a/pkg/golinters/tparallel/tparallel_integration_test.go +++ b/pkg/golinters/tparallel/tparallel_integration_test.go @@ -3,7 +3,7 @@ package tparallel import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/typecheck.go b/pkg/golinters/typecheck.go index d0eaa00d0cea..ad51e8d00f90 100644 --- a/pkg/golinters/typecheck.go +++ b/pkg/golinters/typecheck.go @@ -3,7 +3,7 @@ package golinters import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func NewTypecheck() *goanalysis.Linter { diff --git a/pkg/golinters/unconvert/unconvert.go b/pkg/golinters/unconvert/unconvert.go index 954cc9eb34ce..5ca8e09ad110 100644 --- a/pkg/golinters/unconvert/unconvert.go +++ b/pkg/golinters/unconvert/unconvert.go @@ -6,10 +6,10 @@ import ( "github.com/golangci/unconvert" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "unconvert" diff --git a/pkg/golinters/unconvert/unconvert_integration_test.go b/pkg/golinters/unconvert/unconvert_integration_test.go index 3404eb073b00..69b3f498204d 100644 --- a/pkg/golinters/unconvert/unconvert_integration_test.go +++ b/pkg/golinters/unconvert/unconvert_integration_test.go @@ -3,7 +3,7 @@ package unconvert import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/unparam/unparam.go b/pkg/golinters/unparam/unparam.go index 49518cfaa302..5a9bc8a5e473 100644 --- a/pkg/golinters/unparam/unparam.go +++ b/pkg/golinters/unparam/unparam.go @@ -6,8 +6,8 @@ import ( "golang.org/x/tools/go/packages" "mvdan.cc/unparam/check" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) const linterName = "unparam" diff --git a/pkg/golinters/unparam/unparam_integration_test.go b/pkg/golinters/unparam/unparam_integration_test.go index 279663fd261e..866612e55166 100644 --- a/pkg/golinters/unparam/unparam_integration_test.go +++ b/pkg/golinters/unparam/unparam_integration_test.go @@ -3,7 +3,7 @@ package unparam import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/unused/unused.go b/pkg/golinters/unused/unused.go index 7b2b478fc943..375962259676 100644 --- a/pkg/golinters/unused/unused.go +++ b/pkg/golinters/unused/unused.go @@ -10,10 +10,10 @@ import ( "honnef.co/go/tools/analysis/lint" "honnef.co/go/tools/unused" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const linterName = "unused" diff --git a/pkg/golinters/unused/unused_integration_test.go b/pkg/golinters/unused/unused_integration_test.go index d8610ebc4f26..5b9ed0b00881 100644 --- a/pkg/golinters/unused/unused_integration_test.go +++ b/pkg/golinters/unused/unused_integration_test.go @@ -3,7 +3,7 @@ package unused import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/usestdlibvars/usestdlibvars.go b/pkg/golinters/usestdlibvars/usestdlibvars.go index 88488bc7fd2c..f0b5f5420d00 100644 --- a/pkg/golinters/usestdlibvars/usestdlibvars.go +++ b/pkg/golinters/usestdlibvars/usestdlibvars.go @@ -4,8 +4,8 @@ import ( "github.com/sashamelentyev/usestdlibvars/pkg/analyzer" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.UseStdlibVarsSettings) *goanalysis.Linter { diff --git a/pkg/golinters/usestdlibvars/usestdlibvars_integration_test.go b/pkg/golinters/usestdlibvars/usestdlibvars_integration_test.go index 26331c324fbd..de71bc902998 100644 --- a/pkg/golinters/usestdlibvars/usestdlibvars_integration_test.go +++ b/pkg/golinters/usestdlibvars/usestdlibvars_integration_test.go @@ -3,7 +3,7 @@ package usestdlibvars import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/usetesting/usetesting.go b/pkg/golinters/usetesting/usetesting.go index a21742fbd6d4..5dfa9f11ad54 100644 --- a/pkg/golinters/usetesting/usetesting.go +++ b/pkg/golinters/usetesting/usetesting.go @@ -4,8 +4,8 @@ import ( "github.com/ldez/usetesting" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.UseTestingSettings) *goanalysis.Linter { diff --git a/pkg/golinters/usetesting/usetesting_integration_test.go b/pkg/golinters/usetesting/usetesting_integration_test.go index 0394b449b09b..2570855ba139 100644 --- a/pkg/golinters/usetesting/usetesting_integration_test.go +++ b/pkg/golinters/usetesting/usetesting_integration_test.go @@ -3,7 +3,7 @@ package usetesting import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/varnamelen/varnamelen.go b/pkg/golinters/varnamelen/varnamelen.go index 6cb57ffa57c4..dbd8005ee0d1 100644 --- a/pkg/golinters/varnamelen/varnamelen.go +++ b/pkg/golinters/varnamelen/varnamelen.go @@ -7,8 +7,8 @@ import ( "github.com/blizzy78/varnamelen" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.VarnamelenSettings) *goanalysis.Linter { diff --git a/pkg/golinters/varnamelen/varnamelen_integration_test.go b/pkg/golinters/varnamelen/varnamelen_integration_test.go index 4c3367590cb6..226c0ef343bf 100644 --- a/pkg/golinters/varnamelen/varnamelen_integration_test.go +++ b/pkg/golinters/varnamelen/varnamelen_integration_test.go @@ -3,7 +3,7 @@ package varnamelen import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/wastedassign/wastedassign.go b/pkg/golinters/wastedassign/wastedassign.go index 094fa95c2943..6599f7d4dace 100644 --- a/pkg/golinters/wastedassign/wastedassign.go +++ b/pkg/golinters/wastedassign/wastedassign.go @@ -4,7 +4,7 @@ import ( "github.com/sanposhiho/wastedassign/v2" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/wastedassign/wastedassign_integration_test.go b/pkg/golinters/wastedassign/wastedassign_integration_test.go index 581e237beeab..d8805df96c25 100644 --- a/pkg/golinters/wastedassign/wastedassign_integration_test.go +++ b/pkg/golinters/wastedassign/wastedassign_integration_test.go @@ -3,7 +3,7 @@ package wastedassign import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/whitespace/whitespace.go b/pkg/golinters/whitespace/whitespace.go index d45969efce5c..cd7fda1ce0d0 100644 --- a/pkg/golinters/whitespace/whitespace.go +++ b/pkg/golinters/whitespace/whitespace.go @@ -4,8 +4,8 @@ import ( "github.com/ultraware/whitespace" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.WhitespaceSettings) *goanalysis.Linter { diff --git a/pkg/golinters/whitespace/whitespace_integration_test.go b/pkg/golinters/whitespace/whitespace_integration_test.go index 015dee5e9d26..e37b5e5f7b66 100644 --- a/pkg/golinters/whitespace/whitespace_integration_test.go +++ b/pkg/golinters/whitespace/whitespace_integration_test.go @@ -3,7 +3,7 @@ package whitespace import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/wrapcheck/wrapcheck.go b/pkg/golinters/wrapcheck/wrapcheck.go index b2f5ec742098..8918a82eaf1a 100644 --- a/pkg/golinters/wrapcheck/wrapcheck.go +++ b/pkg/golinters/wrapcheck/wrapcheck.go @@ -4,8 +4,8 @@ import ( "github.com/tomarrell/wrapcheck/v2/wrapcheck" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.WrapcheckSettings) *goanalysis.Linter { diff --git a/pkg/golinters/wrapcheck/wrapcheck_integration_test.go b/pkg/golinters/wrapcheck/wrapcheck_integration_test.go index c9adfc841ad2..77099dc274f2 100644 --- a/pkg/golinters/wrapcheck/wrapcheck_integration_test.go +++ b/pkg/golinters/wrapcheck/wrapcheck_integration_test.go @@ -3,7 +3,7 @@ package wrapcheck import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/wsl/wsl.go b/pkg/golinters/wsl/wsl.go index c728340eceb2..2f71f342e781 100644 --- a/pkg/golinters/wsl/wsl.go +++ b/pkg/golinters/wsl/wsl.go @@ -4,8 +4,8 @@ import ( "github.com/bombsimon/wsl/v4" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New(settings *config.WSLSettings) *goanalysis.Linter { diff --git a/pkg/golinters/wsl/wsl_integration_test.go b/pkg/golinters/wsl/wsl_integration_test.go index 98dfa49258eb..32c7c29edd89 100644 --- a/pkg/golinters/wsl/wsl_integration_test.go +++ b/pkg/golinters/wsl/wsl_integration_test.go @@ -3,7 +3,7 @@ package wsl import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/golinters/zerologlint/zerologlint.go b/pkg/golinters/zerologlint/zerologlint.go index 6ca74020c82d..0daf0d48a4d6 100644 --- a/pkg/golinters/zerologlint/zerologlint.go +++ b/pkg/golinters/zerologlint/zerologlint.go @@ -4,7 +4,7 @@ import ( "github.com/ykadowak/zerologlint" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" ) func New() *goanalysis.Linter { diff --git a/pkg/golinters/zerologlint/zerologlint_integration_test.go b/pkg/golinters/zerologlint/zerologlint_integration_test.go index 09030a8837fd..31a4b6fb29b3 100644 --- a/pkg/golinters/zerologlint/zerologlint_integration_test.go +++ b/pkg/golinters/zerologlint/zerologlint_integration_test.go @@ -3,7 +3,7 @@ package zerologlint import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFromTestdata(t *testing.T) { diff --git a/pkg/goutil/env.go b/pkg/goutil/env.go index beb71f722e0a..89e1634ca296 100644 --- a/pkg/goutil/env.go +++ b/pkg/goutil/env.go @@ -8,7 +8,7 @@ import ( "github.com/ldez/grignotin/goenv" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type EnvKey string diff --git a/pkg/lint/context.go b/pkg/lint/context.go index 2ac5a2d2c4fc..e8e8cc366d17 100644 --- a/pkg/lint/context.go +++ b/pkg/lint/context.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/goanalysis/load" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/internal/cache" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/load" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type ContextBuilder struct { diff --git a/pkg/lint/linter/config.go b/pkg/lint/linter/config.go index 2c1e86fb5e14..a7a9a68d9d92 100644 --- a/pkg/lint/linter/config.go +++ b/pkg/lint/linter/config.go @@ -5,7 +5,7 @@ import ( "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) // LastLinter nolintlint must be last because it looks at the results of all the previous linters for unused nolint directives. diff --git a/pkg/lint/linter/context.go b/pkg/lint/linter/context.go index 302a15ddc5c4..cf463ea922f0 100644 --- a/pkg/lint/linter/context.go +++ b/pkg/lint/linter/context.go @@ -5,10 +5,10 @@ import ( "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis/load" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/internal/cache" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/load" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type Context struct { diff --git a/pkg/lint/linter/linter.go b/pkg/lint/linter/linter.go index 088aa3d78b3f..7f68545cf159 100644 --- a/pkg/lint/linter/linter.go +++ b/pkg/lint/linter/linter.go @@ -3,8 +3,8 @@ package linter import ( "context" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result" ) type Linter interface { diff --git a/pkg/lint/lintersdb/builder_linter.go b/pkg/lint/lintersdb/builder_linter.go index b0a8c456e08f..6c533d2e4878 100644 --- a/pkg/lint/lintersdb/builder_linter.go +++ b/pkg/lint/lintersdb/builder_linter.go @@ -1,117 +1,117 @@ package lintersdb import ( - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/golinters" - "github.com/golangci/golangci-lint/pkg/golinters/asasalint" - "github.com/golangci/golangci-lint/pkg/golinters/asciicheck" - "github.com/golangci/golangci-lint/pkg/golinters/bidichk" - "github.com/golangci/golangci-lint/pkg/golinters/bodyclose" - "github.com/golangci/golangci-lint/pkg/golinters/canonicalheader" - "github.com/golangci/golangci-lint/pkg/golinters/containedctx" - "github.com/golangci/golangci-lint/pkg/golinters/contextcheck" - "github.com/golangci/golangci-lint/pkg/golinters/copyloopvar" - "github.com/golangci/golangci-lint/pkg/golinters/cyclop" - "github.com/golangci/golangci-lint/pkg/golinters/decorder" - "github.com/golangci/golangci-lint/pkg/golinters/depguard" - "github.com/golangci/golangci-lint/pkg/golinters/dogsled" - "github.com/golangci/golangci-lint/pkg/golinters/dupl" - "github.com/golangci/golangci-lint/pkg/golinters/dupword" - "github.com/golangci/golangci-lint/pkg/golinters/durationcheck" - "github.com/golangci/golangci-lint/pkg/golinters/err113" - "github.com/golangci/golangci-lint/pkg/golinters/errcheck" - "github.com/golangci/golangci-lint/pkg/golinters/errchkjson" - "github.com/golangci/golangci-lint/pkg/golinters/errname" - "github.com/golangci/golangci-lint/pkg/golinters/errorlint" - "github.com/golangci/golangci-lint/pkg/golinters/exhaustive" - "github.com/golangci/golangci-lint/pkg/golinters/exhaustruct" - "github.com/golangci/golangci-lint/pkg/golinters/exptostd" - "github.com/golangci/golangci-lint/pkg/golinters/fatcontext" - "github.com/golangci/golangci-lint/pkg/golinters/forbidigo" - "github.com/golangci/golangci-lint/pkg/golinters/forcetypeassert" - "github.com/golangci/golangci-lint/pkg/golinters/funlen" - "github.com/golangci/golangci-lint/pkg/golinters/gci" - "github.com/golangci/golangci-lint/pkg/golinters/ginkgolinter" - "github.com/golangci/golangci-lint/pkg/golinters/gocheckcompilerdirectives" - "github.com/golangci/golangci-lint/pkg/golinters/gochecknoglobals" - "github.com/golangci/golangci-lint/pkg/golinters/gochecknoinits" - "github.com/golangci/golangci-lint/pkg/golinters/gochecksumtype" - "github.com/golangci/golangci-lint/pkg/golinters/gocognit" - "github.com/golangci/golangci-lint/pkg/golinters/goconst" - "github.com/golangci/golangci-lint/pkg/golinters/gocritic" - "github.com/golangci/golangci-lint/pkg/golinters/gocyclo" - "github.com/golangci/golangci-lint/pkg/golinters/godot" - "github.com/golangci/golangci-lint/pkg/golinters/godox" - "github.com/golangci/golangci-lint/pkg/golinters/gofmt" - "github.com/golangci/golangci-lint/pkg/golinters/gofumpt" - "github.com/golangci/golangci-lint/pkg/golinters/goheader" - "github.com/golangci/golangci-lint/pkg/golinters/goimports" - "github.com/golangci/golangci-lint/pkg/golinters/golines" - "github.com/golangci/golangci-lint/pkg/golinters/gomoddirectives" - "github.com/golangci/golangci-lint/pkg/golinters/gomodguard" - "github.com/golangci/golangci-lint/pkg/golinters/goprintffuncname" - "github.com/golangci/golangci-lint/pkg/golinters/gosec" - "github.com/golangci/golangci-lint/pkg/golinters/gosmopolitan" - "github.com/golangci/golangci-lint/pkg/golinters/govet" - "github.com/golangci/golangci-lint/pkg/golinters/grouper" - "github.com/golangci/golangci-lint/pkg/golinters/iface" - "github.com/golangci/golangci-lint/pkg/golinters/importas" - "github.com/golangci/golangci-lint/pkg/golinters/inamedparam" - "github.com/golangci/golangci-lint/pkg/golinters/ineffassign" - "github.com/golangci/golangci-lint/pkg/golinters/interfacebloat" - "github.com/golangci/golangci-lint/pkg/golinters/intrange" - "github.com/golangci/golangci-lint/pkg/golinters/ireturn" - "github.com/golangci/golangci-lint/pkg/golinters/lll" - "github.com/golangci/golangci-lint/pkg/golinters/loggercheck" - "github.com/golangci/golangci-lint/pkg/golinters/maintidx" - "github.com/golangci/golangci-lint/pkg/golinters/makezero" - "github.com/golangci/golangci-lint/pkg/golinters/mirror" - "github.com/golangci/golangci-lint/pkg/golinters/misspell" - "github.com/golangci/golangci-lint/pkg/golinters/mnd" - "github.com/golangci/golangci-lint/pkg/golinters/musttag" - "github.com/golangci/golangci-lint/pkg/golinters/nakedret" - "github.com/golangci/golangci-lint/pkg/golinters/nestif" - "github.com/golangci/golangci-lint/pkg/golinters/nilerr" - "github.com/golangci/golangci-lint/pkg/golinters/nilnesserr" - "github.com/golangci/golangci-lint/pkg/golinters/nilnil" - "github.com/golangci/golangci-lint/pkg/golinters/nlreturn" - "github.com/golangci/golangci-lint/pkg/golinters/noctx" - "github.com/golangci/golangci-lint/pkg/golinters/nolintlint" - "github.com/golangci/golangci-lint/pkg/golinters/nonamedreturns" - "github.com/golangci/golangci-lint/pkg/golinters/nosprintfhostport" - "github.com/golangci/golangci-lint/pkg/golinters/paralleltest" - "github.com/golangci/golangci-lint/pkg/golinters/perfsprint" - "github.com/golangci/golangci-lint/pkg/golinters/prealloc" - "github.com/golangci/golangci-lint/pkg/golinters/predeclared" - "github.com/golangci/golangci-lint/pkg/golinters/promlinter" - "github.com/golangci/golangci-lint/pkg/golinters/protogetter" - "github.com/golangci/golangci-lint/pkg/golinters/reassign" - "github.com/golangci/golangci-lint/pkg/golinters/recvcheck" - "github.com/golangci/golangci-lint/pkg/golinters/revive" - "github.com/golangci/golangci-lint/pkg/golinters/rowserrcheck" - "github.com/golangci/golangci-lint/pkg/golinters/sloglint" - "github.com/golangci/golangci-lint/pkg/golinters/spancheck" - "github.com/golangci/golangci-lint/pkg/golinters/sqlclosecheck" - "github.com/golangci/golangci-lint/pkg/golinters/staticcheck" - "github.com/golangci/golangci-lint/pkg/golinters/tagalign" - "github.com/golangci/golangci-lint/pkg/golinters/tagliatelle" - "github.com/golangci/golangci-lint/pkg/golinters/testableexamples" - "github.com/golangci/golangci-lint/pkg/golinters/testifylint" - "github.com/golangci/golangci-lint/pkg/golinters/testpackage" - "github.com/golangci/golangci-lint/pkg/golinters/thelper" - "github.com/golangci/golangci-lint/pkg/golinters/tparallel" - "github.com/golangci/golangci-lint/pkg/golinters/unconvert" - "github.com/golangci/golangci-lint/pkg/golinters/unparam" - "github.com/golangci/golangci-lint/pkg/golinters/unused" - "github.com/golangci/golangci-lint/pkg/golinters/usestdlibvars" - "github.com/golangci/golangci-lint/pkg/golinters/usetesting" - "github.com/golangci/golangci-lint/pkg/golinters/varnamelen" - "github.com/golangci/golangci-lint/pkg/golinters/wastedassign" - "github.com/golangci/golangci-lint/pkg/golinters/whitespace" - "github.com/golangci/golangci-lint/pkg/golinters/wrapcheck" - "github.com/golangci/golangci-lint/pkg/golinters/wsl" - "github.com/golangci/golangci-lint/pkg/golinters/zerologlint" - "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/golinters" + "github.com/golangci/golangci-lint/v2/pkg/golinters/asasalint" + "github.com/golangci/golangci-lint/v2/pkg/golinters/asciicheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/bidichk" + "github.com/golangci/golangci-lint/v2/pkg/golinters/bodyclose" + "github.com/golangci/golangci-lint/v2/pkg/golinters/canonicalheader" + "github.com/golangci/golangci-lint/v2/pkg/golinters/containedctx" + "github.com/golangci/golangci-lint/v2/pkg/golinters/contextcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/copyloopvar" + "github.com/golangci/golangci-lint/v2/pkg/golinters/cyclop" + "github.com/golangci/golangci-lint/v2/pkg/golinters/decorder" + "github.com/golangci/golangci-lint/v2/pkg/golinters/depguard" + "github.com/golangci/golangci-lint/v2/pkg/golinters/dogsled" + "github.com/golangci/golangci-lint/v2/pkg/golinters/dupl" + "github.com/golangci/golangci-lint/v2/pkg/golinters/dupword" + "github.com/golangci/golangci-lint/v2/pkg/golinters/durationcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/err113" + "github.com/golangci/golangci-lint/v2/pkg/golinters/errcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/errchkjson" + "github.com/golangci/golangci-lint/v2/pkg/golinters/errname" + "github.com/golangci/golangci-lint/v2/pkg/golinters/errorlint" + "github.com/golangci/golangci-lint/v2/pkg/golinters/exhaustive" + "github.com/golangci/golangci-lint/v2/pkg/golinters/exhaustruct" + "github.com/golangci/golangci-lint/v2/pkg/golinters/exptostd" + "github.com/golangci/golangci-lint/v2/pkg/golinters/fatcontext" + "github.com/golangci/golangci-lint/v2/pkg/golinters/forbidigo" + "github.com/golangci/golangci-lint/v2/pkg/golinters/forcetypeassert" + "github.com/golangci/golangci-lint/v2/pkg/golinters/funlen" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gci" + "github.com/golangci/golangci-lint/v2/pkg/golinters/ginkgolinter" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gocheckcompilerdirectives" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gochecknoglobals" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gochecknoinits" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gochecksumtype" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gocognit" + "github.com/golangci/golangci-lint/v2/pkg/golinters/goconst" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gocritic" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gocyclo" + "github.com/golangci/golangci-lint/v2/pkg/golinters/godot" + "github.com/golangci/golangci-lint/v2/pkg/golinters/godox" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gofmt" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gofumpt" + "github.com/golangci/golangci-lint/v2/pkg/golinters/goheader" + "github.com/golangci/golangci-lint/v2/pkg/golinters/goimports" + "github.com/golangci/golangci-lint/v2/pkg/golinters/golines" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gomoddirectives" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gomodguard" + "github.com/golangci/golangci-lint/v2/pkg/golinters/goprintffuncname" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gosec" + "github.com/golangci/golangci-lint/v2/pkg/golinters/gosmopolitan" + "github.com/golangci/golangci-lint/v2/pkg/golinters/govet" + "github.com/golangci/golangci-lint/v2/pkg/golinters/grouper" + "github.com/golangci/golangci-lint/v2/pkg/golinters/iface" + "github.com/golangci/golangci-lint/v2/pkg/golinters/importas" + "github.com/golangci/golangci-lint/v2/pkg/golinters/inamedparam" + "github.com/golangci/golangci-lint/v2/pkg/golinters/ineffassign" + "github.com/golangci/golangci-lint/v2/pkg/golinters/interfacebloat" + "github.com/golangci/golangci-lint/v2/pkg/golinters/intrange" + "github.com/golangci/golangci-lint/v2/pkg/golinters/ireturn" + "github.com/golangci/golangci-lint/v2/pkg/golinters/lll" + "github.com/golangci/golangci-lint/v2/pkg/golinters/loggercheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/maintidx" + "github.com/golangci/golangci-lint/v2/pkg/golinters/makezero" + "github.com/golangci/golangci-lint/v2/pkg/golinters/mirror" + "github.com/golangci/golangci-lint/v2/pkg/golinters/misspell" + "github.com/golangci/golangci-lint/v2/pkg/golinters/mnd" + "github.com/golangci/golangci-lint/v2/pkg/golinters/musttag" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nakedret" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nestif" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nilerr" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nilnesserr" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nilnil" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nlreturn" + "github.com/golangci/golangci-lint/v2/pkg/golinters/noctx" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nolintlint" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nonamedreturns" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nosprintfhostport" + "github.com/golangci/golangci-lint/v2/pkg/golinters/paralleltest" + "github.com/golangci/golangci-lint/v2/pkg/golinters/perfsprint" + "github.com/golangci/golangci-lint/v2/pkg/golinters/prealloc" + "github.com/golangci/golangci-lint/v2/pkg/golinters/predeclared" + "github.com/golangci/golangci-lint/v2/pkg/golinters/promlinter" + "github.com/golangci/golangci-lint/v2/pkg/golinters/protogetter" + "github.com/golangci/golangci-lint/v2/pkg/golinters/reassign" + "github.com/golangci/golangci-lint/v2/pkg/golinters/recvcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/revive" + "github.com/golangci/golangci-lint/v2/pkg/golinters/rowserrcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/sloglint" + "github.com/golangci/golangci-lint/v2/pkg/golinters/spancheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/sqlclosecheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/staticcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/tagalign" + "github.com/golangci/golangci-lint/v2/pkg/golinters/tagliatelle" + "github.com/golangci/golangci-lint/v2/pkg/golinters/testableexamples" + "github.com/golangci/golangci-lint/v2/pkg/golinters/testifylint" + "github.com/golangci/golangci-lint/v2/pkg/golinters/testpackage" + "github.com/golangci/golangci-lint/v2/pkg/golinters/thelper" + "github.com/golangci/golangci-lint/v2/pkg/golinters/tparallel" + "github.com/golangci/golangci-lint/v2/pkg/golinters/unconvert" + "github.com/golangci/golangci-lint/v2/pkg/golinters/unparam" + "github.com/golangci/golangci-lint/v2/pkg/golinters/unused" + "github.com/golangci/golangci-lint/v2/pkg/golinters/usestdlibvars" + "github.com/golangci/golangci-lint/v2/pkg/golinters/usetesting" + "github.com/golangci/golangci-lint/v2/pkg/golinters/varnamelen" + "github.com/golangci/golangci-lint/v2/pkg/golinters/wastedassign" + "github.com/golangci/golangci-lint/v2/pkg/golinters/whitespace" + "github.com/golangci/golangci-lint/v2/pkg/golinters/wrapcheck" + "github.com/golangci/golangci-lint/v2/pkg/golinters/wsl" + "github.com/golangci/golangci-lint/v2/pkg/golinters/zerologlint" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" ) // LinterBuilder builds the "internal" linters based on the configuration. diff --git a/pkg/lint/lintersdb/builder_plugin_go.go b/pkg/lint/lintersdb/builder_plugin_go.go index 78648ccad395..00a801ad6f0d 100644 --- a/pkg/lint/lintersdb/builder_plugin_go.go +++ b/pkg/lint/lintersdb/builder_plugin_go.go @@ -9,11 +9,11 @@ import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const goPluginType = "goplugin" diff --git a/pkg/lint/lintersdb/builder_plugin_module.go b/pkg/lint/lintersdb/builder_plugin_module.go index 7738fd3bdff7..71a01302d967 100644 --- a/pkg/lint/lintersdb/builder_plugin_module.go +++ b/pkg/lint/lintersdb/builder_plugin_module.go @@ -6,10 +6,10 @@ import ( "github.com/golangci/plugin-module-register/register" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const modulePluginType = "module" diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index c94b2ad26772..9750301bfc28 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -9,11 +9,11 @@ import ( "sort" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type Builder interface { diff --git a/pkg/lint/lintersdb/manager_test.go b/pkg/lint/lintersdb/manager_test.go index 62874cba0a0a..7072355adc59 100644 --- a/pkg/lint/lintersdb/manager_test.go +++ b/pkg/lint/lintersdb/manager_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) func TestManager_GetEnabledLintersMap(t *testing.T) { diff --git a/pkg/lint/lintersdb/validator.go b/pkg/lint/lintersdb/validator.go index e9a44bfe5501..912748250949 100644 --- a/pkg/lint/lintersdb/validator.go +++ b/pkg/lint/lintersdb/validator.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type Validator struct { diff --git a/pkg/lint/lintersdb/validator_test.go b/pkg/lint/lintersdb/validator_test.go index 8d8ad63c2272..5e230d3343ff 100644 --- a/pkg/lint/lintersdb/validator_test.go +++ b/pkg/lint/lintersdb/validator_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) type validateErrorTestCase struct { diff --git a/pkg/lint/package.go b/pkg/lint/package.go index 736498b0b4d4..f9bf2230d074 100644 --- a/pkg/lint/package.go +++ b/pkg/lint/package.go @@ -14,12 +14,12 @@ import ( "github.com/ldez/grignotin/goenv" "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/goanalysis/load" - "github.com/golangci/golangci-lint/pkg/goutil" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/goanalysis/load" + "github.com/golangci/golangci-lint/v2/pkg/goutil" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) // PackageLoader loads packages based on [golang.org/x/tools/go/packages.Load]. diff --git a/pkg/lint/runner.go b/pkg/lint/runner.go index 516fe8b3af9a..ebb35a0d7460 100644 --- a/pkg/lint/runner.go +++ b/pkg/lint/runner.go @@ -8,17 +8,17 @@ import ( "runtime/debug" "strings" - "github.com/golangci/golangci-lint/internal/errorutil" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/goutil" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/golangci-lint/pkg/result/processors" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/internal/errorutil" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/goutil" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result/processors" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) type processorStat struct { diff --git a/pkg/logutils/stderr_log.go b/pkg/logutils/stderr_log.go index 569a177a7c5c..b47c65eace22 100644 --- a/pkg/logutils/stderr_log.go +++ b/pkg/logutils/stderr_log.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) const ( diff --git a/pkg/printers/checkstyle.go b/pkg/printers/checkstyle.go index c31641d22d2f..5a60554bdb62 100644 --- a/pkg/printers/checkstyle.go +++ b/pkg/printers/checkstyle.go @@ -10,8 +10,8 @@ import ( "github.com/go-xmlfmt/xmlfmt" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const defaultCheckstyleSeverity = "error" diff --git a/pkg/printers/checkstyle_test.go b/pkg/printers/checkstyle_test.go index 23d77839515d..f087a79b83b0 100644 --- a/pkg/printers/checkstyle_test.go +++ b/pkg/printers/checkstyle_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestCheckstyle_Print(t *testing.T) { diff --git a/pkg/printers/codeclimate.go b/pkg/printers/codeclimate.go index 983dcde363a8..872d860d3ba4 100644 --- a/pkg/printers/codeclimate.go +++ b/pkg/printers/codeclimate.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const defaultCodeClimateSeverity = "critical" diff --git a/pkg/printers/codeclimate_test.go b/pkg/printers/codeclimate_test.go index 3ec6ad73cfae..28fd281c4548 100644 --- a/pkg/printers/codeclimate_test.go +++ b/pkg/printers/codeclimate_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestCodeClimate_Print(t *testing.T) { diff --git a/pkg/printers/html.go b/pkg/printers/html.go index 6fc6bc62a2b8..0f99bb7ff8ce 100644 --- a/pkg/printers/html.go +++ b/pkg/printers/html.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const templateContent = ` diff --git a/pkg/printers/html_test.go b/pkg/printers/html_test.go index 9adf42a2f5d3..3964d81ddeaf 100644 --- a/pkg/printers/html_test.go +++ b/pkg/printers/html_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const expectedHTML = ` diff --git a/pkg/printers/json.go b/pkg/printers/json.go index 8fc94649f768..64fd33c7bae5 100644 --- a/pkg/printers/json.go +++ b/pkg/printers/json.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io" - "github.com/golangci/golangci-lint/pkg/report" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/report" + "github.com/golangci/golangci-lint/v2/pkg/result" ) // JSON prints issues in a JSON representation. diff --git a/pkg/printers/json_test.go b/pkg/printers/json_test.go index 1ce3690fb168..001c283ee611 100644 --- a/pkg/printers/json_test.go +++ b/pkg/printers/json_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestJSON_Print(t *testing.T) { diff --git a/pkg/printers/junitxml.go b/pkg/printers/junitxml.go index 587cef4e2ac0..708f83e5a860 100644 --- a/pkg/printers/junitxml.go +++ b/pkg/printers/junitxml.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) // JUnitXML prints issues in the JUnit XML format. diff --git a/pkg/printers/junitxml_test.go b/pkg/printers/junitxml_test.go index b5dbf9242eb5..7a429e546f46 100644 --- a/pkg/printers/junitxml_test.go +++ b/pkg/printers/junitxml_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestJUnitXML_Print(t *testing.T) { diff --git a/pkg/printers/printer.go b/pkg/printers/printer.go index b43a19de29e1..575bba75f1d5 100644 --- a/pkg/printers/printer.go +++ b/pkg/printers/printer.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/report" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/report" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const ( diff --git a/pkg/printers/printer_test.go b/pkg/printers/printer_test.go index c74ad057a684..850ee94a097b 100644 --- a/pkg/printers/printer_test.go +++ b/pkg/printers/printer_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/report" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/report" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func unmarshalFile(t *testing.T, filename string, v any) { diff --git a/pkg/printers/sarif.go b/pkg/printers/sarif.go index c06c11624434..e8d8c64f7da3 100644 --- a/pkg/printers/sarif.go +++ b/pkg/printers/sarif.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const ( diff --git a/pkg/printers/sarif_test.go b/pkg/printers/sarif_test.go index f90606045682..f6ddf4d81f07 100644 --- a/pkg/printers/sarif_test.go +++ b/pkg/printers/sarif_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestSarif_Print(t *testing.T) { diff --git a/pkg/printers/tab.go b/pkg/printers/tab.go index 35e0c703fd12..0d14593e5950 100644 --- a/pkg/printers/tab.go +++ b/pkg/printers/tab.go @@ -7,9 +7,9 @@ import ( "github.com/fatih/color" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) // Tab prints issues using tabulation as a field separator. diff --git a/pkg/printers/tab_test.go b/pkg/printers/tab_test.go index 464f75b3c810..f8e47f84b2b1 100644 --- a/pkg/printers/tab_test.go +++ b/pkg/printers/tab_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestTab_Print(t *testing.T) { diff --git a/pkg/printers/teamcity.go b/pkg/printers/teamcity.go index 9ff5fe5bc9dc..a85307729d05 100644 --- a/pkg/printers/teamcity.go +++ b/pkg/printers/teamcity.go @@ -5,8 +5,8 @@ import ( "io" "strings" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) // Field limits. diff --git a/pkg/printers/teamcity_test.go b/pkg/printers/teamcity_test.go index 1eb29d33931d..eda415670273 100644 --- a/pkg/printers/teamcity_test.go +++ b/pkg/printers/teamcity_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestTeamCity_Print(t *testing.T) { diff --git a/pkg/printers/text.go b/pkg/printers/text.go index 678311ad085c..545679fb7b45 100644 --- a/pkg/printers/text.go +++ b/pkg/printers/text.go @@ -7,9 +7,9 @@ import ( "github.com/fatih/color" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) // Text prints issues with a human friendly representation. diff --git a/pkg/printers/text_test.go b/pkg/printers/text_test.go index 474deb256931..4a1c39483526 100644 --- a/pkg/printers/text_test.go +++ b/pkg/printers/text_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestText_Print(t *testing.T) { diff --git a/pkg/report/log.go b/pkg/report/log.go index 61665f28b759..ad096415123f 100644 --- a/pkg/report/log.go +++ b/pkg/report/log.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) type LogWrapper struct { diff --git a/pkg/result/processors/base_rule.go b/pkg/result/processors/base_rule.go index 6a6f112a087a..e544e373e27e 100644 --- a/pkg/result/processors/base_rule.go +++ b/pkg/result/processors/base_rule.go @@ -3,10 +3,10 @@ package processors import ( "regexp" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) type baseRule struct { diff --git a/pkg/result/processors/cgo.go b/pkg/result/processors/cgo.go index b09b8b72837a..dea3801e2c8a 100644 --- a/pkg/result/processors/cgo.go +++ b/pkg/result/processors/cgo.go @@ -6,8 +6,8 @@ import ( "github.com/ldez/grignotin/goenv" - "github.com/golangci/golangci-lint/pkg/goutil" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/goutil" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*Cgo)(nil) diff --git a/pkg/result/processors/diff.go b/pkg/result/processors/diff.go index a7e268b4b736..a84caf7b686a 100644 --- a/pkg/result/processors/diff.go +++ b/pkg/result/processors/diff.go @@ -10,8 +10,8 @@ import ( "github.com/golangci/revgrep" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const envGolangciDiffProcessorPatch = "GOLANGCI_DIFF_PROCESSOR_PATCH" diff --git a/pkg/result/processors/exclusion_generated_file_filter.go b/pkg/result/processors/exclusion_generated_file_filter.go index 14a3640e951c..6cbde3aedf58 100644 --- a/pkg/result/processors/exclusion_generated_file_filter.go +++ b/pkg/result/processors/exclusion_generated_file_filter.go @@ -4,9 +4,9 @@ import ( "fmt" "path/filepath" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*GeneratedFileFilter)(nil) diff --git a/pkg/result/processors/exclusion_generated_file_filter_test.go b/pkg/result/processors/exclusion_generated_file_filter_test.go index 56570bd65ad1..23fc4a3a4204 100644 --- a/pkg/result/processors/exclusion_generated_file_filter_test.go +++ b/pkg/result/processors/exclusion_generated_file_filter_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestGeneratedFileFilter_shouldPassIssue(t *testing.T) { diff --git a/pkg/result/processors/exclusion_generated_file_matcher.go b/pkg/result/processors/exclusion_generated_file_matcher.go index 170635a84b3d..763ca9e38fa0 100644 --- a/pkg/result/processors/exclusion_generated_file_matcher.go +++ b/pkg/result/processors/exclusion_generated_file_matcher.go @@ -7,8 +7,8 @@ import ( "go/token" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) // The values must be in lowercase. diff --git a/pkg/result/processors/exclusion_generated_file_matcher_test.go b/pkg/result/processors/exclusion_generated_file_matcher_test.go index 421bb63f95e3..64fb70684de7 100644 --- a/pkg/result/processors/exclusion_generated_file_matcher_test.go +++ b/pkg/result/processors/exclusion_generated_file_matcher_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/config" ) func TestGeneratedFileMatcher_isGeneratedFileLax_generated(t *testing.T) { diff --git a/pkg/result/processors/exclusion_paths.go b/pkg/result/processors/exclusion_paths.go index bd430487023f..dafad44d1d3b 100644 --- a/pkg/result/processors/exclusion_paths.go +++ b/pkg/result/processors/exclusion_paths.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*ExclusionPaths)(nil) diff --git a/pkg/result/processors/exclusion_paths_test.go b/pkg/result/processors/exclusion_paths_test.go index 1fbb94b7e2ac..44e17d207d38 100644 --- a/pkg/result/processors/exclusion_paths_test.go +++ b/pkg/result/processors/exclusion_paths_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestExclusionPaths_Process(t *testing.T) { diff --git a/pkg/result/processors/exclusion_presets.go b/pkg/result/processors/exclusion_presets.go index 4ab6c0e54d64..4c2fa4c4770a 100644 --- a/pkg/result/processors/exclusion_presets.go +++ b/pkg/result/processors/exclusion_presets.go @@ -1,6 +1,6 @@ package processors -import "github.com/golangci/golangci-lint/pkg/config" +import "github.com/golangci/golangci-lint/v2/pkg/config" var LinterExclusionPresets = map[string][]config.ExcludeRule{ config.ExclusionPresetComments: { diff --git a/pkg/result/processors/exclusion_rules.go b/pkg/result/processors/exclusion_rules.go index 7a9673ac459c..064921ae607a 100644 --- a/pkg/result/processors/exclusion_rules.go +++ b/pkg/result/processors/exclusion_rules.go @@ -5,10 +5,10 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*ExclusionRules)(nil) diff --git a/pkg/result/processors/exclusion_rules_test.go b/pkg/result/processors/exclusion_rules_test.go index 9e110536db6a..5657f45ed7a3 100644 --- a/pkg/result/processors/exclusion_rules_test.go +++ b/pkg/result/processors/exclusion_rules_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestExclusionRules_Process_multiple(t *testing.T) { diff --git a/pkg/result/processors/filename_unadjuster.go b/pkg/result/processors/filename_unadjuster.go index 5f39e064b9a3..a3cdd8e6ed7c 100644 --- a/pkg/result/processors/filename_unadjuster.go +++ b/pkg/result/processors/filename_unadjuster.go @@ -9,8 +9,8 @@ import ( "golang.org/x/tools/go/packages" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*FilenameUnadjuster)(nil) diff --git a/pkg/result/processors/fixer.go b/pkg/result/processors/fixer.go index b0e983d8d733..14dd3454eab6 100644 --- a/pkg/result/processors/fixer.go +++ b/pkg/result/processors/fixer.go @@ -13,18 +13,18 @@ import ( "os" "slices" - "github.com/golangci/golangci-lint/internal/x/tools/diff" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/goformatters/gci" - "github.com/golangci/golangci-lint/pkg/goformatters/gofmt" - "github.com/golangci/golangci-lint/pkg/goformatters/gofumpt" - "github.com/golangci/golangci-lint/pkg/goformatters/goimports" - "github.com/golangci/golangci-lint/pkg/goformatters/golines" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/golangci-lint/pkg/timeutils" + "github.com/golangci/golangci-lint/v2/internal/x/tools/diff" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gci" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofmt" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofumpt" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/goimports" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/golines" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/timeutils" ) var _ Processor = (*Fixer)(nil) diff --git a/pkg/result/processors/invalid_issue.go b/pkg/result/processors/invalid_issue.go index 042675b59e1a..a7f45d408333 100644 --- a/pkg/result/processors/invalid_issue.go +++ b/pkg/result/processors/invalid_issue.go @@ -3,8 +3,8 @@ package processors import ( "path/filepath" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*InvalidIssue)(nil) diff --git a/pkg/result/processors/invalid_issue_test.go b/pkg/result/processors/invalid_issue_test.go index 1af60cbf44c4..32628c336d31 100644 --- a/pkg/result/processors/invalid_issue_test.go +++ b/pkg/result/processors/invalid_issue_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestInvalidIssue_Process(t *testing.T) { diff --git a/pkg/result/processors/issues.go b/pkg/result/processors/issues.go index ab443b87d7d2..1e76291c77a1 100644 --- a/pkg/result/processors/issues.go +++ b/pkg/result/processors/issues.go @@ -3,7 +3,7 @@ package processors import ( "fmt" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func filterIssues(issues []result.Issue, filter func(issue *result.Issue) bool) []result.Issue { diff --git a/pkg/result/processors/max_from_linter.go b/pkg/result/processors/max_from_linter.go index ced200af722e..dec9f3e7f13a 100644 --- a/pkg/result/processors/max_from_linter.go +++ b/pkg/result/processors/max_from_linter.go @@ -1,9 +1,9 @@ package processors import ( - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*MaxFromLinter)(nil) diff --git a/pkg/result/processors/max_from_linter_test.go b/pkg/result/processors/max_from_linter_test.go index 03c49ad10018..df2b4ce9c9b3 100644 --- a/pkg/result/processors/max_from_linter_test.go +++ b/pkg/result/processors/max_from_linter_test.go @@ -3,8 +3,8 @@ package processors import ( "testing" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) func TestMaxFromLinter(t *testing.T) { diff --git a/pkg/result/processors/max_per_file_from_linter.go b/pkg/result/processors/max_per_file_from_linter.go index a5ad66d4e5af..fdb6bb0278da 100644 --- a/pkg/result/processors/max_per_file_from_linter.go +++ b/pkg/result/processors/max_per_file_from_linter.go @@ -1,13 +1,13 @@ package processors import ( - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters/gci" - "github.com/golangci/golangci-lint/pkg/goformatters/gofmt" - "github.com/golangci/golangci-lint/pkg/goformatters/gofumpt" - "github.com/golangci/golangci-lint/pkg/goformatters/goimports" - "github.com/golangci/golangci-lint/pkg/goformatters/golines" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gci" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofmt" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/gofumpt" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/goimports" + "github.com/golangci/golangci-lint/v2/pkg/goformatters/golines" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*MaxPerFileFromLinter)(nil) diff --git a/pkg/result/processors/max_per_file_from_linter_test.go b/pkg/result/processors/max_per_file_from_linter_test.go index fa0c79d91412..c5bc7ebc1e8b 100644 --- a/pkg/result/processors/max_per_file_from_linter_test.go +++ b/pkg/result/processors/max_per_file_from_linter_test.go @@ -3,8 +3,8 @@ package processors import ( "testing" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func newFromLinterIssue(linterName string) result.Issue { diff --git a/pkg/result/processors/max_same_issues.go b/pkg/result/processors/max_same_issues.go index 349f6a9afacf..06e87586e171 100644 --- a/pkg/result/processors/max_same_issues.go +++ b/pkg/result/processors/max_same_issues.go @@ -3,9 +3,9 @@ package processors import ( "sort" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*MaxSameIssues)(nil) diff --git a/pkg/result/processors/max_same_issues_test.go b/pkg/result/processors/max_same_issues_test.go index a85826f3b214..574059ebbb41 100644 --- a/pkg/result/processors/max_same_issues_test.go +++ b/pkg/result/processors/max_same_issues_test.go @@ -3,9 +3,9 @@ package processors import ( "testing" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestMaxSameIssues(t *testing.T) { diff --git a/pkg/result/processors/nolint_filter.go b/pkg/result/processors/nolint_filter.go index 99cd799954c5..96fd6403ec45 100644 --- a/pkg/result/processors/nolint_filter.go +++ b/pkg/result/processors/nolint_filter.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "github.com/golangci/golangci-lint/pkg/golinters/nolintlint" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nolintlint" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*NolintFilter)(nil) diff --git a/pkg/result/processors/nolint_filter_test.go b/pkg/result/processors/nolint_filter_test.go index 463e149a2835..852602a86ad2 100644 --- a/pkg/result/processors/nolint_filter_test.go +++ b/pkg/result/processors/nolint_filter_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/golinters/nolintlint" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/golinters/nolintlint" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func newNolintFileIssue(line int, fromLinter string) result.Issue { diff --git a/pkg/result/processors/path_absoluter.go b/pkg/result/processors/path_absoluter.go index a649716d5db5..99f3de42a2cd 100644 --- a/pkg/result/processors/path_absoluter.go +++ b/pkg/result/processors/path_absoluter.go @@ -3,8 +3,8 @@ package processors import ( "path/filepath" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*PathAbsoluter)(nil) diff --git a/pkg/result/processors/path_prettifier.go b/pkg/result/processors/path_prettifier.go index ad9a5663c3c9..31270044f1fe 100644 --- a/pkg/result/processors/path_prettifier.go +++ b/pkg/result/processors/path_prettifier.go @@ -3,8 +3,8 @@ package processors import ( "path/filepath" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*PathPrettifier)(nil) diff --git a/pkg/result/processors/path_prettifier_test.go b/pkg/result/processors/path_prettifier_test.go index 8753bf59d7ee..ddd38e49759f 100644 --- a/pkg/result/processors/path_prettifier_test.go +++ b/pkg/result/processors/path_prettifier_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func newPPIssue(fn, rp string) result.Issue { diff --git a/pkg/result/processors/path_relativity.go b/pkg/result/processors/path_relativity.go index bdaf1b98d6c0..8b2958a4a308 100644 --- a/pkg/result/processors/path_relativity.go +++ b/pkg/result/processors/path_relativity.go @@ -4,9 +4,9 @@ import ( "fmt" "path/filepath" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*PathRelativity)(nil) diff --git a/pkg/result/processors/path_shortener.go b/pkg/result/processors/path_shortener.go index 0c0288269e1a..7a14c39c972e 100644 --- a/pkg/result/processors/path_shortener.go +++ b/pkg/result/processors/path_shortener.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*PathShortener)(nil) diff --git a/pkg/result/processors/processor.go b/pkg/result/processors/processor.go index 13e63d604689..1976d6e44ad9 100644 --- a/pkg/result/processors/processor.go +++ b/pkg/result/processors/processor.go @@ -1,7 +1,7 @@ package processors import ( - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const typeCheckName = "typecheck" diff --git a/pkg/result/processors/processor_test.go b/pkg/result/processors/processor_test.go index 2e3c5a632f96..41bb78a7b3ae 100644 --- a/pkg/result/processors/processor_test.go +++ b/pkg/result/processors/processor_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) type issueTestCase struct { diff --git a/pkg/result/processors/severity.go b/pkg/result/processors/severity.go index c0514110acd6..035ca80c4e1d 100644 --- a/pkg/result/processors/severity.go +++ b/pkg/result/processors/severity.go @@ -3,10 +3,10 @@ package processors import ( "cmp" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const severityFromLinter = "@linter" diff --git a/pkg/result/processors/severity_test.go b/pkg/result/processors/severity_test.go index dcd3974fb2f7..0774f0b1d517 100644 --- a/pkg/result/processors/severity_test.go +++ b/pkg/result/processors/severity_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func TestSeverity_multiple(t *testing.T) { diff --git a/pkg/result/processors/sort_results.go b/pkg/result/processors/sort_results.go index ecadb69980fe..033eca9a4374 100644 --- a/pkg/result/processors/sort_results.go +++ b/pkg/result/processors/sort_results.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const ( diff --git a/pkg/result/processors/sort_results_test.go b/pkg/result/processors/sort_results_test.go index f63cf36078cc..fcfd824c8eb1 100644 --- a/pkg/result/processors/sort_results_test.go +++ b/pkg/result/processors/sort_results_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var issues = []result.Issue{ diff --git a/pkg/result/processors/source_code.go b/pkg/result/processors/source_code.go index 3f20b2f5600c..1096269c8176 100644 --- a/pkg/result/processors/source_code.go +++ b/pkg/result/processors/source_code.go @@ -1,9 +1,9 @@ package processors import ( - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/result" ) var _ Processor = (*SourceCode)(nil) diff --git a/pkg/result/processors/uniq_by_line.go b/pkg/result/processors/uniq_by_line.go index 729842122778..113b5814ad16 100644 --- a/pkg/result/processors/uniq_by_line.go +++ b/pkg/result/processors/uniq_by_line.go @@ -1,7 +1,7 @@ package processors import ( - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const uniqByLineLimit = 1 diff --git a/pkg/result/processors/uniq_by_line_test.go b/pkg/result/processors/uniq_by_line_test.go index a1eab557dfad..dadca6a9afa1 100644 --- a/pkg/result/processors/uniq_by_line_test.go +++ b/pkg/result/processors/uniq_by_line_test.go @@ -4,7 +4,7 @@ import ( "go/token" "testing" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) func newULIssue(file string, line int) result.Issue { diff --git a/pkg/timeutils/stopwatch.go b/pkg/timeutils/stopwatch.go index 95b16de9fc70..332c24c88a1a 100644 --- a/pkg/timeutils/stopwatch.go +++ b/pkg/timeutils/stopwatch.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) const noStagesText = "no stages" diff --git a/scripts/gen_github_action_config/go.mod b/scripts/gen_github_action_config/go.mod index 73a6e94b1613..d3da48a46556 100644 --- a/scripts/gen_github_action_config/go.mod +++ b/scripts/gen_github_action_config/go.mod @@ -1,4 +1,4 @@ -module github.com/golangci/golangci-lint/scripts/gen_github_action_config +module github.com/golangci/golangci-lint/v2/scripts/gen_github_action_config go 1.23.0 diff --git a/scripts/website/copy_jsonschema/main.go b/scripts/website/copy_jsonschema/main.go index 42e041303b42..d747bf3a6e5d 100644 --- a/scripts/website/copy_jsonschema/main.go +++ b/scripts/website/copy_jsonschema/main.go @@ -9,7 +9,7 @@ import ( hcversion "github.com/hashicorp/go-version" - "github.com/golangci/golangci-lint/scripts/website/github" + "github.com/golangci/golangci-lint/v2/scripts/website/github" ) func main() { diff --git a/scripts/website/dump_info/main.go b/scripts/website/dump_info/main.go index bb76b5b58c6d..0d27181270ea 100644 --- a/scripts/website/dump_info/main.go +++ b/scripts/website/dump_info/main.go @@ -9,12 +9,12 @@ import ( "os/exec" "path/filepath" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/goformatters" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/result/processors" - "github.com/golangci/golangci-lint/scripts/website/types" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/goformatters" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/result/processors" + "github.com/golangci/golangci-lint/v2/scripts/website/types" ) func main() { diff --git a/scripts/website/expand_templates/exclusions.go b/scripts/website/expand_templates/exclusions.go index 5804e3469908..99638b72d39a 100644 --- a/scripts/website/expand_templates/exclusions.go +++ b/scripts/website/expand_templates/exclusions.go @@ -5,7 +5,7 @@ import ( "path/filepath" "text/template" - "github.com/golangci/golangci-lint/scripts/website/types" + "github.com/golangci/golangci-lint/v2/scripts/website/types" ) const exclusionTmpl = `{{- $tick := "` + "`" + `" -}} diff --git a/scripts/website/expand_templates/linters.go b/scripts/website/expand_templates/linters.go index c9f62d410e6f..4e4c28c0505b 100644 --- a/scripts/website/expand_templates/linters.go +++ b/scripts/website/expand_templates/linters.go @@ -14,8 +14,8 @@ import ( "gopkg.in/yaml.v3" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/scripts/website/types" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/scripts/website/types" ) const listItemPrefix = "list-item-" diff --git a/scripts/website/expand_templates/main.go b/scripts/website/expand_templates/main.go index a628af832a50..474eff12ab47 100644 --- a/scripts/website/expand_templates/main.go +++ b/scripts/website/expand_templates/main.go @@ -11,8 +11,8 @@ import ( "github.com/rogpeppe/go-internal/lockedfile" - "github.com/golangci/golangci-lint/scripts/website/github" - "github.com/golangci/golangci-lint/scripts/website/types" + "github.com/golangci/golangci-lint/v2/scripts/website/github" + "github.com/golangci/golangci-lint/v2/scripts/website/types" ) func main() { diff --git a/scripts/website/expand_templates/thanks.go b/scripts/website/expand_templates/thanks.go index 50993cdff13f..c3b8c8daee72 100644 --- a/scripts/website/expand_templates/thanks.go +++ b/scripts/website/expand_templates/thanks.go @@ -6,9 +6,9 @@ import ( "slices" "strings" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/lint/linter" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" ) type authorDetails struct { diff --git a/test/bench/bench_test.go b/test/bench/bench_test.go index a315b00e82f4..18b13039a7a9 100644 --- a/test/bench/bench_test.go +++ b/test/bench/bench_test.go @@ -18,8 +18,8 @@ import ( "github.com/shirou/gopsutil/v4/process" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" ) const binName = "golangci-lint-bench" diff --git a/test/enabled_linters_test.go b/test/enabled_linters_test.go index f681a61061f6..70ad679b400b 100644 --- a/test/enabled_linters_test.go +++ b/test/enabled_linters_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/test/testshared" + "github.com/golangci/golangci-lint/v2/pkg/config" + "github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/test/testshared" ) func TestEnabledLinters(t *testing.T) { diff --git a/test/fix_test.go b/test/fix_test.go index b65d6bf8e998..74747fcb47e3 100644 --- a/test/fix_test.go +++ b/test/fix_test.go @@ -3,7 +3,7 @@ package test import ( "testing" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) func TestFix(t *testing.T) { diff --git a/test/linters_test.go b/test/linters_test.go index 2735322eeedc..33a17e4fcb0a 100644 --- a/test/linters_test.go +++ b/test/linters_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/golangci/golangci-lint/test/testshared" - "github.com/golangci/golangci-lint/test/testshared/integration" + "github.com/golangci/golangci-lint/v2/test/testshared" + "github.com/golangci/golangci-lint/v2/test/testshared/integration" ) const testdataDir = "testdata" diff --git a/test/output_test.go b/test/output_test.go index d2b98c211a1b..25ee4715a1bf 100644 --- a/test/output_test.go +++ b/test/output_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/test/testshared" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/test/testshared" ) //nolint:misspell // misspelling is intentional diff --git a/test/run_test.go b/test/run_test.go index 6f744d198f31..7356575d1168 100644 --- a/test/run_test.go +++ b/test/run_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" _ "github.com/valyala/quicktemplate" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/test/testshared" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/test/testshared" ) const minimalPkg = "minimalpkg" diff --git a/test/testdata_etc/unused_exported/main.go b/test/testdata_etc/unused_exported/main.go index 11f3357a1734..a8c07176a42b 100644 --- a/test/testdata_etc/unused_exported/main.go +++ b/test/testdata_etc/unused_exported/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/golangci/golangci-lint/test/testdata_etc/unused_exported/lib" + "github.com/golangci/golangci-lint/v2/test/testdata_etc/unused_exported/lib" ) func main() { diff --git a/test/testshared/analysis.go b/test/testshared/analysis.go index 2613843caf70..aa30b2f00958 100644 --- a/test/testshared/analysis.go +++ b/test/testshared/analysis.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/v2/pkg/result" ) const keyword = "want" diff --git a/test/testshared/directives.go b/test/testshared/directives.go index c3f97afc08e6..a30c1f18bb29 100644 --- a/test/testshared/directives.go +++ b/test/testshared/directives.go @@ -12,7 +12,7 @@ import ( hcversion "github.com/hashicorp/go-version" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) // RunContext the information extracted from directives. diff --git a/test/testshared/directives_test.go b/test/testshared/directives_test.go index 9b52ac97ac0a..88806c6e443b 100644 --- a/test/testshared/directives_test.go +++ b/test/testshared/directives_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) func TestParseTestDirectives(t *testing.T) { diff --git a/test/testshared/integration/fix.go b/test/testshared/integration/fix.go index 53a1c698c265..75275125faab 100644 --- a/test/testshared/integration/fix.go +++ b/test/testshared/integration/fix.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/test/testshared" + "github.com/golangci/golangci-lint/v2/test/testshared" ) // value: "1" diff --git a/test/testshared/integration/run.go b/test/testshared/integration/run.go index ee278cb02724..cd0b4ca97076 100644 --- a/test/testshared/integration/run.go +++ b/test/testshared/integration/run.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/test/testshared" + "github.com/golangci/golangci-lint/v2/pkg/logutils" + "github.com/golangci/golangci-lint/v2/test/testshared" ) const testdataDir = "testdata" diff --git a/test/testshared/runner.go b/test/testshared/runner.go index 72317696c6a3..846cc657e672 100644 --- a/test/testshared/runner.go +++ b/test/testshared/runner.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/golangci/golangci-lint/pkg/exitcodes" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/fsutils" + "github.com/golangci/golangci-lint/v2/pkg/logutils" ) // value: "1" diff --git a/test/testshared/runner_test.go b/test/testshared/runner_test.go index 5dcb10f26e24..f369e7eb966f 100644 --- a/test/testshared/runner_test.go +++ b/test/testshared/runner_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) func TestRunnerBuilder_Runner(t *testing.T) {