From 8fc8af418bab6142b246c3abb69041941e8abc0c Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 30 Apr 2023 11:03:28 +0300 Subject: [PATCH] move to micro v4 Signed-off-by: Vasiliy Tolstov --- codec_test.go | 2 +- go.mod | 10 +++------- go.sum | 18 ++++++------------ jsonpb.go | 8 ++++---- options.go | 2 +- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/codec_test.go b/codec_test.go index 86bc568..0fb6188 100644 --- a/codec_test.go +++ b/codec_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v4/codec" ) func TestFrame(t *testing.T) { diff --git a/go.mod b/go.mod index 3666473..db300a1 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,9 @@ -module go.unistack.org/micro-codec-jsonpb/v3 +module go.unistack.org/micro-codec-jsonpb/v4 go 1.19 require ( - go.unistack.org/micro/v3 v3.10.14 + go.unistack.org/micro-proto/v4 v4.0.0 + go.unistack.org/micro/v4 v4.0.1 google.golang.org/protobuf v1.28.1 ) - -require ( - github.com/google/go-cmp v0.5.7 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect -) diff --git a/go.sum b/go.sum index f213052..8870644 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,12 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE= -go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q= +go.unistack.org/micro-proto/v4 v4.0.0 h1:+TAwKSlx48eLsNO2E2cO0JLE8we1KU2AuWe9Q310FuU= +go.unistack.org/micro-proto/v4 v4.0.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec= +go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo= +go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/jsonpb.go b/jsonpb.go index 72d4a56..8a01b3d 100644 --- a/jsonpb.go +++ b/jsonpb.go @@ -1,12 +1,12 @@ // Package jsonpb provides a json codec -package jsonpb // import "go.unistack.org/micro-codec-jsonpb/v3" +package jsonpb // import "go.unistack.org/micro-codec-jsonpb/v4" import ( "io" - pb "go.unistack.org/micro-proto/v3/codec" - "go.unistack.org/micro/v3/codec" - rutil "go.unistack.org/micro/v3/util/reflect" + pb "go.unistack.org/micro-proto/v4/codec" + "go.unistack.org/micro/v4/codec" + rutil "go.unistack.org/micro/v4/util/reflect" jsonpb "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" ) diff --git a/options.go b/options.go index 44e544e..3515473 100644 --- a/options.go +++ b/options.go @@ -1,7 +1,7 @@ package jsonpb import ( - codec "go.unistack.org/micro/v3/codec" + codec "go.unistack.org/micro/v4/codec" jsonpb "google.golang.org/protobuf/encoding/protojson" ) -- 2.45.2