Enable protoc-gen-connect-go usage with editions

Signed-off-by: John Chadwick <[email protected]>
connectrpc · Jun 24, 2024 · 381e5d4 · 381e5d4
1 parent e87d966
commit 381e5d4
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/cmd/protoc-gen-connect-go/main.go b/cmd/protoc-gen-connect-go/main.go
@@ -91,7 +91,9 @@ func main() {
 	}
 	protogen.Options{}.Run(
 		func(plugin *protogen.Plugin) error {
-			plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
+			plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL) | uint64(pluginpb.CodeGeneratorResponse_FEATURE_SUPPORTS_EDITIONS)
+			plugin.SupportedEditionsMinimum = descriptorpb.Edition_EDITION_PROTO2
+			plugin.SupportedEditionsMaximum = descriptorpb.Edition_EDITION_2023
 			for _, file := range plugin.Files {
 				if file.Generate {
 					generate(plugin, file)

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ retract (
 require (
 	github.com/google/go-cmp v0.5.9
 	golang.org/x/net v0.23.0
-	google.golang.org/protobuf v1.33.0
+	google.golang.org/protobuf v1.34.2
 )
 
 require golang.org/x/text v0.14.0 // indirect
diff --git a/go.sum b/go.sum
@@ -6,3 +6,5 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
diff --git a/internal/gen/connect/collide/v1/collide.pb.go b/internal/gen/connect/collide/v1/collide.pb.go
diff --git a/internal/gen/connect/import/v1/import.pb.go b/internal/gen/connect/import/v1/import.pb.go
diff --git a/internal/gen/connect/ping/v1/ping.pb.go b/internal/gen/connect/ping/v1/ping.pb.go
diff --git a/internal/gen/connectext/grpc/status/v1/status.pb.go b/internal/gen/connectext/grpc/status/v1/status.pb.go