Skip to content

Commit

Permalink
Merge pull request #34 from go-micro/dev
Browse files Browse the repository at this point in the history
fix: fixing incompatiable plugin versions
  • Loading branch information
xpunch authored Jul 24, 2022
2 parents c18f38a + 46d32dc commit f83e40d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
10 changes: 8 additions & 2 deletions scripts/fmt.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
#!/bin/bash -ex

for d in $(find * -name 'go.mod'); do
version=$1

if [ "x$version" = "x" ]; then
version='*'
fi

for d in $(find $version -name 'go.mod'); do
pushd $(dirname $d)
go fmt
# go mod tidy
go mod tidy
popd
done
5 changes: 2 additions & 3 deletions v4/broker/segmentio/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/go-micro/plugins/v4/broker/segmentio
go 1.17

require (
github.com/go-micro/plugins/v4/broker/kafka v1.0.0
github.com/go-micro/plugins/v4/codec/segmentio v1.0.0
github.com/go-micro/plugins/v4/broker/kafka v1.1.0
github.com/go-micro/plugins/v4/codec/segmentio v1.1.0
github.com/google/uuid v1.2.0
github.com/segmentio/kafka-go v0.4.31
go-micro.dev/v4 v4.8.0
Expand Down Expand Up @@ -61,7 +61,6 @@ require (
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace (
Expand Down
4 changes: 2 additions & 2 deletions v4/server/grpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/go-micro/plugins/v4/server/grpc
go 1.17

require (
github.com/go-micro/plugins/v4/client/grpc v1.0.0
github.com/go-micro/plugins/v4/transport/grpc v1.0.0
github.com/go-micro/plugins/v4/client/grpc v1.1.0
github.com/go-micro/plugins/v4/transport/grpc v1.1.0
github.com/golang/protobuf v1.5.2
go-micro.dev/v4 v4.8.0
golang.org/x/net v0.0.0-20211020060615-d418f374d309
Expand Down
1 change: 0 additions & 1 deletion v4/store/redis/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ func (r *rkv) configure() error {
if r.Client != nil {
r.Client.Close()
}

r.Client = redis.NewClient(redisOptions)

return nil
Expand Down

0 comments on commit f83e40d

Please sign in to comment.