Skip to content

Commit 911a786

Browse files
author
Josh Berry
committed
Merge branch 'next-server' into main
The only semantically-notable conflicts were version bumps in `go.mod`. Everything else was cosmetic and this was otherwise a very clean merge. Closes #737.
2 parents 7d54c66 + b1ca0a2 commit 911a786

File tree

13 files changed

+1018
-160
lines changed

13 files changed

+1018
-160
lines changed

go.mod

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/temporalio/cli
22

3-
go 1.23
4-
5-
toolchain go1.23.2
3+
go 1.23.2
64

75
require (
86
github.com/alitto/pond v1.9.1
@@ -11,25 +9,25 @@ require (
119
github.com/fatih/color v1.17.0
1210
github.com/google/uuid v1.6.0
1311
github.com/mattn/go-isatty v0.0.20
14-
github.com/nexus-rpc/sdk-go v0.0.10
12+
github.com/nexus-rpc/sdk-go v0.1.0
1513
github.com/olekukonko/tablewriter v0.0.5
1614
github.com/spf13/cobra v1.8.1
1715
github.com/spf13/pflag v1.0.5
18-
github.com/stretchr/testify v1.9.0
16+
github.com/stretchr/testify v1.10.0
1917
github.com/temporalio/ui-server/v2 v2.32.0
20-
go.temporal.io/api v1.38.0
21-
go.temporal.io/sdk v1.29.1
22-
go.temporal.io/server v1.25.2
23-
google.golang.org/grpc v1.65.0
24-
google.golang.org/protobuf v1.34.2
18+
go.temporal.io/api v1.43.0
19+
go.temporal.io/sdk v1.31.0
20+
go.temporal.io/server v1.26.2
21+
google.golang.org/grpc v1.67.1
22+
google.golang.org/protobuf v1.35.1
2523
gopkg.in/yaml.v3 v3.0.1
2624
)
2725

2826
require (
2927
cloud.google.com/go v0.114.0 // indirect
3028
cloud.google.com/go/auth v0.5.0 // indirect
3129
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
32-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
30+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
3331
cloud.google.com/go/iam v1.1.8 // indirect
3432
cloud.google.com/go/storage v1.41.0 // indirect
3533
github.com/apache/thrift v0.20.0 // indirect
@@ -77,23 +75,25 @@ require (
7775
github.com/jmespath/go-jmespath v0.4.0 // indirect
7876
github.com/jmoiron/sqlx v1.3.4 // indirect
7977
github.com/josharian/intern v1.0.0 // indirect
78+
github.com/klauspost/compress v1.17.9 // indirect
8079
github.com/labstack/echo/v4 v4.9.1 // indirect
8180
github.com/labstack/gommon v0.4.0 // indirect
8281
github.com/lib/pq v1.10.9 // indirect
8382
github.com/mailru/easyjson v0.7.7 // indirect
8483
github.com/mattn/go-colorable v0.1.13 // indirect
8584
github.com/mattn/go-runewidth v0.0.15 // indirect
8685
github.com/mitchellh/mapstructure v1.5.0 // indirect
86+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8787
github.com/ncruces/go-strftime v0.1.9 // indirect
8888
github.com/olivere/elastic/v7 v7.0.32 // indirect
8989
github.com/opentracing/opentracing-go v1.2.0 // indirect
9090
github.com/pborman/uuid v1.2.1 // indirect
9191
github.com/pkg/errors v0.9.1 // indirect
9292
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
93-
github.com/prometheus/client_golang v1.19.1 // indirect
93+
github.com/prometheus/client_golang v1.20.4 // indirect
9494
github.com/prometheus/client_model v0.6.1 // indirect
95-
github.com/prometheus/common v0.53.0 // indirect
96-
github.com/prometheus/procfs v0.15.0 // indirect
95+
github.com/prometheus/common v0.60.0 // indirect
96+
github.com/prometheus/procfs v0.15.1 // indirect
9797
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
9898
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
9999
github.com/rivo/uniseg v0.4.7 // indirect
@@ -102,7 +102,7 @@ require (
102102
github.com/sirupsen/logrus v1.9.3 // indirect
103103
github.com/sony/gobreaker v1.0.0 // indirect
104104
github.com/stretchr/objx v0.5.2 // indirect
105-
github.com/temporalio/ringpop-go v0.0.0-20240718232345-e2a435d149b6 // indirect
105+
github.com/temporalio/ringpop-go v0.0.0-20241119001152-e505ebd8f887 // indirect
106106
github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb // indirect
107107
github.com/temporalio/tchannel-go v1.22.1-0.20240528171429-1db37fdea938 // indirect
108108
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -111,44 +111,45 @@ require (
111111
github.com/valyala/bytebufferpool v1.0.0 // indirect
112112
github.com/valyala/fasttemplate v1.2.1 // indirect
113113
go.opencensus.io v0.24.0 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
115115
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
116-
go.opentelemetry.io/otel v1.27.0 // indirect
117-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
120-
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
121-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
122-
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
123-
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
124-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
125-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
116+
go.opentelemetry.io/otel v1.31.0 // indirect
117+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
118+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
120+
go.opentelemetry.io/otel/exporters/prometheus v0.53.0 // indirect
121+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
122+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
123+
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
124+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
125+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
126126
go.temporal.io/version v0.3.0 // indirect
127127
go.uber.org/atomic v1.11.0 // indirect
128128
go.uber.org/dig v1.17.1 // indirect
129129
go.uber.org/fx v1.22.0 // indirect
130+
go.uber.org/mock v0.4.0 // indirect
130131
go.uber.org/multierr v1.11.0 // indirect
131132
go.uber.org/zap v1.27.0 // indirect
132133
golang.org/x/crypto v0.31.0 // indirect
133134
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
134-
golang.org/x/net v0.28.0 // indirect
135-
golang.org/x/oauth2 v0.22.0 // indirect
135+
golang.org/x/net v0.31.0 // indirect
136+
golang.org/x/oauth2 v0.23.0 // indirect
136137
golang.org/x/sync v0.10.0 // indirect
137138
golang.org/x/sys v0.28.0 // indirect
138139
golang.org/x/text v0.21.0 // indirect
139140
golang.org/x/time v0.5.0 // indirect
140141
google.golang.org/api v0.182.0 // indirect
141142
google.golang.org/genproto v0.0.0-20240528184218-531527333157 // indirect
142-
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
143+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
144+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
144145
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
145146
gopkg.in/inf.v0 v0.9.1 // indirect
146147
gopkg.in/validator.v2 v2.0.1 // indirect
147148
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
148-
modernc.org/libc v1.50.9 // indirect
149+
modernc.org/libc v1.55.3 // indirect
149150
modernc.org/mathutil v1.6.0 // indirect
150151
modernc.org/memory v1.8.0 // indirect
151-
modernc.org/sqlite v1.30.0 // indirect
152+
modernc.org/sqlite v1.34.1 // indirect
152153
modernc.org/strutil v1.2.0 // indirect
153154
modernc.org/token v1.1.0 // indirect
154155
)

0 commit comments

Comments
 (0)