Merge pull request #88 from Teamwork/fix/sconfig

Fix: sconfig dependency was failing
Teamwork · Mar 14, 2022 · d062f3c · arp242 · Apr 9, 2022 · rafaeljusto
2 parents b71ccf3 + 376cfa1
commit d062f3c
Show file tree

Hide file tree

Showing 27 changed files with 895 additions and 146 deletions.
diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/teamwork/kommentaar
 go 1.12
 
 require (
-	arp242.net/sconfig v0.0.0-20180901013357-c014d3b7a101
-	github.com/davecgh/go-spew v1.1.1
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/imdario/mergo v0.3.7
-	github.com/pmezard/go-difflib v1.0.0
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/teamwork/test v0.0.0-20181126061546-2ff8918eb6a4
 	github.com/teamwork/utils v0.0.0-20190114034940-d6a1f27ce92c
 	gopkg.in/yaml.v2 v2.2.2
+	zgo.at/sconfig v1.2.2-0.20211017232425-870f818a71b7
 )
diff --git a/go.sum b/go.sum
@@ -14,3 +14,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+zgo.at/sconfig v1.2.2-0.20211017232425-870f818a71b7 h1:fw2yuIGMHzSRYrZUVOt/c1O/igkJIXorj/FNCg+tg2E=
+zgo.at/sconfig v1.2.2-0.20211017232425-870f818a71b7/go.mod h1:RXEBQABoIc7RnagqaT+7BHU81g1okqSLeND/YJLZiDE=
diff --git a/kconfig/kconfig.go b/kconfig/kconfig.go
@@ -6,12 +6,12 @@ import (
 	"io"
 	"strings"
 
-	"arp242.net/sconfig"
-	_ "arp242.net/sconfig/handlers/html/template" // template.HTML handler
 	"github.com/teamwork/kommentaar/docparse"
 	"github.com/teamwork/kommentaar/html"
 	"github.com/teamwork/kommentaar/openapi2"
 	"github.com/teamwork/utils/goutil"
+	"zgo.at/sconfig"
+	_ "zgo.at/sconfig/handlers/html/template" // template.HTML handler
 )
 
 // Load the configuration.

diff --git a/vendor/arp242.net/sconfig/handlers/html/template/template.go b/vendor/arp242.net/sconfig/handlers/html/template/template.go
diff --git a/vendor/github.com/imdario/mergo/.gitignore b/vendor/github.com/imdario/mergo/.gitignore
diff --git a/vendor/github.com/imdario/mergo/.travis.yml b/vendor/github.com/imdario/mergo/.travis.yml
diff --git a/vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md b/vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md