diff --git a/go.mod b/go.mod index ca64fae33..3d992b788 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/superseriousbusiness/gotosocial go 1.23.0 -toolchain go1.23.3 +toolchain go1.24.1 // Replace go-swagger with our version that fixes (ours particularly) use of Go1.23 replace github.com/go-swagger/go-swagger => codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix @@ -82,7 +82,7 @@ require ( go.opentelemetry.io/otel/trace v1.35.0 go.uber.org/automaxprocs v1.6.0 golang.org/x/crypto v0.36.0 - golang.org/x/image v0.24.0 + golang.org/x/image v0.25.0 golang.org/x/net v0.36.0 golang.org/x/oauth2 v0.27.0 golang.org/x/sys v0.31.0 diff --git a/go.sum b/go.sum index c7af9162d..76366c0d8 100644 --- a/go.sum +++ b/go.sum @@ -533,8 +533,8 @@ golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= -golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ= -golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8= +golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= +golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= diff --git a/vendor/golang.org/x/image/webp/decode.go b/vendor/golang.org/x/image/webp/decode.go index e211c7d57..0df3c67e8 100644 --- a/vendor/golang.org/x/image/webp/decode.go +++ b/vendor/golang.org/x/image/webp/decode.go @@ -261,7 +261,7 @@ func Decode(r io.Reader) (image.Image, error) { if err != nil { return nil, err } - return m, err + return m, nil } // DecodeConfig returns the color model and dimensions of a WEBP image without diff --git a/vendor/modules.txt b/vendor/modules.txt index 4f5ca928e..8afd387a6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1086,8 +1086,8 @@ golang.org/x/exp/slices golang.org/x/exp/slog golang.org/x/exp/slog/internal golang.org/x/exp/slog/internal/buffer -# golang.org/x/image v0.24.0 -## explicit; go 1.18 +# golang.org/x/image v0.25.0 +## explicit; go 1.23.0 golang.org/x/image/riff golang.org/x/image/vp8 golang.org/x/image/vp8l