diff --git a/gitcmds/dev.go b/gitcmds/dev.go index 5fe345c..9978418 100644 --- a/gitcmds/dev.go +++ b/gitcmds/dev.go @@ -13,8 +13,8 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) // CreateDevBranch creates dev branch and pushes it to origin diff --git a/gitcmds/download.go b/gitcmds/download.go index 596f0d7..2317d0e 100644 --- a/gitcmds/download.go +++ b/gitcmds/download.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) // Download sources from git repo diff --git a/gitcmds/fork.go b/gitcmds/fork.go index ba96ec8..13b4dcc 100644 --- a/gitcmds/fork.go +++ b/gitcmds/fork.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) // Fork repo diff --git a/gitcmds/gitcmds.go b/gitcmds/gitcmds.go index 6a02144..fe1ca48 100644 --- a/gitcmds/gitcmds.go +++ b/gitcmds/gitcmds.go @@ -10,10 +10,10 @@ import ( goGitPkg "github.com/go-git/go-git/v5" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/internal/jira" notesPkg "github.com/untillpro/qs/internal/notes" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) const ( diff --git a/gitcmds/github.go b/gitcmds/github.go index b4a5d8b..8c753a3 100644 --- a/gitcmds/github.go +++ b/gitcmds/github.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) // LinkBranchToGithubIssue links an existing remote branch to a GitHub issue and prepares notes. diff --git a/gitcmds/hook.go b/gitcmds/hook.go index 942c647..aa47de3 100644 --- a/gitcmds/hook.go +++ b/gitcmds/hook.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" ) // SetLocalPreCommitHook - s.e. diff --git a/gitcmds/notes.go b/gitcmds/notes.go index 8ba3ca5..f42fd3e 100644 --- a/gitcmds/notes.go +++ b/gitcmds/notes.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" ) func AddNotes(wd string, notes []string) error { diff --git a/gitcmds/pr.go b/gitcmds/pr.go index 7fbd81a..0b56a04 100644 --- a/gitcmds/pr.go +++ b/gitcmds/pr.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" notesPkg "github.com/untillpro/qs/internal/notes" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) func Pr(wd string, needDraft bool) error { diff --git a/gitcmds/status.go b/gitcmds/status.go index ce38ae1..0abde43 100644 --- a/gitcmds/status.go +++ b/gitcmds/status.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" ) // Status shows git repo status diff --git a/gitcmds/upload.go b/gitcmds/upload.go index 07b8364..2352974 100644 --- a/gitcmds/upload.go +++ b/gitcmds/upload.go @@ -12,8 +12,8 @@ import ( "github.com/spf13/cobra" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) // Upload uploads sources to git repo diff --git a/go.mod b/go.mod index 9b5e464..43be1c4 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.11.1 github.com/untillpro/goutils v0.0.0-20231201170327-3c33c6010100 + github.com/voedger/voedger v1.202405300917.1 golang.org/x/mod v0.33.0 ) diff --git a/go.sum b/go.sum index 05f7fcf..0d3f544 100644 --- a/go.sum +++ b/go.sum @@ -90,6 +90,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/untillpro/goutils v0.0.0-20231201170327-3c33c6010100 h1:FHcCDVOkPwZBul+sWI3cIpRpVKlwUGYyKT544XGmxkM= github.com/untillpro/goutils v0.0.0-20231201170327-3c33c6010100/go.mod h1:D7adcEUMVzLXEjHhqZX5ss22BXJyXP3RLhJO99r8dII= +github.com/voedger/voedger v1.202405300917.1 h1:6kkNSA8hJxp1EO/lK6TM/zp9ggVhdQc/xpQt3M3SVrU= +github.com/voedger/voedger v1.202405300917.1/go.mod h1:4J0xgQCIso/XNccuxcWkqEg3r7yw3ZThKUICKP+JWyA= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= diff --git a/internal/cmdproc/cmdproc.go b/internal/cmdproc/cmdproc.go index e519834..f591cff 100644 --- a/internal/cmdproc/cmdproc.go +++ b/internal/cmdproc/cmdproc.go @@ -11,10 +11,10 @@ import ( "sync" "github.com/spf13/cobra" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/gitcmds" "github.com/untillpro/qs/internal/commands" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) func updateCmd(_ context.Context, params *qsGlobalParams) *cobra.Command { diff --git a/internal/commands/dev.go b/internal/commands/dev.go index 5125a9e..4b521cd 100644 --- a/internal/commands/dev.go +++ b/internal/commands/dev.go @@ -10,12 +10,12 @@ import ( "github.com/atotto/clipboard" "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/gitcmds" "github.com/untillpro/qs/internal/issue" "github.com/untillpro/qs/internal/jira" "github.com/untillpro/qs/internal/notes" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) func Dev(cmd *cobra.Command, wd string, doDelete bool, ignoreHook bool, args []string) error { diff --git a/internal/commands/fork.go b/internal/commands/fork.go index dd4ca7e..4ca918b 100644 --- a/internal/commands/fork.go +++ b/internal/commands/fork.go @@ -3,8 +3,8 @@ package commands import ( "fmt" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/gitcmds" + "github.com/voedger/voedger/pkg/goutils/logger" ) func Fork(wd string) error { diff --git a/internal/commands/r.go b/internal/commands/r.go index 6091dea..4cff5ef 100644 --- a/internal/commands/r.go +++ b/internal/commands/r.go @@ -12,8 +12,8 @@ import ( "time" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) /* diff --git a/internal/commands/u.go b/internal/commands/u.go index 01dff5f..9833f7b 100644 --- a/internal/commands/u.go +++ b/internal/commands/u.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/gitcmds" notesPkg "github.com/untillpro/qs/internal/notes" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) func U(cmd *cobra.Command, commitMessage string, wd string) error { diff --git a/internal/commands/version.go b/internal/commands/version.go index c40f7ab..e19c8d4 100644 --- a/internal/commands/version.go +++ b/internal/commands/version.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" "golang.org/x/mod/semver" ) diff --git a/internal/issue/issue.go b/internal/issue/issue.go index 9e76dfe..b7126fc 100644 --- a/internal/issue/issue.go +++ b/internal/issue/issue.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/internal/jira" "github.com/untillpro/qs/internal/notes" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) type IssueType int diff --git a/internal/notes/notes.go b/internal/notes/notes.go index eee5a10..f9e0b8f 100644 --- a/internal/notes/notes.go +++ b/internal/notes/notes.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" ) // current version of the Notes struct diff --git a/internal/systrun/impl.go b/internal/systrun/impl.go index 98ea093..6aa7a6f 100644 --- a/internal/systrun/impl.go +++ b/internal/systrun/impl.go @@ -23,11 +23,11 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/google/uuid" goUtilsExec "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/gitcmds" "github.com/untillpro/qs/internal/commands" "github.com/untillpro/qs/internal/jira" "github.com/untillpro/qs/utils" + "github.com/voedger/voedger/pkg/goutils/logger" ) // checkPrerequisites ensures all required tools are available diff --git a/qs.go b/qs.go index 4016fd2..3eca3a2 100644 --- a/qs.go +++ b/qs.go @@ -4,8 +4,8 @@ import ( "context" "os" - "github.com/untillpro/goutils/logger" "github.com/untillpro/qs/internal/cmdproc" + "github.com/voedger/voedger/pkg/goutils/logger" ) func main() { diff --git a/utils/retry.go b/utils/retry.go index ff86414..3c8f0ed 100644 --- a/utils/retry.go +++ b/utils/retry.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" ) // RetryConfig holds configuration for retry operations diff --git a/utils/utils.go b/utils/utils.go index eb838f7..df46bc0 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -15,7 +15,7 @@ import ( "time" "github.com/untillpro/goutils/exec" - "github.com/untillpro/goutils/logger" + "github.com/voedger/voedger/pkg/goutils/logger" ) // GetUserEmail - github user email