Skip to content

Commit

Permalink
Merge pull request #88 from Teamwork/fix/sconfig
Browse files Browse the repository at this point in the history
Fix: sconfig dependency was failing
  • Loading branch information
rafaeljusto authored Mar 14, 2022
2 parents b71ccf3 + 376cfa1 commit d062f3c
Show file tree
Hide file tree
Showing 27 changed files with 895 additions and 146 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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

This comment has been minimized.

Copy link
@arp242

arp242 Apr 9, 2022

Contributor

Sorry about that; I moved it and removed the old one as I thought no one was using it except me; but I forgot that I used it here!

This comment has been minimized.

Copy link
@rafaeljusto

rafaeljusto Apr 11, 2022

Author Contributor

No worries at all 🙂

)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
4 changes: 2 additions & 2 deletions kconfig/kconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
42 changes: 0 additions & 42 deletions vendor/arp242.net/sconfig/handlers/html/template/template.go

This file was deleted.

33 changes: 33 additions & 0 deletions vendor/github.com/imdario/mergo/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/imdario/mergo/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d062f3c

Please sign in to comment.