Skip to content

Commit

Permalink
fix: set go module to v2
Browse files Browse the repository at this point in the history
Closes #475

Signed-off-by: Brian McGee <[email protected]>
  • Loading branch information
brianmcgee committed Nov 9, 2024
1 parent cab1a29 commit a0be22d
Show file tree
Hide file tree
Showing 21 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ builds:
- env:
- CGO_ENABLED=0
ldflags:
- -s -w -X github.com/numtide/treefmt/build.Version=v{{.Version}}
- -s -w -X github.com/numtide/treefmt/v2/build.Version=v{{.Version}}
goos:
- linux
- darwin
Expand Down
10 changes: 5 additions & 5 deletions cmd/format/format.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"time"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/format"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/walk/cache"
"github.com/numtide/treefmt/v2/config"
"github.com/numtide/treefmt/v2/format"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/walk"
"github.com/numtide/treefmt/v2/walk/cache"
"github.com/spf13/cobra"
"github.com/spf13/viper"
bolt "go.etcd.io/bbolt"
Expand Down
10 changes: 5 additions & 5 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"path/filepath"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/build"
"github.com/numtide/treefmt/cmd/format"
_init "github.com/numtide/treefmt/cmd/init"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/v2/build"
"github.com/numtide/treefmt/v2/cmd/format"
_init "github.com/numtide/treefmt/v2/cmd/init"
"github.com/numtide/treefmt/v2/config"
"github.com/numtide/treefmt/v2/stats"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
14 changes: 7 additions & 7 deletions cmd/root_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"time"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/cmd"
formatCmd "github.com/numtide/treefmt/cmd/format"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/format"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/test"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/cmd"
formatCmd "github.com/numtide/treefmt/v2/cmd/format"
"github.com/numtide/treefmt/v2/config"
"github.com/numtide/treefmt/v2/format"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/test"
"github.com/numtide/treefmt/v2/walk"
cp "github.com/otiai10/copy"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"

"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/walk"
"github.com/spf13/pflag"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/BurntSushi/toml"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/v2/config"
"github.com/spf13/pflag"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions format/composite.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/charmbracelet/log"
"github.com/gobwas/glob"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/config"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/walk"
"mvdan.cc/sh/v3/expand"
)

Expand Down
4 changes: 2 additions & 2 deletions format/formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/charmbracelet/log"
"github.com/gobwas/glob"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/config"
"github.com/numtide/treefmt/v2/walk"
"mvdan.cc/sh/v3/expand"
"mvdan.cc/sh/v3/interp"
)
Expand Down
6 changes: 3 additions & 3 deletions format/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"
"time"

"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/test"
"github.com/numtide/treefmt/v2/config"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/test"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions format/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"time"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/walk"
"golang.org/x/sync/errgroup"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/numtide/treefmt
module github.com/numtide/treefmt/v2

go 1.22

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/numtide/treefmt/cmd"
"github.com/numtide/treefmt/v2/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions nix/packages/treefmt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ in
ldflags = [
"-s"
"-w"
"-X github.com/numtide/treefmt/build.Name=${pname}"
"-X github.com/numtide/treefmt/build.Version=v${version}"
"-X github.com/numtide/treefmt/v2/build.Name=${pname}"
"-X github.com/numtide/treefmt/v2/build.Version=v${version}"
];

nativeBuildInputs =
Expand Down
2 changes: 1 addition & 1 deletion test/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/numtide/treefmt/config"
"github.com/numtide/treefmt/v2/config"
cp "github.com/otiai10/copy"
"github.com/stretchr/testify/require"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion walk/cached.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"runtime"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/walk/cache"
"github.com/numtide/treefmt/v2/walk/cache"
bolt "go.etcd.io/bbolt"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion walk/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/v2/stats"
"golang.org/x/sync/errgroup"
)

Expand Down
6 changes: 3 additions & 3 deletions walk/filesystem_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"
"time"

"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/test"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/test"
"github.com/numtide/treefmt/v2/walk"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion walk/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/charmbracelet/log"
"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/v2/stats"
"golang.org/x/sync/errgroup"
)

Expand Down
6 changes: 3 additions & 3 deletions walk/git_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/test"
"github.com/numtide/treefmt/walk"
"github.com/numtide/treefmt/v2/stats"
"github.com/numtide/treefmt/v2/test"
"github.com/numtide/treefmt/v2/walk"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion walk/stdin.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"path/filepath"

"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/v2/stats"
)

type StdinReader struct {
Expand Down
2 changes: 1 addition & 1 deletion walk/walk.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"
"path/filepath"

"github.com/numtide/treefmt/stats"
"github.com/numtide/treefmt/v2/stats"
bolt "go.etcd.io/bbolt"
)

Expand Down

0 comments on commit a0be22d

Please sign in to comment.