Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions commands/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package commands

import (
"github.com/sirupsen/logrus"
"github.com/voxpupuli/jig/internal/bundle"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/bundle"
"github.com/voxpupuli/jig/v2/internal/config"
)

type App struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/build"
"github.com/voxpupuli/jig/v2/internal/build"
)

func (a *App) buildCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion commands/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/scaffold"
"github.com/voxpupuli/jig/v2/internal/scaffold"
)

func (a *App) convertCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion commands/new.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"

"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/scaffold"
"github.com/voxpupuli/jig/v2/internal/scaffold"
)

func (a *App) newCmd() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions commands/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/forge"
"github.com/voxpupuli/jig/internal/release"
"github.com/voxpupuli/jig/v2/internal/forge"
"github.com/voxpupuli/jig/v2/internal/release"
)

func (a *App) releaseCmd() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions commands/renew.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/internal/scaffold"
"github.com/voxpupuli/jig/v2/internal/config"
"github.com/voxpupuli/jig/v2/internal/scaffold"
)

func (a *App) renewCmd() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions commands/renew_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

git "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/v2/internal/config"
"github.com/voxpupuli/jig/v2/internal/module"
)

// moduleTemplateRepo builds a local git repository holding a module template
Expand Down
2 changes: 1 addition & 1 deletion commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/config"
)

func Execute() error {
Expand Down
4 changes: 2 additions & 2 deletions commands/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"path/filepath"

"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/scaffold"
"github.com/voxpupuli/jig/internal/template"
"github.com/voxpupuli/jig/v2/internal/scaffold"
"github.com/voxpupuli/jig/v2/internal/template"
)

func (a *App) templatesCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion commands/templates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/config"
)

// runTemplatesResolve executes `jig templates resolve <name>` with the given
Expand Down
6 changes: 3 additions & 3 deletions commands/templatesource.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/internal/remote"
"github.com/voxpupuli/jig/v2/internal/config"
"github.com/voxpupuli/jig/v2/internal/module"
"github.com/voxpupuli/jig/v2/internal/remote"
)

// templateSource is a resolved template location: a local directory (possibly
Expand Down
4 changes: 2 additions & 2 deletions commands/templatesource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/v2/internal/config"
"github.com/voxpupuli/jig/v2/internal/module"
)

func testApp(cfg config.Config) *App {
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/voxpupuli/jig
module github.com/voxpupuli/jig/v2

go 1.25.5

Expand Down
6 changes: 3 additions & 3 deletions internal/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"path/filepath"
"strings"

"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/internal/scaffold"
"github.com/voxpupuli/jig/v2/internal/config"
"github.com/voxpupuli/jig/v2/internal/module"
"github.com/voxpupuli/jig/v2/internal/scaffold"
)

func DoBuild(dir string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/build/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"testing"

"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/config"
)

// makeBuildDir creates a minimal but realistic module directory suitable for
Expand Down
2 changes: 1 addition & 1 deletion internal/build/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

gogitignore "github.com/go-git/go-git/v5/plumbing/format/gitignore"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/config"
)

// specAllowlist is the set of files permitted in a published module per the
Expand Down
8 changes: 4 additions & 4 deletions internal/release/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"path/filepath"
"regexp"

"github.com/voxpupuli/jig/internal/build"
"github.com/voxpupuli/jig/internal/forge"
"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/internal/scaffold"
"github.com/voxpupuli/jig/v2/internal/build"
"github.com/voxpupuli/jig/v2/internal/forge"
"github.com/voxpupuli/jig/v2/internal/module"
"github.com/voxpupuli/jig/v2/internal/scaffold"
)

// Options controls the behaviour of DoRelease.
Expand Down
2 changes: 1 addition & 1 deletion internal/scaffold/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path/filepath"

"github.com/voxpupuli/jig/internal/template"
"github.com/voxpupuli/jig/v2/internal/template"
)

func ConvertModule(targetDir string) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/scaffold/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path/filepath"

"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/v2/internal/config"
"github.com/voxpupuli/jig/v2/internal/module"
)

func NewModule(opts Options) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/scaffold/module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"

"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/config"
)

func TestNewModule(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/scaffold/renew.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

gogitignore "github.com/go-git/go-git/v5/plumbing/format/gitignore"
"github.com/sergi/go-diff/diffmatchpatch"
"github.com/voxpupuli/jig/internal/config"
"github.com/voxpupuli/jig/v2/internal/config"
)

// RenewOptions controls Renew. Paths is the [renew] allowlist from jig.toml:
Expand Down
4 changes: 2 additions & 2 deletions internal/scaffold/scaffold.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

"github.com/voxpupuli/jig/internal/module"
"github.com/voxpupuli/jig/internal/template"
"github.com/voxpupuli/jig/v2/internal/module"
"github.com/voxpupuli/jig/v2/internal/template"
)

// Renderer is the interface satisfied by *template.Renderer. Declared here
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package main
import (
"os"

"github.com/voxpupuli/jig/commands"
"github.com/voxpupuli/jig/v2/commands"
)

func main() {
Expand Down