Skip to content

Commit

Permalink
Moved lib to root
Browse files Browse the repository at this point in the history
  • Loading branch information
@aquilax
aquilax committed Apr 7, 2022
1 parent 24f1388 commit 6437578
Show file tree
Hide file tree
Showing 27 changed files with 28 additions and 108 deletions.
6 changes: 0 additions & 6 deletions cmd/hranoprovod-cli/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ module github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3
go 1.17

require (
github.com/aquilax/hranoprovod-cli/lib/filter/v3 v3.0.0
github.com/aquilax/hranoprovod-cli/lib/parser/v3 v3.0.0
github.com/aquilax/hranoprovod-cli/lib/resolver/v3 v3.0.0
github.com/aquilax/hranoprovod-cli/v3 v3.0.0
github.com/stretchr/testify v1.7.1
github.com/tj/go-naturaldate v1.3.0
Expand All @@ -24,6 +21,3 @@ require (
)

replace github.com/aquilax/hranoprovod-cli/v3 => ../../
replace github.com/aquilax/hranoprovod-cli/lib/parser/v3 => ../../lib/parser
replace github.com/aquilax/hranoprovod-cli/lib/filter/v3 => ../../lib/filter
replace github.com/aquilax/hranoprovod-cli/lib/resolver/v3 => ../../lib/resolver
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/balance/balance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/csv/csv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/hranoprovod-cli/internal/lint/lint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"time"

"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/tj/go-naturaldate"
"github.com/urfave/cli/v2"
gcfg "gopkg.in/gcfg.v1"
Expand Down
4 changes: 2 additions & 2 deletions cmd/hranoprovod-cli/internal/print/print.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/register/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/report/report.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/hranoprovod-cli/internal/stats/stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/summary/summary.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/hranoprovod-cli/internal/utils/hranoprovod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"time"

"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter"
"github.com/aquilax/hranoprovod-cli/lib/filter/v3"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
shared "github.com/aquilax/hranoprovod-cli/v3"
"github.com/aquilax/hranoprovod-cli/v3/filter"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
)

type ResolvedCallback = func(nl shared.DBNodeMap) error
Expand Down
4 changes: 2 additions & 2 deletions cmd/hranoprovod-cli/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/report"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/stats"
"github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/summary"
"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/lib/resolver/v3"
"github.com/aquilax/hranoprovod-cli/v3/parser"
"github.com/aquilax/hranoprovod-cli/v3/resolver"
"github.com/urfave/cli/v2"
)

Expand Down
0 lib/filter/filter.go → filter/filter.go
View file
File renamed without changes.
3 changes: 0 additions & 3 deletions go.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@ go 1.17
use (
./
./cmd/hranoprovod-cli
./lib/filter
./lib/resolver
./lib/parser
)
7 changes: 0 additions & 7 deletions lib/filter/go.mod
View file

This file was deleted.

10 changes: 0 additions & 10 deletions lib/filter/go.sum
View file

This file was deleted.

16 changes: 0 additions & 16 deletions lib/parser/go.mod
View file

This file was deleted.

11 changes: 0 additions & 11 deletions lib/parser/go.sum
View file

This file was deleted.

16 changes: 0 additions & 16 deletions lib/resolver/go.mod
View file

This file was deleted.

11 changes: 0 additions & 11 deletions lib/resolver/go.sum
View file

This file was deleted.

0 lib/parser/errors.go → parser/errors.go
View file
File renamed without changes.
0 lib/parser/errors_test.go → parser/errors_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/parser/example_test.go → parser/example_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/aquilax/hranoprovod-cli/lib/parser/v3"
"github.com/aquilax/hranoprovod-cli/v3/parser"
)

func ExampleParser_ParseStream() {
Expand Down
0 lib/parser/parser.go → parser/parser.go
View file
File renamed without changes.
0 lib/parser/parser_test.go → parser/parser_test.go
View file
File renamed without changes.
0 lib/resolver/resolver.go → resolver/resolver.go
View file
File renamed without changes.
0 lib/resolver/resolver_test.go → resolver/resolver_test.go
View file
File renamed without changes.

0 comments on commit 6437578

Please sign in to comment.