From c949b9f2d137f37c8c93c916caacb182e6070e90 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 9 Sep 2025 16:12:29 +0200 Subject: [chore] update dependencies (#4423) - codeberg.org/gruf/go-ffmpreg: v0.6.10 -> v0.6.11 - github.com/spf13/cast: v1.9.2 -> v1.10.0 - github.com/spf13/viper: v1.20.1 -> v1.21.0 - golang.org/x/crypto: v0.41.0 -> v0.42.0 - golang.org/x/image: v0.30.0 -> v0.31.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4423 Co-authored-by: kim Co-committed-by: kim --- .../sourcegraph/conc/internal/multierror/multierror_go119.go | 10 ---------- .../sourcegraph/conc/internal/multierror/multierror_go120.go | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go delete mode 100644 vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go (limited to 'vendor/github.com/sourcegraph/conc/internal') diff --git a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go deleted file mode 100644 index 7087e32a8..000000000 --- a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build !go1.20 -// +build !go1.20 - -package multierror - -import "go.uber.org/multierr" - -var ( - Join = multierr.Combine -) diff --git a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go deleted file mode 100644 index 39cff829a..000000000 --- a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build go1.20 -// +build go1.20 - -package multierror - -import "errors" - -var ( - Join = errors.Join -) -- cgit v1.2.3