diff --git a/README.md b/README.md index 2d46990..ec9b91d 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ $> protoc --go_micro_out=debug=true,components="micro|http":. input.proto * Install the **go** compiler and tools from https://golang.org/doc/install * Install **protoc-gen-go**: `go install google.golang.org/protobuf/cmd/protoc-gen-go` -* Install **protoc-gen-go-micro**: `go install go.unistack.org/protoc-gen-go-micro/v3` +* Install **protoc-gen-go-micro**: `go install go.unistack.org/protoc-gen-go-micro/v4` diff --git a/ast.go b/ast.go index ccc7d51..6977741 100644 --- a/ast.go +++ b/ast.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/fatih/structtag" - tag_options "go.unistack.org/micro-proto/v3/tag" + tag_options "go.unistack.org/micro-proto/v4/tag" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" ) diff --git a/example/example.proto b/example/example.proto index 86f8f4b..c6f429c 100644 --- a/example/example.proto +++ b/example/example.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package example; -option go_package = "github.com/unistack-org/protoc-gen-go-micro/v3/example;examplepb"; +option go_package = "github.com/unistack-org/protoc-gen-go-micro/v4/example;examplepb"; import "tag/tag.proto"; import "api/annotations.proto"; diff --git a/generate.go b/generate.go index c87fa28..eecd79b 100644 --- a/generate.go +++ b/generate.go @@ -1,3 +1,3 @@ package main -//go:generate sh -xc "protoc -I./example -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components=graphqls,graphql_file=./schema.graphql:./example example/example.proto" +//go:generate sh -xc "protoc -I./example -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v4) --go-micro_out=components=graphqls,graphql_file=./schema.graphql:./example example/example.proto" diff --git a/go.mod b/go.mod index 015e04a..61f2cac 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.unistack.org/protoc-gen-go-micro/v3 +module go.unistack.org/protoc-gen-go-micro/v4 go 1.22.0 @@ -8,7 +8,7 @@ require ( github.com/fatih/structtag v1.2.0 github.com/jhump/protoreflect v1.17.0 github.com/vektah/gqlparser/v2 v2.5.20 - go.unistack.org/micro-proto/v3 v3.4.1 + go.unistack.org/micro-proto/v4 v4.1.0 golang.org/x/tools v0.28.0 google.golang.org/protobuf v1.35.2 ) diff --git a/go.sum b/go.sum index f4048d8..28efe2d 100644 --- a/go.sum +++ b/go.sum @@ -884,8 +884,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q= -go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo= +go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk= +go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/graphql/generator.go b/graphql/generator.go index 046ceb6..a765109 100644 --- a/graphql/generator.go +++ b/graphql/generator.go @@ -10,7 +10,7 @@ import ( "google.golang.org/protobuf/compiler/protogen" descriptor "google.golang.org/protobuf/types/descriptorpb" - gqlpb "go.unistack.org/micro-proto/v3/graphql" + gqlpb "go.unistack.org/micro-proto/v4/graphql" ) const ( diff --git a/graphql/utils.go b/graphql/utils.go index 1ef6b3c..6ef1da7 100644 --- a/graphql/utils.go +++ b/graphql/utils.go @@ -10,7 +10,7 @@ import ( descriptor "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" - gqlpb "go.unistack.org/micro-proto/v3/graphql" + gqlpb "go.unistack.org/micro-proto/v4/graphql" ) func GraphqlMethodOptions(opts proto.Message) *gqlpb.Rpc { diff --git a/graphqls.go b/graphqls.go index d0310bb..a6537b2 100644 --- a/graphqls.go +++ b/graphqls.go @@ -5,7 +5,7 @@ import ( "os" "github.com/vektah/gqlparser/v2/formatter" - generator "go.unistack.org/protoc-gen-go-micro/v3/graphql" + generator "go.unistack.org/protoc-gen-go-micro/v4/graphql" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/pluginpb" diff --git a/openapiv3.go b/openapiv3.go index f54056f..f7b6300 100644 --- a/openapiv3.go +++ b/openapiv3.go @@ -24,8 +24,8 @@ import ( "strings" "sync" - "go.unistack.org/micro-proto/v3/api" - v3 "go.unistack.org/micro-proto/v3/openapiv3" + "go.unistack.org/micro-proto/v4/api" + v3 "go.unistack.org/micro-proto/v4/openapiv3" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/openapiv3_util.go b/openapiv3_util.go index 86e8689..47e3ef6 100644 --- a/openapiv3_util.go +++ b/openapiv3_util.go @@ -1,6 +1,6 @@ package main -import v3 "go.unistack.org/micro-proto/v3/openapiv3" +import v3 "go.unistack.org/micro-proto/v4/openapiv3" func getMediaType(eopt interface{}) string { ctype := "application/json" diff --git a/tools.go b/tools.go index 30dbbba..31d986d 100644 --- a/tools.go +++ b/tools.go @@ -3,5 +3,5 @@ package tools import ( - _ "go.unistack.org/micro-proto/v3/graphql" + _ "go.unistack.org/micro-proto/v4/graphql" ) diff --git a/util.go b/util.go index 8b1788a..e04c974 100644 --- a/util.go +++ b/util.go @@ -8,9 +8,9 @@ import ( "strings" "time" - api_options "go.unistack.org/micro-proto/v3/api" - v2 "go.unistack.org/micro-proto/v3/openapiv2" - v3 "go.unistack.org/micro-proto/v3/openapiv3" + api_options "go.unistack.org/micro-proto/v4/api" + v2 "go.unistack.org/micro-proto/v4/openapiv2" + v3 "go.unistack.org/micro-proto/v4/openapiv3" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" ) diff --git a/variables.go b/variables.go index 1b562d5..11f2936 100644 --- a/variables.go +++ b/variables.go @@ -13,13 +13,13 @@ var ( gorillaMuxPackage = protogen.GoImportPath("github.com/gorilla/mux") chiPackage = protogen.GoImportPath("github.com/go-chi/chi/v5") chiMiddlewarePackage = protogen.GoImportPath("github.com/go-chi/chi/v5/middleware") - microMetadataPackage = protogen.GoImportPath("go.unistack.org/micro/v3/metadata") - microClientPackage = protogen.GoImportPath("go.unistack.org/micro/v3/client") - microServerPackage = protogen.GoImportPath("go.unistack.org/micro/v3/server") - microClientHttpPackage = protogen.GoImportPath("go.unistack.org/micro-client-http/v3") - microServerHttpPackage = protogen.GoImportPath("go.unistack.org/micro-server-http/v3") - microCodecPackage = protogen.GoImportPath("go.unistack.org/micro-proto/v3/codec") - microErrorsPackage = protogen.GoImportPath("go.unistack.org/micro/v3/errors") + microMetadataPackage = protogen.GoImportPath("go.unistack.org/micro/v4/metadata") + microClientPackage = protogen.GoImportPath("go.unistack.org/micro/v4/client") + microServerPackage = protogen.GoImportPath("go.unistack.org/micro/v4/server") + microClientHttpPackage = protogen.GoImportPath("go.unistack.org/micro-client-http/v4") + microServerHttpPackage = protogen.GoImportPath("go.unistack.org/micro-server-http/v4") + microCodecPackage = protogen.GoImportPath("go.unistack.org/micro-proto/v4/codec") + microErrorsPackage = protogen.GoImportPath("go.unistack.org/micro/v4/errors") grpcPackage = protogen.GoImportPath("google.golang.org/grpc") protojsonPackage = protogen.GoImportPath("google.golang.org/protobuf/encoding/protojson") timePackage = protogen.GoImportPath("time")