go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-02-15 13:53:35 +02:00
Code Issues Releases Activity

fix version conflict of urfave/cli (#540)

Browse Source 
Co-authored-by: chenzhihui <chenzhihui@bilibili.com>
This commit is contained in:
Tony 2020-03-30 10:31:23 +08:00 committed by GitHub
parent 6867172de7
commit 5475b62938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -46,7 +46,6 @@ require (
github.com/stretchr/testify v1.4.0 github.com/stretchr/testify v1.4.0
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
github.com/tsuna/gohbase v0.0.0-20190502052937-24ffed0537aa github.com/tsuna/gohbase v0.0.0-20190502052937-24ffed0537aa
github.com/urfave/cli v1.22.1
github.com/urfave/cli/v2 v2.1.1 github.com/urfave/cli/v2 v2.1.1
go.etcd.io/etcd v0.0.0-20190917205325-a14579fbfb1a go.etcd.io/etcd v0.0.0-20190917205325-a14579fbfb1a
go.uber.org/atomic v1.4.0 // indirect go.uber.org/atomic v1.4.0 // indirect

2
go.sum
View File

@ -285,8 +285,6 @@ github.com/tsuna/gohbase v0.0.0-20190502052937-24ffed0537aa/go.mod h1:3HfLQly3YN
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k= github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=

10
tool/kratos-protoc/main.go
View File

@ -4,7 +4,7 @@ import (
"log" "log"
"os" "os"
"github.com/urfave/cli" "github.com/urfave/cli/v2"
) )
func main() { func main() {
@ -12,22 +12,22 @@ func main() {
app.Name = "protc" app.Name = "protc"
app.Usage = "protobuf生成工具" app.Usage = "protobuf生成工具"
app.Flags = []cli.Flag{ app.Flags = []cli.Flag{
cli.BoolFlag{ &cli.BoolFlag{
Name: "bm", Name: "bm",
Usage: "whether to use BM for generation", Usage: "whether to use BM for generation",
Destination: &withBM, Destination: &withBM,
}, },
cli.BoolFlag{ &cli.BoolFlag{
Name: "grpc", Name: "grpc",
Usage: "whether to use gRPC for generation", Usage: "whether to use gRPC for generation",
Destination: &withGRPC, Destination: &withGRPC,
}, },
cli.BoolFlag{ &cli.BoolFlag{
Name: "swagger", Name: "swagger",
Usage: "whether to use swagger for generation", Usage: "whether to use swagger for generation",
Destination: &withSwagger, Destination: &withSwagger,
}, },
cli.BoolFlag{ &cli.BoolFlag{
Name: "ecode", Name: "ecode",
Usage: "whether to use ecode for generation", Usage: "whether to use ecode for generation",
Destination: &withEcode, Destination: &withEcode,

4
tool/kratos-protoc/protoc.go
View File

@ -13,7 +13,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/urfave/cli" "github.com/urfave/cli/v2"
) )
var ( var (
@ -27,7 +27,7 @@ func protocAction(ctx *cli.Context) (err error) {
if err = checkProtoc(); err != nil { if err = checkProtoc(); err != nil {
return err return err
} }
files := []string(ctx.Args()) files := ctx.Args().Slice()
if len(files) == 0 { if len(files) == 0 {
files, _ = filepath.Glob("*.proto") files, _ = filepath.Glob("*.proto")
} }