chore: Use open sourced xmltree

microfast-ch · Apr 19, 2022 · 81d7cd7 · 81d7cd7
1 parent f0a6d13
commit 81d7cd7
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 342 deletions.
diff --git a/go.mod b/go.mod
@@ -9,6 +9,7 @@ require (
 
 require (
 	github.com/Shopify/goluago v0.0.0-20210621135517-fe0528d0b204 // indirect
+	github.com/djboris9/xmltree v0.0.0-20220419153310-7195f31abe9c // indirect
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -8,6 +8,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/djboris9/xmltree v0.0.0-20220419153310-7195f31abe9c h1:CjiSCEVpooDh3Tz9ts2uLLVBRnCqztvTUW0XMCaTJb4=
+github.com/djboris9/xmltree v0.0.0-20220419153310-7195f31abe9c/go.mod h1:km5TB248zqH9KjrGFnrQM9efnseM1rqpRrB+DBrhzQk=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=

diff --git a/internal/writer/writer.go b/internal/writer/writer.go
@@ -9,7 +9,7 @@ import (
 	"github.com/djboris9/rea/internal/utils"
 	"github.com/djboris9/rea/pkg/document"
 	"github.com/djboris9/rea/pkg/engine"
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 )
 
 // Opens, reads and return the content.xml as XML node.

diff --git a/pkg/bundle/bundle.go b/pkg/bundle/bundle.go
@@ -9,7 +9,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 )
 
 type Writer struct {

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Shopify/go-lua"
 	"github.com/djboris9/rea/internal/safelua"
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 	"golang.org/x/exp/slices"
 
 	goluagoUtil "github.com/Shopify/goluago/util"

diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 )

diff --git a/pkg/engine/luatree.go b/pkg/engine/luatree.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/djboris9/rea/internal/utils"
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 )
 
 var ErrLuaTree = errors.New("luaTreeErr")

diff --git a/pkg/engine/luatree_test.go b/pkg/engine/luatree_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"testing"
 
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/pkg/engine/marshaler_test.go b/pkg/engine/marshaler_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/djboris9/rea/pkg/xmltree"
+	"github.com/djboris9/xmltree"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/pkg/xmltree/xmltree.go b/pkg/xmltree/xmltree.go