Skip to content

Commit

Permalink
chore: upgrade dependencies (zeromicro#1444)
Browse files Browse the repository at this point in the history
* chore: upgrade dependencies

* ci: upgrade go to 1.15
  • Loading branch information
kevwan authored Jan 14, 2022
1 parent b9b80c0 commit 468c237
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.14
go-version: ^1.15
id: go

- name: Check out code into the Go module directory
Expand Down
39 changes: 22 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,40 +1,34 @@
module github.com/zeromicro/go-zero

go 1.14
go 1.15

require (
github.com/ClickHouse/clickhouse-go v1.5.1
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/alicebob/miniredis/v2 v2.16.0
github.com/fatih/color v1.9.0 // indirect
github.com/alicebob/miniredis/v2 v2.17.0
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
github.com/go-redis/redis v6.15.9+incompatible
github.com/go-sql-driver/mysql v1.6.0
github.com/golang-jwt/jwt v3.2.1+incompatible
github.com/golang-jwt/jwt/v4 v4.2.0
github.com/golang/mock v1.6.0
github.com/google/uuid v1.3.0
github.com/justinas/alice v1.2.0
github.com/lib/pq v1.10.3
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/lib/pq v1.10.4
github.com/olekukonko/tablewriter v0.0.5
github.com/openzipkin/zipkin-go v0.3.0 // indirect
github.com/prometheus/client_golang v1.11.0
github.com/spaolacci/murmur3 v1.1.0
github.com/stretchr/testify v1.7.0
go.etcd.io/etcd/api/v3 v3.5.1
go.etcd.io/etcd/client/v3 v3.5.1
go.opentelemetry.io/otel v1.1.0
go.opentelemetry.io/otel/exporters/jaeger v1.1.0
go.opentelemetry.io/otel/exporters/zipkin v1.1.0
go.opentelemetry.io/otel/sdk v1.1.0
go.opentelemetry.io/otel/trace v1.1.0
go.opentelemetry.io/otel v1.3.0
go.opentelemetry.io/otel/exporters/jaeger v1.3.0
go.opentelemetry.io/otel/exporters/zipkin v1.3.0
go.opentelemetry.io/otel/sdk v1.3.0
go.opentelemetry.io/otel/trace v1.3.0
go.uber.org/automaxprocs v1.4.0
go.uber.org/goleak v1.1.12
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sys v0.0.0-20211106132015-ebca88c72f68 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/genproto v0.0.0-20210928142010-c7af6a1a74c9 // indirect
google.golang.org/grpc v1.42.0
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
gopkg.in/cheggaaa/pb.v1 v1.0.28
gopkg.in/h2non/gock.v1 v1.1.2
Expand All @@ -44,3 +38,14 @@ require (
k8s.io/client-go v0.20.12
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)

require (
github.com/fatih/color v1.10.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/openzipkin/zipkin-go v0.4.0 // indirect
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
google.golang.org/genproto v0.0.0-20220112215332-a9c7c0acf9f2 // indirect
k8s.io/klog/v2 v2.40.1 // indirect
)
99 changes: 48 additions & 51 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rest/handler/authhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/http/httputil"

"github.com/golang-jwt/jwt"
"github.com/golang-jwt/jwt/v4"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/rest/token"
)
Expand Down
2 changes: 1 addition & 1 deletion rest/handler/authhandler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/golang-jwt/jwt"
"github.com/golang-jwt/jwt/v4"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions rest/token/tokenparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sync/atomic"
"time"

"github.com/golang-jwt/jwt"
"github.com/golang-jwt/jwt/request"
"github.com/golang-jwt/jwt/v4"
"github.com/golang-jwt/jwt/v4/request"
"github.com/zeromicro/go-zero/core/timex"
)

Expand Down
2 changes: 1 addition & 1 deletion rest/token/tokenparser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/golang-jwt/jwt"
"github.com/golang-jwt/jwt/v4"
"github.com/stretchr/testify/assert"
"github.com/zeromicro/go-zero/core/timex"
)
Expand Down

0 comments on commit 468c237

Please sign in to comment.