diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 1f7b67a06..6a20e6e40 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.16 + go-version: ^1.17 id: go - name: Set up Node diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f61992e07..6d54b9ed5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -83,7 +83,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.16 + go-version: ^1.17 id: go - name: Set up Node diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 677ad0ce3..5517469c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: ^1.16 + go-version: ^1.17 id: go - name: Setup Node diff --git a/Dockerfile b/Dockerfile index fb53c07fa..308dd1134 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN make clean ui # STEP 2 build executable binary -FROM golang:1.16-alpine as builder +FROM golang:1.17-alpine as builder # Install git + SSL ca certificates. # Git is required for fetching the dependencies. diff --git a/README.md b/README.md index 41230f214..a982741c6 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ You'll find everything you need in our [documentation](https://docs.evcc.io/) (G ## Build -To build EVCC from source, [Go][2] 1.16 and [Node][3] 16 are required: +To build EVCC from source, [Go][2] 1.17 and [Node][3] 16 are required: ```sh make diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile index 24457ee1f..366a79da8 100644 --- a/docker/ci.Dockerfile +++ b/docker/ci.Dockerfile @@ -1,7 +1,7 @@ # executes binary build excluding UI # STEP 2 build executable binary -FROM golang:1.16-alpine as builder +FROM golang:1.17-alpine as builder # define RELEASE=1 to hide commit hash ARG RELEASE={{ env "RELEASE" }} diff --git a/docker/tmpl.Dockerfile b/docker/tmpl.Dockerfile index 83e31ad03..61c63e882 100644 --- a/docker/tmpl.Dockerfile +++ b/docker/tmpl.Dockerfile @@ -20,7 +20,7 @@ RUN make clean ui # STEP 2 build executable binary -FROM golang:1.16-alpine as builder +FROM golang:1.17-alpine as builder # define RELEASE=1 to hide commit hash ARG RELEASE={{ env "RELEASE" }} diff --git a/go.mod b/go.mod index 8abb3a0dd..e855d4c93 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/evcc-io/evcc -go 1.16 +go 1.17 require ( github.com/AlecAivazis/survey/v2 v2.3.2 @@ -13,13 +13,11 @@ require ( github.com/aws/aws-sdk-go v1.42.35 github.com/basgys/goxml2json v1.1.0 github.com/benbjohnson/clock v1.3.0 - github.com/bitly/go-simplejson v0.5.0 // indirect github.com/bogosj/tesla v1.0.2 github.com/cjrd/allocate v0.0.0-20191115010018-022b87fe59fc github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/containrrr/shoutrrr v0.5.2 github.com/coreos/go-oidc v2.2.1+incompatible - github.com/deepmap/oapi-codegen v1.9.0 // indirect github.com/denisbrodbeck/machineid v1.0.1 github.com/dustin/go-humanize v1.0.0 github.com/dylanmei/iso8601 v0.1.0 @@ -41,26 +39,19 @@ require ( github.com/gregdel/pushover v1.1.0 github.com/grid-x/modbus v0.0.0-20220110162222-619e2e635c62 github.com/hashicorp/go-version v1.4.0 - github.com/huandu/xstrings v1.3.2 // indirect github.com/imdario/mergo v0.3.12 github.com/influxdata/influxdb-client-go/v2 v2.6.0 - github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect github.com/itchyny/gojq v0.12.6 github.com/jeremywohl/flatten v1.0.1 github.com/jinzhu/copier v0.3.4 github.com/joeshaw/carwings v0.0.0-20220225151533-185ade10e0de github.com/jpfielding/go-http-digest v0.0.0-20211006141426-fbc93758452e github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/klauspost/compress v1.14.1 // indirect github.com/koron/go-ssdp v0.0.2 github.com/korylprince/ipnetgen v1.0.1 github.com/lorenzodonini/ocpp-go v0.15.0 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 github.com/manifoldco/promptui v0.9.0 - github.com/mattn/go-runewidth v0.0.13 // indirect - github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect - github.com/miekg/dns v1.1.45 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.3 github.com/mlnoga/rct v0.1.2-0.20211011124352-7e995f76b592 github.com/muka/go-bluetooth v0.0.0-20220219050759-674a63b8741a @@ -68,20 +59,11 @@ require ( github.com/nicksnyder/go-i18n/v2 v2.1.2 github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da github.com/olekukonko/tablewriter v0.0.5 - github.com/onsi/ginkgo v1.16.5 // indirect - github.com/onsi/gomega v1.17.0 // indirect github.com/philippseith/signalr v0.5.3-0.20211205201131-d57b5a34379a - github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.11.0 - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f - github.com/shopspring/decimal v1.3.1 // indirect github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a - github.com/sirupsen/logrus v1.8.1 // indirect github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 - github.com/smartystreets/goconvey v1.7.2 // indirect - github.com/spf13/afero v1.8.0 // indirect github.com/spf13/cobra v1.3.0 github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 @@ -92,19 +74,91 @@ require ( github.com/volkszaehler/mbmd v0.0.0-20220208145932-d2d3cba909f5 github.com/writeas/go-strip-markdown v2.0.1+incompatible gitlab.com/bboehmke/sunny v0.15.1-0.20211022160056-2fba1c86ade6 - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 - golang.org/x/tools v0.1.8 // indirect - google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0 // indirect google.golang.org/grpc v1.43.0 google.golang.org/protobuf v1.27.1 - gopkg.in/go-playground/validator.v9 v9.31.0 // indirect - gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) +require ( + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/andig/gosunspec v0.0.0-20211108155140-af2e73b86e71 // indirect + github.com/andybalholm/cascadia v1.3.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bitly/go-simplejson v0.5.0 // indirect + github.com/cenkalti/backoff v2.2.1+incompatible // indirect + github.com/cenkalti/backoff/v4 v4.1.2 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/deepmap/oapi-codegen v1.9.0 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-kit/log v0.2.0 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-playground/locales v0.14.0 // indirect + github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/huandu/xstrings v1.3.2 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect + github.com/itchyny/timefmt-go v0.1.3 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/klauspost/compress v1.14.1 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect + github.com/miekg/dns v1.1.45 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect + github.com/onsi/gomega v1.17.0 // indirect + github.com/pascaldekloe/name v1.0.1 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pquerna/cachecontrol v0.1.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/shopspring/decimal v1.3.1 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/smartystreets/goconvey v1.7.2 // indirect + github.com/spf13/afero v1.8.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/teivah/onecontext v1.3.0 // indirect + github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect + golang.org/x/mod v0.5.1 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/tools v0.1.8 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0 // indirect + gopkg.in/go-playground/validator.v9 v9.31.0 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/sourcemap.v1 v1.0.5 // indirect + gopkg.in/square/go-jose.v2 v2.6.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + nhooyr.io/websocket v1.8.7 // indirect +) + replace github.com/foogod/go-powerwall => github.com/andig/go-powerwall v0.2.1-0.20220205120646-e5220ad9a9a0