Skip to content

Commit

Permalink
bump viper to v1.17.0 and drop unneded dep
Browse files Browse the repository at this point in the history
  • Loading branch information
alessio-perugini committed Oct 13, 2023
1 parent fd04c22 commit e8a879b
Show file tree
Hide file tree
Showing 15 changed files with 103 additions and 62 deletions.
1 change: 1 addition & 0 deletions .licensed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ reviewed:
- golang.org/x/text/encoding/internal/identifier
- golang.org/x/text/encoding/unicode
- golang.org/x/text/internal/utf8internal
- github.com/sagikazarmark/slog-shim

# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-dependencies/GPL-3.0/.licensed.yml
allowed:
Expand Down
40 changes: 40 additions & 0 deletions .licenses/go/github.com/sagikazarmark/slog-shim.dep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: github.com/sagikazarmark/slog-shim
version: v0.1.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/sagikazarmark/slog-shim
license: other
licenses:
- sources: LICENSE
text: |
Copyright (c) 2009 The Go Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- sources: README.md
text: The project is licensed under a [BSD-style license](LICENSE).
notices: []
32 changes: 0 additions & 32 deletions .licenses/go/github.com/spf13/jwalterweatherman.dep.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .licenses/go/github.com/spf13/viper.dep.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: github.com/spf13/viper
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper
Expand Down Expand Up @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
6 changes: 4 additions & 2 deletions .licenses/go/github.com/spf13/viper/internal/encoding.dep.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/dotenv
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/dotenv
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/hcl
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/hcl
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/ini
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/ini
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/javaproperties
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/javaproperties
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/json
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/json
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/toml
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/toml
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/spf13/viper/internal/encoding/yaml
version: v1.16.0
version: v1.17.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/spf13/viper/internal/encoding/yaml
license: mit
licenses:
- sources: viper@v1.16.0/LICENSE
- sources: viper@v1.17.0/LICENSE
text: |-
The MIT License (MIT)
Expand All @@ -29,4 +29,6 @@ licenses:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- sources: [email protected]/README.md
text: The project is licensed under the [MIT License](LICENSE).
notices: []
3 changes: 0 additions & 3 deletions configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
paths "github.com/arduino/go-paths-helper"
"github.com/arduino/go-win32-utils"
"github.com/spf13/cobra"
jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/viper"
)

Expand All @@ -39,8 +38,6 @@ var tr = i18n.Tr
// Please note the logging system hasn't been configured yet,
// so logging shouldn't be used here.
func Init(configFile string) *viper.Viper {
jww.SetStdoutThreshold(jww.LevelFatal)

// Create a new viper instance with default values for all the settings
settings := viper.New()
SetDefaults(settings)
Expand Down
13 changes: 9 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ require (
github.com/schollz/closestmatch v2.1.0+incompatible
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.16.0
github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
github.com/xeipuuv/gojsonschema v1.2.0
go.bug.st/cleanup v1.0.0
Expand All @@ -54,7 +53,7 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/creack/goselect v0.1.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
Expand All @@ -76,10 +75,13 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -88,7 +90,10 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
Expand Down
Loading

0 comments on commit e8a879b

Please sign in to comment.