Skip to content

Commit

Permalink
change go package version from v3 to v4
Browse files Browse the repository at this point in the history
Change the version specifier in the baur import path from v3 to v4.
  • Loading branch information
fho committed Jun 10, 2024
1 parent 51ff1c8 commit 51eeaa8
Show file tree
Hide file tree
Showing 112 changed files with 284 additions and 284 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ linters:

linters-settings:
goimports:
local-prefixes: github.com/simplesurance/baur/v3
local-prefixes: github.com/simplesurance/baur/v4
godox:
keywords:
- FIXME
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ builds:
flags:
- -trimpath
ldflags:
- "-X github.com/simplesurance/baur/v3/internal/version.GitCommit={{ .FullCommit }}"
- "-X github.com/simplesurance/baur/v4/internal/version.GitCommit={{ .FullCommit }}"
goos:
- linux
- windows
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT_COMMIT := $(shell git rev-parse HEAD)
GIT_DIRTY := $(if $(shell git diff-files),wip)
LDFLAGS := "-X github.com/simplesurance/baur/v3/internal/version.GitCommit=$(GIT_COMMIT) \
-X github.com/simplesurance/baur/v3/internal/version.Appendix=$(GIT_DIRTY)"
LDFLAGS := "-X github.com/simplesurance/baur/v4/internal/version.GitCommit=$(GIT_COMMIT) \
-X github.com/simplesurance/baur/v4/internal/version.Appendix=$(GIT_DIRTY)"
BUILDFLAGS := -trimpath -ldflags=$(LDFLAGS)
export GO111MODULE=on
export GOFLAGS=-mod=vendor
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ After downloading the release archive, extract the `baur` binary
You can build and install the latest version from the main branch by running:

```sh
go install github.com/simplesurance/baur/v3/...@main
go install github.com/simplesurance/baur/v4/...@main
```

### Setup
Expand Down
2 changes: 1 addition & 1 deletion cmd/baur/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/simplesurance/baur/v3/internal/command"
import "github.com/simplesurance/baur/v4/internal/command"

func main() {
command.Execute()
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/simplesurance/baur/v3
module github.com/simplesurance/baur/v4

go 1.22.4

Expand Down
14 changes: 7 additions & 7 deletions internal/command/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/exec"
"github.com/simplesurance/baur/v3/internal/testutils/dbtest"
"github.com/simplesurance/baur/v3/internal/testutils/gittest"
"github.com/simplesurance/baur/v3/internal/testutils/ostest"
"github.com/simplesurance/baur/v3/internal/testutils/repotest"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/exec"
"github.com/simplesurance/baur/v4/internal/testutils/dbtest"
"github.com/simplesurance/baur/v4/internal/testutils/gittest"
"github.com/simplesurance/baur/v4/internal/testutils/ostest"
"github.com/simplesurance/baur/v4/internal/testutils/repotest"
"github.com/simplesurance/baur/v4/pkg/baur"
)

func runInitDb(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/log"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v4/internal/log"
"github.com/simplesurance/baur/v4/pkg/baur"
)

func mockGitCommitID() (string, error) {
Expand Down
14 changes: 7 additions & 7 deletions internal/command/diff_inputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/format/csv"
"github.com/simplesurance/baur/v3/internal/format/table"
"github.com/simplesurance/baur/v3/internal/vcs/git"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/format/csv"
"github.com/simplesurance/baur/v4/internal/format/table"
"github.com/simplesurance/baur/v4/internal/vcs/git"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/storage"
)

type diffInputArgDetails struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/diff_inputs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/simplesurance/baur/v3/internal/testutils/repotest"
"github.com/simplesurance/baur/v4/internal/testutils/repotest"
)

var appOneName = "app-one"
Expand Down
2 changes: 1 addition & 1 deletion internal/command/flag/buildstatus.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/baur"
)

// Valid commandline values
Expand Down
2 changes: 1 addition & 1 deletion internal/command/flag/oneof.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"unicode"

"github.com/simplesurance/baur/v3/internal/set"
"github.com/simplesurance/baur/v4/internal/set"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/command/flag/sort.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/pkg/storage"
)

// Sort is a commandline flag to specify via which field and in which order
Expand Down
24 changes: 12 additions & 12 deletions internal/command/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import (
"os"
"path/filepath"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/format/csv"
"github.com/simplesurance/baur/v3/internal/format/json"
"github.com/simplesurance/baur/v3/internal/format/table"
"github.com/simplesurance/baur/v3/internal/log"
"github.com/simplesurance/baur/v3/internal/prettyprint"
"github.com/simplesurance/baur/v3/internal/vcs/git"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/cfg"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v3/pkg/storage/postgres"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/format/csv"
"github.com/simplesurance/baur/v4/internal/format/json"
"github.com/simplesurance/baur/v4/internal/format/table"
"github.com/simplesurance/baur/v4/internal/log"
"github.com/simplesurance/baur/v4/internal/prettyprint"
"github.com/simplesurance/baur/v4/internal/vcs/git"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/cfg"
"github.com/simplesurance/baur/v4/pkg/storage"
"github.com/simplesurance/baur/v4/pkg/storage/postgres"
)

type Formatter interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v4/internal/command/term"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/command/init_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/cfg"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/cfg"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/init_bashcomp.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/fs"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/fs"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/command/init_db.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/storage"
)

const initDbExample = `
Expand Down
4 changes: 2 additions & 2 deletions internal/command/init_fishcomp.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/fs"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/fs"
)

type initFishCompCmd struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/init_include.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/pkg/cfg"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/pkg/cfg"
)

func init() {
Expand Down
6 changes: 3 additions & 3 deletions internal/command/init_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/cfg"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/cfg"
)

func init() {
Expand Down
6 changes: 3 additions & 3 deletions internal/command/ls_apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/pkg/baur"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/command/ls_apps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"path/filepath"
"testing"

"github.com/simplesurance/baur/v3/internal/testutils/gittest"
"github.com/simplesurance/baur/v3/internal/testutils/ostest"
"github.com/simplesurance/baur/v4/internal/testutils/gittest"
"github.com/simplesurance/baur/v4/internal/testutils/ostest"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
10 changes: 5 additions & 5 deletions internal/command/ls_inputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/format/csv"
"github.com/simplesurance/baur/v3/internal/format/table"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/format/csv"
"github.com/simplesurance/baur/v4/internal/format/table"
"github.com/simplesurance/baur/v4/pkg/baur"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/ls_inputs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/simplesurance/baur/v3/internal/testutils/repotest"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v4/internal/testutils/repotest"
"github.com/simplesurance/baur/v4/pkg/baur"
)

func TestLsInputsTaskAndRunInputsAreTheSame(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions internal/command/ls_outputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/log"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/log"
"github.com/simplesurance/baur/v4/pkg/storage"
)

type lsOutputsCmd struct {
Expand Down
10 changes: 5 additions & 5 deletions internal/command/ls_runs.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/flag"
"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/format/csv"
"github.com/simplesurance/baur/v3/internal/format/table"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/internal/command/flag"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/format/csv"
"github.com/simplesurance/baur/v4/internal/format/table"
"github.com/simplesurance/baur/v4/pkg/storage"
)

const lsRunsLongHelp = `
Expand Down
2 changes: 1 addition & 1 deletion internal/command/ls_runs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/simplesurance/baur/v3/internal/testutils/repotest"
"github.com/simplesurance/baur/v4/internal/testutils/repotest"
)

func TestLsRunsHasInput(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions internal/command/release_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"os"
"strings"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/log"
"github.com/simplesurance/baur/v3/internal/validation"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/log"
"github.com/simplesurance/baur/v4/internal/validation"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/storage"

"github.com/spf13/cobra"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/command/release_download.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/spf13/cobra"

"github.com/simplesurance/baur/v3/internal/command/term"
"github.com/simplesurance/baur/v3/internal/log"
"github.com/simplesurance/baur/v3/internal/output/s3"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/storage"
"github.com/simplesurance/baur/v4/internal/command/term"
"github.com/simplesurance/baur/v4/internal/log"
"github.com/simplesurance/baur/v4/internal/output/s3"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/storage"
)

var releaseDownloadLongHelp = fmt.Sprintf(`
Expand Down
10 changes: 5 additions & 5 deletions internal/command/release_download_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"path/filepath"
"testing"

"github.com/simplesurance/baur/v3/internal/testutils/fstest"
"github.com/simplesurance/baur/v3/internal/testutils/repotest"
"github.com/simplesurance/baur/v3/internal/testutils/s3test"
"github.com/simplesurance/baur/v3/pkg/baur"
"github.com/simplesurance/baur/v3/pkg/cfg"
"github.com/simplesurance/baur/v4/internal/testutils/fstest"
"github.com/simplesurance/baur/v4/internal/testutils/repotest"
"github.com/simplesurance/baur/v4/internal/testutils/s3test"
"github.com/simplesurance/baur/v4/pkg/baur"
"github.com/simplesurance/baur/v4/pkg/cfg"

"github.com/stretchr/testify/require"
)
Expand Down
Loading

0 comments on commit 51eeaa8

Please sign in to comment.