From 043d771c0908cb1bd5c774345e5f84fb31361cd3 Mon Sep 17 00:00:00 2001 From: monirzadeh <25131576+Monirzadeh@users.noreply.github.com> Date: Sat, 16 Sep 2023 16:46:47 +0330 Subject: [PATCH] just use one dependency for uuid --- go.mod | 2 +- go.sum | 4 ++-- internal/config/config.go | 2 +- internal/http/routes/legacy.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 2a0fd70f9..f24ebb7bc 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/go-shiori/go-readability v0.0.0-20230421032831-c66949dfc0ad github.com/go-shiori/warc v0.0.0-20200621032813-359908319d1d github.com/go-sql-driver/mysql v1.7.1 - github.com/gofrs/uuid v4.4.0+incompatible + github.com/gofrs/uuid/v5 v5.0.0 github.com/golang-jwt/jwt/v5 v5.0.0 github.com/golang-migrate/migrate/v4 v4.16.2 github.com/jmoiron/sqlx v1.3.5 diff --git a/go.sum b/go.sum index c64f3ef16..0b1e1a612 100644 --- a/go.sum +++ b/go.sum @@ -97,8 +97,8 @@ github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= -github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M= +github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs= diff --git a/internal/config/config.go b/internal/config/config.go index 4e8abef13..ca46a6d4b 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/sethvargo/go-envconfig" "github.com/sirupsen/logrus" ) diff --git a/internal/http/routes/legacy.go b/internal/http/routes/legacy.go index 2ee379e9d..863f1b0e3 100644 --- a/internal/http/routes/legacy.go +++ b/internal/http/routes/legacy.go @@ -8,7 +8,7 @@ import ( "github.com/go-shiori/shiori/internal/config" "github.com/go-shiori/shiori/internal/model" "github.com/go-shiori/shiori/internal/webserver" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/julienschmidt/httprouter" "github.com/pkg/errors" "github.com/sirupsen/logrus"