Skip to content

Commit

Permalink
chore: update dependencies (#1152)
Browse files Browse the repository at this point in the history
I used both `go get -u -v ./...` and gomajor.

I have not updated github.com/quic-go/quic-go to v0.35.1 because there
are breaking changes that require a bit more effort.

Part of ooni/probe#2417
  • Loading branch information
bassosimone authored Jun 6, 2023
1 parent 6aceca1 commit b10120c
Show file tree
Hide file tree
Showing 14 changed files with 267 additions and 211 deletions.
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/autorun/autorun.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"runtime"

"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/autorun"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/onboard"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/geoip/geoip.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package geoip
import (
"context"

"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/info/info.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package info

import (
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package list
import (
"strings"

"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/onboard/onboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/AlecAivazis/survey/v2"
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/fatih/color"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/reset/reset.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package reset
import (
"os"

"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/rm/rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/AlecAivazis/survey/v2"
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
"github.com/ooni/probe-cli/v3/internal/database"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/root/root.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package root

import (
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/log/handlers/batch"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/log/handlers/cli"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/run/run.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package run

import (
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/fatih/color"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/onboard"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/show/show.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nettest

import (
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/upload/upload.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package upload

import (
"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/cli/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version
import (
"fmt"

"github.com/alecthomas/kingpin"
"github.com/alecthomas/kingpin/v2"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
"github.com/ooni/probe-cli/v3/internal/version"
)
Expand Down
117 changes: 64 additions & 53 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ require (
git.torproject.org/pluggable-transports/snowflake.git/v2 v2.5.1
github.com/AlecAivazis/survey/v2 v2.3.6
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230418182520-830177ebde85
github.com/alecthomas/kingpin v2.2.6+incompatible
github.com/alecthomas/kingpin/v2 v2.3.2
github.com/apex/log v1.9.0
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/cloudflare/circl v1.3.3
github.com/cretz/bine v0.2.0
github.com/fatih/color v1.13.0
github.com/fatih/color v1.15.0
github.com/google/go-cmp v0.5.9
github.com/google/martian/v3 v3.3.2
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
Expand All @@ -22,62 +22,75 @@ require (
github.com/hexops/gotextdiff v1.0.3
github.com/iancoleman/strcase v0.2.0
github.com/mattn/go-colorable v0.1.13
github.com/miekg/dns v1.1.52
github.com/miekg/dns v1.1.54
github.com/mitchellh/go-wordwrap v1.0.1
github.com/montanaflynn/stats v0.7.0
github.com/montanaflynn/stats v0.7.1
github.com/ooni/go-libtor v1.1.7
github.com/ooni/netem v0.0.0-20230316075930-83d9720a67f9
github.com/ooni/netem v0.0.0-20230606061801-6bfb478aadf7
github.com/ooni/oocrypto v0.5.1
github.com/ooni/oohttp v0.6.1
github.com/ooni/probe-assets v0.17.0
github.com/pborman/getopt/v2 v2.1.0
github.com/pion/stun v0.3.5
github.com/pion/stun v0.6.0
github.com/pkg/errors v0.9.1
github.com/quic-go/quic-go v0.33.0
github.com/rogpeppe/go-internal v1.9.0
github.com/rubenv/sql-migrate v1.3.0
github.com/schollz/progressbar/v3 v3.13.0
github.com/rogpeppe/go-internal v1.10.0
github.com/rubenv/sql-migrate v1.4.0
github.com/schollz/progressbar/v3 v3.13.1
github.com/upper/db/v4 v4.6.0
gitlab.com/yawning/obfs4.git v0.0.0-20220904064028-336a71d6e4cf
gitlab.com/yawning/obfs4.git v0.0.0-20230519154740-645026c2ada4
gitlab.com/yawning/utls.git v0.0.12-1
golang.org/x/crypto v0.9.0
golang.org/x/net v0.10.0
golang.org/x/sys v0.8.0
)

require (
github.com/BurntSushi/toml v1.3.0 // indirect
github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7 // indirect
github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect
github.com/Psiphon-Labs/qtls-go1-18 v0.0.0-20221014170512-3bdc7291c091 // indirect
github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20221014165721-ed28749db082 // indirect
github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20230515185100-099bac32c181 // indirect
github.com/Psiphon-Labs/quic-go v0.0.0-20230215230806-9b1ddbf778cc // indirect
github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad // indirect
github.com/andybalholm/brotli v1.0.5-0.20220518190645-786ec621f618 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/gaukas/godicttls v0.0.3 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/klauspost/compress v1.15.14 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/onsi/ginkgo/v2 v2.7.0 // indirect
github.com/pion/transport/v2 v2.0.0 // indirect
github.com/mroth/weightedrand v1.0.0 // indirect
github.com/onsi/ginkgo/v2 v2.9.7 // indirect
github.com/pebbe/zmq4 v1.2.9 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pion/transport/v2 v2.2.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/refraction-networking/conjure v0.4.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/segmentio/fasthash v1.0.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/exp v0.0.0-20230118134722-a68e582fa157 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/time v0.3.0 // indirect
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 // indirect
)

require (
filippo.io/edwards25519 v1.0.0 // indirect
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -91,58 +104,56 @@ require (
github.com/dsnet/compress v0.0.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/protobuf v1.5.3-0.20210916003710-5d5e8c018a13 // indirect
github.com/grafov/m3u8 v0.11.1 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/golang/glog v1.1.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grafov/m3u8 v0.12.0 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/juju/ratelimit v1.0.2 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/klauspost/reedsolomon v1.11.5 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-sqlite3 v1.14.16
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/reedsolomon v1.11.7 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-sqlite3 v1.14.17
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/oschwald/maxminddb-golang v1.10.0
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/dtls/v2 v2.2.4 // indirect
github.com/pion/ice/v2 v2.2.13 // indirect
github.com/pion/interceptor v0.1.12 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pion/ice/v2 v2.3.6 // indirect
github.com/pion/interceptor v0.1.17 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.5 // indirect
github.com/pion/mdns v0.0.7 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/rtcp v1.2.10 // indirect
github.com/pion/rtp v1.7.13 // indirect
github.com/pion/sctp v1.8.6 // indirect
github.com/pion/sctp v1.8.7 // indirect
github.com/pion/sdp/v3 v3.0.6 // indirect
github.com/pion/srtp/v2 v2.0.11 // indirect
github.com/pion/transport v0.14.1 // indirect
github.com/pion/turn/v2 v2.0.9 // indirect
github.com/pion/udp v0.1.4 // indirect
github.com/pion/webrtc/v3 v3.1.50 // indirect
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/refraction-networking/gotapdance v1.3.4 // indirect
github.com/refraction-networking/utls v1.2.0 // indirect
github.com/pion/srtp/v2 v2.0.15 // indirect
github.com/pion/turn/v2 v2.1.0 // indirect
github.com/pion/webrtc/v3 v3.2.9 // indirect
github.com/prometheus/client_golang v1.15.1
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/refraction-networking/gotapdance v1.5.0 // indirect
github.com/refraction-networking/utls v1.3.2 // indirect
github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/cobra v1.6.1
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.7.0
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/templexxx/cpu v0.1.0 // indirect
github.com/templexxx/xorsimd v0.4.2 // indirect
github.com/tjfoc/gmsm v1.4.1 // indirect
github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect
github.com/xtaci/kcp-go/v5 v5.6.1 // indirect
github.com/xtaci/smux v1.5.17 // indirect
github.com/xtaci/kcp-go/v5 v5.6.2 // indirect
github.com/xtaci/smux v1.5.24 // indirect
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20220726154925-def713fd18e4 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/protobuf v1.28.2-0.20230118093459-a9481185b34d // indirect
golang.org/x/tools v0.9.3 // indirect
google.golang.org/protobuf v1.30.0 // indirect
)
Loading

0 comments on commit b10120c

Please sign in to comment.