Skip to content

Commit 8ae0bdc

Browse files
authored
Merge branch 'main' into peterguy/support-http_proxy
2 parents 614796e + 78c41d4 commit 8ae0bdc

File tree

4 files changed

+62
-65
lines changed

4 files changed

+62
-65
lines changed

go.mod

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/sourcegraph/src-cli
22

3-
go 1.25.1
3+
go 1.25.8
44

55
require (
66
cloud.google.com/go/storage v1.50.0
@@ -31,7 +31,7 @@ require (
3131
github.com/stretchr/testify v1.11.1
3232
github.com/tliron/glsp v0.2.2
3333
github.com/zalando/go-keyring v0.2.6
34-
golang.org/x/sync v0.18.0
34+
golang.org/x/sync v0.19.0
3535
google.golang.org/api v0.256.0
3636
google.golang.org/protobuf v1.36.10
3737
gopkg.in/yaml.v3 v3.0.1
@@ -43,11 +43,11 @@ require (
4343

4444
require (
4545
al.essio.dev/pkg/shellescape v1.5.1 // indirect
46-
cel.dev/expr v0.24.0 // indirect
46+
cel.dev/expr v0.25.1 // indirect
4747
cloud.google.com/go/auth v0.17.0 // indirect
4848
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
4949
cloud.google.com/go/monitoring v1.24.2 // indirect
50-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
50+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
5151
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
5252
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
5353
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
@@ -59,12 +59,12 @@ require (
5959
github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
6060
github.com/charmbracelet/x/term v0.2.1 // indirect
6161
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
62-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
62+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
6363
github.com/danieljoos/wincred v1.2.2 // indirect
64-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
64+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
6565
github.com/felixge/httpsnoop v1.0.4 // indirect
6666
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
67-
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
67+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
6868
github.com/go-logr/stdr v1.2.2 // indirect
6969
github.com/godbus/dbus/v5 v5.1.0 // indirect
7070
github.com/google/gnostic-models v0.6.9 // indirect
@@ -80,25 +80,24 @@ require (
8080
github.com/segmentio/ksuid v1.0.4 // indirect
8181
github.com/sourcegraph/beaut v0.0.0-20240611013027-627e4c25335a // indirect
8282
github.com/sourcegraph/jsonrpc2 v0.2.0 // indirect
83-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
83+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
8484
github.com/tliron/commonlog v0.2.19 // indirect
8585
github.com/tliron/kutil v0.3.27 // indirect
8686
github.com/x448/float16 v0.8.4 // indirect
8787
github.com/xlab/treeprint v1.2.0 // indirect
8888
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
89-
github.com/zeebo/errs v1.4.0 // indirect
9089
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
91-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
90+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
9291
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
9392
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
9493
go.opentelemetry.io/otel v1.40.0 // indirect
9594
go.opentelemetry.io/otel/metric v1.40.0 // indirect
9695
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
9796
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
9897
go.opentelemetry.io/otel/trace v1.40.0 // indirect
99-
golang.org/x/net v0.47.0 // indirect
100-
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
101-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
98+
golang.org/x/net v0.48.0 // indirect
99+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
102101
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
103102
sigs.k8s.io/randfill v1.0.0 // indirect
104103
)
@@ -129,7 +128,7 @@ require (
129128
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
130129
github.com/dlclark/regexp2 v1.11.0 // indirect
131130
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
132-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
131+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
133132
github.com/fatih/color v1.18.0 // indirect
134133
github.com/getsentry/sentry-go v0.27.0 // indirect
135134
github.com/ghodss/yaml v1.0.0 // indirect
@@ -179,16 +178,16 @@ require (
179178
go.uber.org/atomic v1.11.0 // indirect
180179
go.uber.org/multierr v1.11.0 // indirect
181180
go.uber.org/zap v1.24.0 // indirect
182-
golang.org/x/crypto v0.45.0 // indirect
183-
golang.org/x/mod v0.29.0 // indirect
184-
golang.org/x/oauth2 v0.33.0 // indirect
181+
golang.org/x/crypto v0.46.0 // indirect
182+
golang.org/x/mod v0.30.0 // indirect
183+
golang.org/x/oauth2 v0.34.0 // indirect
185184
golang.org/x/sys v0.41.0 // indirect
186-
golang.org/x/term v0.37.0 // indirect
187-
golang.org/x/text v0.31.0 // indirect
185+
golang.org/x/term v0.38.0 // indirect
186+
golang.org/x/text v0.32.0 // indirect
188187
golang.org/x/time v0.14.0 // indirect
189-
golang.org/x/tools v0.38.0 // indirect
188+
golang.org/x/tools v0.39.0 // indirect
190189
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
191-
google.golang.org/grpc v1.76.0 // indirect
190+
google.golang.org/grpc v1.79.3 // indirect
192191
gopkg.in/inf.v0 v0.9.1 // indirect; direct
193192
gopkg.in/yaml.v2 v2.4.0 // indirect
194193
k8s.io/klog/v2 v2.130.1 // indirect

0 commit comments

Comments
 (0)