Skip to content

Commit f0578a5

Browse files
S7evinKS7evinK
authored
Update deps (#3580)
⚠ This also bumps the required go version to 1.23.0 All in one dependabot updates: #3507 #3559 #3560 #3561 #3573 #3574 #3575 #3576 #3577 #3579 ### Pull Request Checklist <!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request --> * [ ] I have added Go unit tests or [Complement integration tests](https://github.com/matrix-org/complement) for this PR _or_ I have justified why this PR doesn't need tests * [ ] Pull request includes a [sign off below](https://element-hq.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately Signed-off-by: `Your Name <[email protected]>`
1 parent 654fee9 commit f0578a5

File tree

6 files changed

+98
-94
lines changed

6 files changed

+98
-94
lines changed

‎build/scripts/Complement.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile:1.2
22

3-
FROM golang:1.22-bookworm as build
3+
FROM golang:1.23-bookworm as build
44
RUN apt-get update && apt-get install -y sqlite3
55
WORKDIR /build
66

‎build/scripts/ComplementLocal.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# Use these mounts to make use of this dockerfile:
1010
# COMPLEMENT_HOST_MOUNTS='/your/local/dendrite:/dendrite:ro;/your/go/path:/go:ro'
11-
FROM golang:1.22-bookworm
11+
FROM golang:1.23-bookworm
1212
RUN apt-get update && apt-get install -y sqlite3
1313

1414
ENV SERVER_NAME=localhost

‎build/scripts/ComplementPostgres.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile:1.2
22

3-
FROM golang:1.22-bookworm as build
3+
FROM golang:1.23-bookworm as build
44
RUN apt-get update && apt-get install -y postgresql
55
WORKDIR /build
66

‎cmd/dendrite-upgrade-tests/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var latest, _ = semver.NewVersion("v6.6.6") // Dummy version, used as "HEAD"
5555
// due to the error:
5656
// When using COPY with more than one source file, the destination must be a directory and end with a /
5757
// We need to run a postgres anyway, so use the dockerfile associated with Complement instead.
58-
const DockerfilePostgreSQL = `FROM golang:1.22-bookworm as build
58+
const DockerfilePostgreSQL = `FROM golang:1.23-bookworm as build
5959
RUN apt-get update && apt-get install -y postgresql
6060
WORKDIR /build
6161
ARG BINARY
@@ -99,7 +99,7 @@ ENV BINARY=dendrite
9999
EXPOSE 8008 8448
100100
CMD /build/run_dendrite.sh`
101101

102-
const DockerfileSQLite = `FROM golang:1.22-bookworm as build
102+
const DockerfileSQLite = `FROM golang:1.23-bookworm as build
103103
RUN apt-get update && apt-get install -y postgresql
104104
WORKDIR /build
105105
ARG BINARY

‎go.mod

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module github.com/element-hq/dendrite
22

33
require (
44
github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d
5-
github.com/DATA-DOG/go-sqlmock v1.5.0
5+
github.com/DATA-DOG/go-sqlmock v1.5.2
66
github.com/MFAshby/stdemuxerhook v1.0.0
77
github.com/Masterminds/semver/v3 v3.3.1
8-
github.com/blevesearch/bleve/v2 v2.4.4
8+
github.com/blevesearch/bleve/v2 v2.5.1
99
github.com/codeclysm/extract v2.2.0+incompatible
1010
github.com/coder/websocket v1.8.12
1111
github.com/cretz/bine v0.2.0
@@ -16,7 +16,7 @@ require (
1616
github.com/eyedeekay/onramp v0.33.8
1717
github.com/getsentry/sentry-go v0.14.0
1818
github.com/gologme/log v1.3.0
19-
github.com/google/go-cmp v0.6.0
19+
github.com/google/go-cmp v0.7.0
2020
github.com/google/uuid v1.6.0
2121
github.com/gorilla/mux v1.8.0
2222
github.com/gorilla/websocket v1.5.3
@@ -29,8 +29,8 @@ require (
2929
github.com/matrix-org/pinecone v0.11.1-0.20230810010612-ea4c33717fd7
3030
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
3131
github.com/mattn/go-sqlite3 v1.14.24
32-
github.com/nats-io/nats-server/v2 v2.10.25
33-
github.com/nats-io/nats.go v1.38.0
32+
github.com/nats-io/nats-server/v2 v2.11.3
33+
github.com/nats-io/nats.go v1.42.0
3434
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
3535
github.com/opentracing/opentracing-go v1.2.0
3636
github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -45,12 +45,12 @@ require (
4545
github.com/yggdrasil-network/yggdrasil-go v0.5.12
4646
github.com/yggdrasil-network/yggquic v0.0.0-20241212194307-0d495106021f
4747
go.uber.org/atomic v1.11.0
48-
golang.org/x/crypto v0.32.0
48+
golang.org/x/crypto v0.38.0
4949
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
5050
golang.org/x/image v0.23.0
5151
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b
52-
golang.org/x/sync v0.10.0
53-
golang.org/x/term v0.28.0
52+
golang.org/x/sync v0.14.0
53+
golang.org/x/term v0.32.0
5454
gopkg.in/yaml.v2 v2.4.0
5555
gotest.tools/v3 v3.5.1
5656
maunium.net/go/mautrix v0.15.1
@@ -61,27 +61,27 @@ require (
6161
github.com/Arceliar/ironwood v0.0.0-20241213013129-743fe2fccbd3 // indirect
6262
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
6363
github.com/Microsoft/go-winio v0.5.2 // indirect
64-
github.com/RoaringBitmap/roaring v1.9.3 // indirect
64+
github.com/RoaringBitmap/roaring/v2 v2.4.5 // indirect
6565
github.com/beorn7/perks v1.0.1 // indirect
66-
github.com/bits-and-blooms/bitset v1.13.0 // indirect
66+
github.com/bits-and-blooms/bitset v1.22.0 // indirect
6767
github.com/bits-and-blooms/bloom/v3 v3.7.0 // indirect
68-
github.com/blevesearch/bleve_index_api v1.1.12 // indirect
69-
github.com/blevesearch/geo v0.1.20 // indirect
70-
github.com/blevesearch/go-faiss v1.0.24 // indirect
68+
github.com/blevesearch/bleve_index_api v1.2.8 // indirect
69+
github.com/blevesearch/geo v0.2.3 // indirect
70+
github.com/blevesearch/go-faiss v1.0.25 // indirect
7171
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
7272
github.com/blevesearch/gtreap v0.1.1 // indirect
7373
github.com/blevesearch/mmap-go v1.0.4 // indirect
74-
github.com/blevesearch/scorch_segment_api/v2 v2.2.16 // indirect
74+
github.com/blevesearch/scorch_segment_api/v2 v2.3.10 // indirect
7575
github.com/blevesearch/segment v0.9.1 // indirect
7676
github.com/blevesearch/snowballstem v0.9.0 // indirect
7777
github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
78-
github.com/blevesearch/vellum v1.0.10 // indirect
79-
github.com/blevesearch/zapx/v11 v11.3.10 // indirect
80-
github.com/blevesearch/zapx/v12 v12.3.10 // indirect
81-
github.com/blevesearch/zapx/v13 v13.3.10 // indirect
82-
github.com/blevesearch/zapx/v14 v14.3.10 // indirect
83-
github.com/blevesearch/zapx/v15 v15.3.16 // indirect
84-
github.com/blevesearch/zapx/v16 v16.1.9-0.20241217210638-a0519e7caf3b // indirect
78+
github.com/blevesearch/vellum v1.1.0 // indirect
79+
github.com/blevesearch/zapx/v11 v11.4.2 // indirect
80+
github.com/blevesearch/zapx/v12 v12.4.2 // indirect
81+
github.com/blevesearch/zapx/v13 v13.4.2 // indirect
82+
github.com/blevesearch/zapx/v14 v14.4.2 // indirect
83+
github.com/blevesearch/zapx/v15 v15.4.2 // indirect
84+
github.com/blevesearch/zapx/v16 v16.2.3 // indirect
8585
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8686
github.com/containerd/log v0.1.0 // indirect
8787
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -95,15 +95,15 @@ require (
9595
github.com/go-logr/stdr v1.2.2 // indirect
9696
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
9797
github.com/gogo/protobuf v1.3.2 // indirect
98-
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
9998
github.com/golang/protobuf v1.5.3 // indirect
10099
github.com/golang/snappy v0.0.4 // indirect
100+
github.com/google/go-tpm v0.9.3 // indirect
101101
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
102102
github.com/h2non/filetype v1.1.3 // indirect
103103
github.com/hjson/hjson-go/v4 v4.4.0 // indirect
104104
github.com/json-iterator/go v1.1.12 // indirect
105105
github.com/juju/errors v1.0.0 // indirect
106-
github.com/klauspost/compress v1.17.11 // indirect
106+
github.com/klauspost/compress v1.18.0 // indirect
107107
github.com/mattn/go-colorable v0.1.13 // indirect
108108
github.com/mattn/go-isatty v0.0.20 // indirect
109109
github.com/minio/highwayhash v1.0.3 // indirect
@@ -114,8 +114,8 @@ require (
114114
github.com/morikuni/aec v1.0.0 // indirect
115115
github.com/mschoch/smat v0.2.0 // indirect
116116
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
117-
github.com/nats-io/jwt/v2 v2.7.3 // indirect
118-
github.com/nats-io/nkeys v0.4.9 // indirect
117+
github.com/nats-io/jwt/v2 v2.7.4 // indirect
118+
github.com/nats-io/nkeys v0.4.11 // indirect
119119
github.com/nats-io/nuid v1.0.1 // indirect
120120
github.com/ncruces/go-strftime v0.1.9 // indirect
121121
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
@@ -132,7 +132,7 @@ require (
132132
github.com/tidwall/match v1.1.1 // indirect
133133
github.com/tidwall/pretty v1.2.1 // indirect
134134
github.com/wlynxg/anet v0.0.5 // indirect
135-
go.etcd.io/bbolt v1.3.7 // indirect
135+
go.etcd.io/bbolt v1.4.0 // indirect
136136
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
137137
go.opentelemetry.io/otel v1.32.0 // indirect
138138
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
@@ -142,9 +142,9 @@ require (
142142
go.uber.org/mock v0.4.0 // indirect
143143
golang.org/x/mod v0.19.0 // indirect
144144
golang.org/x/net v0.33.0 // indirect
145-
golang.org/x/sys v0.29.0 // indirect
146-
golang.org/x/text v0.21.0 // indirect
147-
golang.org/x/time v0.9.0 // indirect
145+
golang.org/x/sys v0.33.0 // indirect
146+
golang.org/x/text v0.25.0 // indirect
147+
golang.org/x/time v0.11.0 // indirect
148148
golang.org/x/tools v0.23.0 // indirect
149149
google.golang.org/protobuf v1.35.1 // indirect
150150
gopkg.in/macaroon.v2 v2.1.0 // indirect
@@ -156,6 +156,6 @@ require (
156156
nhooyr.io/websocket v1.8.7 // indirect
157157
)
158158

159-
go 1.22
159+
go 1.23.0
160160

161-
toolchain go1.23.2
161+
toolchain go1.24.3

0 commit comments

Comments
 (0)