Update to new spaghetti-cutter

ole108 · ole108 · commit d5e6100f27c0 · 2022-01-12T16:44:31.000+01:00
diff --git a/deps/deps.go b/deps/deps.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/flowdev/spaghetti-analyzer/analdata"
 	"github.com/flowdev/spaghetti-analyzer/x/pkgs"
+	"github.com/flowdev/spaghetti-cutter/config"
 	"github.com/flowdev/spaghetti-cutter/data"
-	"github.com/flowdev/spaghetti-cutter/x/config"
 )
 
 // Fill fills the dependency map of the given package.
diff --git a/deps/deps_test.go b/deps/deps_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/flowdev/spaghetti-analyzer/deps"
 	"github.com/flowdev/spaghetti-analyzer/parse"
 	"github.com/flowdev/spaghetti-analyzer/x/pkgs"
+	"github.com/flowdev/spaghetti-cutter/config"
 	"github.com/flowdev/spaghetti-cutter/data"
-	"github.com/flowdev/spaghetti-cutter/x/config"
 )
 
 func TestFill(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/flowdev/spaghetti-analyzer
 go 1.16
 
 require (
-	github.com/flowdev/spaghetti-cutter v0.9.7
-	github.com/hjson/hjson-go v3.0.1+incompatible // indirect
+	github.com/flowdev/spaghetti-cutter v0.9.8
 	golang.org/x/tools v0.0.0-20200417140056-c07e33ef3290
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/flowdev/spaghetti-cutter v0.9.7 h1:6ZlBNu12JniYydDWaZwKqW2Td4NUn2TLzLQDiQMMYlc=
 github.com/flowdev/spaghetti-cutter v0.9.7/go.mod h1:aj1OIpHL2KRx+eCQj8UFW4/xdtswEJuZFAmO8LS6fdo=
+github.com/flowdev/spaghetti-cutter v0.9.8 h1:sW5R1hf8QNLfSqCzhIKGTe0w22pODj94ZfoZ1Qf673g=
+github.com/flowdev/spaghetti-cutter v0.9.8/go.mod h1:aj1OIpHL2KRx+eCQj8UFW4/xdtswEJuZFAmO8LS6fdo=
 github.com/hjson/hjson-go v3.0.1+incompatible h1:JwOXblcMiBbiWue7iPkoFK9oXSnW8n+qXh/0Fio6TCo=
 github.com/hjson/hjson-go v3.0.1+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/main.go b/main.go
@@ -17,8 +17,8 @@ import (
 	"github.com/flowdev/spaghetti-analyzer/tree"
 	"github.com/flowdev/spaghetti-analyzer/x/dirs"
 	"github.com/flowdev/spaghetti-analyzer/x/pkgs"
+	"github.com/flowdev/spaghetti-cutter/config"
 	"github.com/flowdev/spaghetti-cutter/data"
-	"github.com/flowdev/spaghetti-cutter/x/config"
 )
 
 func main() {

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/flowdev/spaghetti-analyzer/analdata"`
`7`	`7`	`"github.com/flowdev/spaghetti-analyzer/x/pkgs"`
	`8`	`+ "github.com/flowdev/spaghetti-cutter/config"`
`8`	`9`	`"github.com/flowdev/spaghetti-cutter/data"`
`9`		`- "github.com/flowdev/spaghetti-cutter/x/config"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// Fill fills the dependency map of the given package.`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"github.com/flowdev/spaghetti-analyzer/deps"`
`11`	`11`	`"github.com/flowdev/spaghetti-analyzer/parse"`
`12`	`12`	`"github.com/flowdev/spaghetti-analyzer/x/pkgs"`
	`13`	`+ "github.com/flowdev/spaghetti-cutter/config"`
`13`	`14`	`"github.com/flowdev/spaghetti-cutter/data"`
`14`		`- "github.com/flowdev/spaghetti-cutter/x/config"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func TestFill(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ module github.com/flowdev/spaghetti-analyzer`
`3`	`3`	`go 1.16`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/flowdev/spaghetti-cutter v0.9.7`
`7`		`- github.com/hjson/hjson-go v3.0.1+incompatible // indirect`
	`6`	`+ github.com/flowdev/spaghetti-cutter v0.9.8`
`8`	`7`	`golang.org/x/tools v0.0.0-20200417140056-c07e33ef3290`
`9`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ import (`
`17`	`17`	`"github.com/flowdev/spaghetti-analyzer/tree"`
`18`	`18`	`"github.com/flowdev/spaghetti-analyzer/x/dirs"`
`19`	`19`	`"github.com/flowdev/spaghetti-analyzer/x/pkgs"`
	`20`	`+ "github.com/flowdev/spaghetti-cutter/config"`
`20`	`21`	`"github.com/flowdev/spaghetti-cutter/data"`
`21`		`- "github.com/flowdev/spaghetti-cutter/x/config"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func main() {`