all: change module to google.golang.org/protobuf
Temporarily remove go.mod, since we can't generate an accurate one until
the corresponding v1 change is submitted.
Change-Id: I1e1ad97f2b455e33f61ffaeb8676289795e47e72
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177000
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/cmd/protoc-gen-go-grpc/internal_gengogrpc/grpc.go b/cmd/protoc-gen-go-grpc/internal_gengogrpc/grpc.go
index 3610c89..fd14a31 100644
--- a/cmd/protoc-gen-go-grpc/internal_gengogrpc/grpc.go
+++ b/cmd/protoc-gen-go-grpc/internal_gengogrpc/grpc.go
@@ -10,9 +10,9 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/protogen"
+ "google.golang.org/protobuf/protogen"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
const (
diff --git a/cmd/protoc-gen-go-grpc/main.go b/cmd/protoc-gen-go-grpc/main.go
index 27cd75d..0d47c14 100644
--- a/cmd/protoc-gen-go-grpc/main.go
+++ b/cmd/protoc-gen-go-grpc/main.go
@@ -7,8 +7,8 @@
package main
import (
- "github.com/golang/protobuf/v2/cmd/protoc-gen-go-grpc/internal_gengogrpc"
- "github.com/golang/protobuf/v2/protogen"
+ "google.golang.org/protobuf/cmd/protoc-gen-go-grpc/internal_gengogrpc"
+ "google.golang.org/protobuf/protogen"
)
func main() {
diff --git a/cmd/protoc-gen-go-grpc/testdata/gen_test.go b/cmd/protoc-gen-go-grpc/testdata/gen_test.go
index ddef9ef..80b3ba9 100644
--- a/cmd/protoc-gen-go-grpc/testdata/gen_test.go
+++ b/cmd/protoc-gen-go-grpc/testdata/gen_test.go
@@ -7,5 +7,5 @@
package main
import (
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go-grpc/testdata/grpc"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go-grpc/testdata/grpc"
)
diff --git a/cmd/protoc-gen-go-grpc/testdata/go.mod b/cmd/protoc-gen-go-grpc/testdata/go.mod
index c1b303f..e7ac436 100644
--- a/cmd/protoc-gen-go-grpc/testdata/go.mod
+++ b/cmd/protoc-gen-go-grpc/testdata/go.mod
@@ -1,9 +1,9 @@
-module github.com/golang/protobuf/v2/cmd/protoc-gen-go-grpc/testdata
+module google.golang.org/protobuf/cmd/protoc-gen-go-grpc/testdata
require (
github.com/golang/protobuf v1.2.1-0.20190509013249-911a20d79252
- github.com/golang/protobuf/v2 v2.0.0
google.golang.org/grpc v1.19.0
+ google.golang.org/protobuf v1.0.0
)
-replace github.com/golang/protobuf/v2 => ../../..
+replace google.golang.org/protobuf => ../../..
diff --git a/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.pb.go b/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.pb.go
index 396e85c..249fb88 100644
--- a/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.pb.go
+++ b/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.pb.go
@@ -4,9 +4,9 @@
package grpc
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -25,12 +25,12 @@
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x71, 0x75,
0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
- 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x1a, 0x03, 0x88, 0x02, 0x01, 0x42, 0x3f, 0x5a, 0x3d,
- 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e,
- 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d,
- 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f,
- 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x1a, 0x03, 0x88, 0x02, 0x01, 0x42, 0x3c, 0x5a, 0x3a,
+ 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72,
+ 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73,
+ 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.proto b/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.proto
index 4441010..1215670 100644
--- a/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.proto
+++ b/cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.proto
@@ -8,7 +8,7 @@
import "grpc/grpc.proto";
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/grpc";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/grpc";
service DeprecatedService {
option deprecated = true;
diff --git a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
index 778b0eb..aa87796 100644
--- a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
+++ b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
@@ -4,10 +4,10 @@
package grpc
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -98,12 +98,11 @@
0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52,
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x73,
- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74,
- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73,
- 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x33,
+ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x3c, 0x5a, 0x3a, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
+ 0x74, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.proto b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.proto
index 36d61ce..1ea2862 100644
--- a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.proto
+++ b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.proto
@@ -6,7 +6,7 @@
package goproto.protoc.grpc;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/grpc";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/grpc";
message Request {}
message Response {}
diff --git a/cmd/protoc-gen-go/annotation_test.go b/cmd/protoc-gen-go/annotation_test.go
index beecdfe..cc81d58 100644
--- a/cmd/protoc-gen-go/annotation_test.go
+++ b/cmd/protoc-gen-go/annotation_test.go
@@ -10,10 +10,10 @@
"testing"
"github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/internal/fieldnum"
- "github.com/golang/protobuf/v2/internal/scalar"
+ "google.golang.org/protobuf/internal/fieldnum"
+ "google.golang.org/protobuf/internal/scalar"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
func TestAnnotations(t *testing.T) {
diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go
index cedda8b..801590b 100644
--- a/cmd/protoc-gen-go/internal_gengo/main.go
+++ b/cmd/protoc-gen-go/internal_gengo/main.go
@@ -16,12 +16,12 @@
"unicode"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/tag"
- "github.com/golang/protobuf/v2/internal/fieldnum"
- "github.com/golang/protobuf/v2/protogen"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/tag"
+ "google.golang.org/protobuf/internal/fieldnum"
+ "google.golang.org/protobuf/protogen"
+ "google.golang.org/protobuf/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
// minimumVersion is minimum version of the v2 proto package that is required.
@@ -44,10 +44,10 @@
const (
syncPackage = protogen.GoImportPath("sync")
mathPackage = protogen.GoImportPath("math")
- protoifacePackage = protogen.GoImportPath("github.com/golang/protobuf/v2/runtime/protoiface")
- protoimplPackage = protogen.GoImportPath("github.com/golang/protobuf/v2/runtime/protoimpl")
- protoreflectPackage = protogen.GoImportPath("github.com/golang/protobuf/v2/reflect/protoreflect")
- protoregistryPackage = protogen.GoImportPath("github.com/golang/protobuf/v2/reflect/protoregistry")
+ protoifacePackage = protogen.GoImportPath("google.golang.org/protobuf/runtime/protoiface")
+ protoimplPackage = protogen.GoImportPath("google.golang.org/protobuf/runtime/protoimpl")
+ protoreflectPackage = protogen.GoImportPath("google.golang.org/protobuf/reflect/protoreflect")
+ protoregistryPackage = protogen.GoImportPath("google.golang.org/protobuf/reflect/protoregistry")
)
type fileInfo struct {
diff --git a/cmd/protoc-gen-go/internal_gengo/reflect.go b/cmd/protoc-gen-go/internal_gengo/reflect.go
index 8d13d34..e0a2eb7 100644
--- a/cmd/protoc-gen-go/internal_gengo/reflect.go
+++ b/cmd/protoc-gen-go/internal_gengo/reflect.go
@@ -10,11 +10,11 @@
"strings"
"unicode/utf8"
- "github.com/golang/protobuf/v2/proto"
- "github.com/golang/protobuf/v2/protogen"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/proto"
+ "google.golang.org/protobuf/protogen"
+ "google.golang.org/protobuf/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
// TODO: Add support for proto options.
diff --git a/cmd/protoc-gen-go/main.go b/cmd/protoc-gen-go/main.go
index b55d642..3b8179d 100644
--- a/cmd/protoc-gen-go/main.go
+++ b/cmd/protoc-gen-go/main.go
@@ -10,8 +10,8 @@
"errors"
"flag"
- gengo "github.com/golang/protobuf/v2/cmd/protoc-gen-go/internal_gengo"
- "github.com/golang/protobuf/v2/protogen"
+ gengo "google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo"
+ "google.golang.org/protobuf/protogen"
)
func main() {
diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
index d7333a8..d92d2a7 100644
--- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
+++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
@@ -4,10 +4,10 @@
package annotations
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -119,11 +119,11 @@
0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x54, 0x65, 0x73, 0x74, 0x45, 0x6e, 0x75, 0x6d,
0x12, 0x1f, 0x0a, 0x1b, 0x41, 0x4e, 0x4e, 0x4f, 0x54, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f,
0x54, 0x45, 0x53, 0x54, 0x5f, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10,
- 0x00, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
- 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
- 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65,
- 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x6e,
- 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+ 0x00, 0x42, 0x43, 0x5a, 0x41, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61,
+ 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
+ 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67,
+ 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
index d120c9d..d48142a 100644
--- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
+++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
@@ -1 +1 @@
-annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:461 end:480} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:497 end:544} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1925 end:1947} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1958 end:1978} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2999 end:3022}
\ No newline at end of file
+annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:449 end:468} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:485 end:532} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1913 end:1935} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1946 end:1966} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2987 end:3010}
\ No newline at end of file
diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.proto b/cmd/protoc-gen-go/testdata/annotations/annotations.proto
index 39b79d3..acd7b86 100644
--- a/cmd/protoc-gen-go/testdata/annotations/annotations.proto
+++ b/cmd/protoc-gen-go/testdata/annotations/annotations.proto
@@ -6,7 +6,7 @@
package goproto.protoc.annotations;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/annotations";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/annotations";
message AnnotationsTestMessage {
optional string AnnotationsTestField = 1;
diff --git a/cmd/protoc-gen-go/testdata/comments/comments.pb.go b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
index 340d9e4..49483ae 100644
--- a/cmd/protoc-gen-go/testdata/comments/comments.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
@@ -6,10 +6,10 @@
package comments
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -256,11 +256,11 @@
0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x42, 0x42, 0x09, 0x0a, 0x07, 0x4f, 0x6e,
0x65, 0x6f, 0x66, 0x31, 0x61, 0x22, 0x24, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
0x32, 0x1a, 0x0b, 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x41, 0x1a, 0x0b,
- 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x42, 0x42, 0x43, 0x5a, 0x41, 0x67,
- 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
- 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64,
- 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74,
- 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+ 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x42, 0x42, 0x40, 0x5a, 0x3e, 0x67,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74,
+ 0x64, 0x61, 0x74, 0x61, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/comments/comments.proto b/cmd/protoc-gen-go/testdata/comments/comments.proto
index 0c18132..1e6cae4 100644
--- a/cmd/protoc-gen-go/testdata/comments/comments.proto
+++ b/cmd/protoc-gen-go/testdata/comments/comments.proto
@@ -7,7 +7,7 @@
// COMMENT: package goproto.protoc.comments;
package goproto.protoc.comments;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/comments";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/comments";
// COMMENT: Message1
message Message1 {
diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
index 499aeb6..df129a2 100644
--- a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
@@ -4,10 +4,10 @@
package comments
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -102,12 +102,12 @@
0x74, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x2a, 0x28, 0x0a, 0x0e,
0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x12,
0x0a, 0x0a, 0x44, 0x45, 0x50, 0x52, 0x45, 0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x00, 0x1a, 0x02,
- 0x08, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x42, 0x46, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
- 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
- 0x74, 0x61, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0xb8, 0x01, 0x01, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x08, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x42, 0x43, 0x5a, 0x3e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
+ 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
+ 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0xb8, 0x01, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.proto b/cmd/protoc-gen-go/testdata/comments/deprecated.proto
index c889b4d..daac493 100644
--- a/cmd/protoc-gen-go/testdata/comments/deprecated.proto
+++ b/cmd/protoc-gen-go/testdata/comments/deprecated.proto
@@ -7,7 +7,7 @@
package goproto.protoc.comments;
option deprecated = true;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/comments";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/comments";
message DeprecatedMessage {
option deprecated = true;
diff --git a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
index 1a2ebb4..42734fa 100644
--- a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
@@ -4,10 +4,10 @@
package base
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -112,12 +112,12 @@
0x2a, 0x04, 0x08, 0x04, 0x10, 0x0a, 0x2a, 0x08, 0x08, 0x10, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02,
0x22, 0x2b, 0x0a, 0x1b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x57, 0x69,
0x72, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a,
- 0x08, 0x08, 0x64, 0x10, 0xff, 0xff, 0xff, 0xff, 0x07, 0x3a, 0x02, 0x08, 0x01, 0x42, 0x4a, 0x5a,
- 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61,
- 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63,
- 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f,
- 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
- 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65,
+ 0x08, 0x08, 0x64, 0x10, 0xff, 0xff, 0xff, 0xff, 0x07, 0x3a, 0x02, 0x08, 0x01, 0x42, 0x47, 0x5a,
+ 0x45, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
+ 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65,
+ 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+ 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/extensions/base/base.proto b/cmd/protoc-gen-go/testdata/extensions/base/base.proto
index c97436b..32d242e 100644
--- a/cmd/protoc-gen-go/testdata/extensions/base/base.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/base/base.proto
@@ -6,7 +6,7 @@
package goproto.protoc.extension.base;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/base";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/base";
message BaseMessage {
optional string field = 1;
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
index 82d374c..0b26bd8 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
@@ -4,12 +4,12 @@
package ext
import (
- base "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/base"
- extra "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/extra"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ base "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/base"
+ extra "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/extra"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -1135,12 +1135,12 @@
0x6f, 0x6e, 0x2e, 0x65, 0x78, 0x74, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65,
0x74, 0x57, 0x69, 0x72, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e,
0x73, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74,
- 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74,
- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73,
- 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
- 0x2f, 0x65, 0x78, 0x74,
+ 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
+ 0x74, 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x65, 0x78,
+ 0x74,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
index 9997a84..c5d2c7d 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
@@ -9,7 +9,7 @@
package goproto.protoc.extension.ext;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/ext";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/ext";
message Message {
optional bytes data = 1;
diff --git a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
index e661567..e8b7516 100644
--- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
@@ -4,10 +4,10 @@
package extra
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -59,11 +59,11 @@
0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x65, 0x78, 0x74, 0x72, 0x61, 0x22, 0x22,
0x0a, 0x0c, 0x45, 0x78, 0x74, 0x72, 0x61, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12,
0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
- 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
- 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67,
- 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x65,
- 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x65, 0x78, 0x74, 0x72, 0x61,
+ 0x74, 0x61, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c,
+ 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+ 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
+ 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65,
+ 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x65, 0x78, 0x74, 0x72, 0x61,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto b/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto
index e615f92..eeea423 100644
--- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto
@@ -6,7 +6,7 @@
package goproto.protoc.extension.extra;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/extra";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/extra";
message ExtraMessage {
optional bytes data = 1;
diff --git a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
index 1bedf3f..26be3f3 100644
--- a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
@@ -4,11 +4,11 @@
package proto3
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
- descriptor "github.com/golang/protobuf/v2/types/descriptor"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ descriptor "google.golang.org/protobuf/types/descriptor"
sync "sync"
)
@@ -660,12 +660,12 @@
0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x18,
0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
- 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x4c, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68,
- 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74,
- 0x64, 0x61, 0x74, 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74,
+ 0x61, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto
index c9af7c6..3d48c1f 100644
--- a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto
@@ -8,7 +8,7 @@
package goproto.protoc.extension.proto3;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/proto3";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/proto3";
message Message {}
enum Enum { ZERO = 0; }
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
index 580ae0e..3bdfa1c 100644
--- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
+++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
@@ -4,10 +4,10 @@
package fieldnames
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -353,11 +353,11 @@
0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x5f, 0x61, 0x42, 0x12, 0x0a, 0x10, 0x6f,
0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x5f, 0x62, 0x42,
0x12, 0x0a, 0x10, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63,
- 0x74, 0x5f, 0x63, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
- 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
- 0x66, 0x69, 0x65, 0x6c, 0x64, 0x6e, 0x61, 0x6d, 0x65, 0x73,
+ 0x74, 0x5f, 0x63, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
+ 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x66, 0x69, 0x65,
+ 0x6c, 0x64, 0x6e, 0x61, 0x6d, 0x65, 0x73,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto
index 0cd5be5..00f6752 100644
--- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto
+++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto
@@ -6,7 +6,7 @@
package goproto.protoc.fieldnames;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/fieldnames";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/fieldnames";
// Assorted edge cases in field name conflict resolution.
//
diff --git a/cmd/protoc-gen-go/testdata/gen_test.go b/cmd/protoc-gen-go/testdata/gen_test.go
index 5596f0e..a372bd4 100644
--- a/cmd/protoc-gen-go/testdata/gen_test.go
+++ b/cmd/protoc-gen-go/testdata/gen_test.go
@@ -7,23 +7,23 @@
package main
import (
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/annotations"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/comments"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/base"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/ext"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/extra"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/proto3"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/fieldnames"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub2"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/fmt"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_1"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_2"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_b_1"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/issue780_oneof_conflict"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/nopackage"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto3"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/annotations"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/comments"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/base"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/ext"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/extra"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/extensions/proto3"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/fieldnames"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub2"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/fmt"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_1"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_2"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_b_1"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/issue780_oneof_conflict"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/nopackage"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto2"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto3"
)
diff --git a/cmd/protoc-gen-go/testdata/go.mod b/cmd/protoc-gen-go/testdata/go.mod
index 366f2e1..342a309 100644
--- a/cmd/protoc-gen-go/testdata/go.mod
+++ b/cmd/protoc-gen-go/testdata/go.mod
@@ -1,8 +1,8 @@
-module github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata
+module google.golang.org/protobuf/v2/cmd/protoc-gen-go/testdata
require (
github.com/golang/protobuf v1.2.1-0.20190509013249-911a20d79252
- github.com/golang/protobuf/v2 v2.0.0
+ google.golang.org/protobuf v1.0.0
)
-replace github.com/golang/protobuf/v2 => ../../..
+replace google.golang.org/protobuf => ../../..
diff --git a/cmd/protoc-gen-go/testdata/import_public/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
index c881ea1..fb39415 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
@@ -4,11 +4,11 @@
package import_public
import (
- sub "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ sub "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -125,12 +125,11 @@
0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f,
0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x52, 0x05, 0x6c, 0x6f,
- 0x63, 0x61, 0x6c, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
- 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
- 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x50, 0x00, 0x50,
- 0x01,
+ 0x63, 0x61, 0x6c, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
+ 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70,
+ 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x50, 0x00, 0x50, 0x01,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/import_public/a.proto b/cmd/protoc-gen-go/testdata/import_public/a.proto
index 6807950..389e285 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/a.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public";
import public "import_public/sub/a.proto"; // Different Go package.
import public "import_public/b.proto"; // Same Go package.
diff --git a/cmd/protoc-gen-go/testdata/import_public/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
index 2f966ee..9d80fc7 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
@@ -4,11 +4,11 @@
package import_public
import (
- sub "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ sub "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -74,11 +74,11 @@
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f,
0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x73, 0x75, 0x62, 0x2e, 0x45, 0x52, 0x01, 0x65, 0x42,
- 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
- 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f,
- 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
+ 0x45, 0x5a, 0x43, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d,
+ 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+ 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/import_public/b.proto b/cmd/protoc-gen-go/testdata/import_public/b.proto
index 02e4abe..e81d17f 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/b.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public";
import "import_public/sub/a.proto";
diff --git a/cmd/protoc-gen-go/testdata/import_public/c.pb.go b/cmd/protoc-gen-go/testdata/import_public/c.pb.go
index 49a8fb5..15d1212 100644
--- a/cmd/protoc-gen-go/testdata/import_public/c.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/c.pb.go
@@ -4,11 +4,11 @@
package import_public
import (
- sub2 "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub2"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ sub2 "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub2"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -79,11 +79,11 @@
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x69, 0x6d, 0x70,
0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x73, 0x75, 0x62, 0x32, 0x2e,
0x53, 0x75, 0x62, 0x32, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x04, 0x73, 0x75, 0x62,
- 0x32, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
- 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
- 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65,
- 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d,
- 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
+ 0x32, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61,
+ 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
+ 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67,
+ 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72,
+ 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/import_public/c.proto b/cmd/protoc-gen-go/testdata/import_public/c.proto
index 6a3de06..8399d19 100644
--- a/cmd/protoc-gen-go/testdata/import_public/c.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/c.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public";
import "import_public/a.proto";
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
index ec7e87e..d90e5b3 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
@@ -4,11 +4,11 @@
package sub
import (
- sub2 "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub2"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ sub2 "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub2"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
math "math"
sync "sync"
)
@@ -442,12 +442,12 @@
0x23, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
0x2e, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x73,
0x75, 0x62, 0x2e, 0x4d, 0x18, 0x64, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, 0x74, 0x65,
- 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x4c, 0x5a, 0x4a, 0x67, 0x69,
- 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65,
- 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75,
- 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x73, 0x75, 0x62, 0x50, 0x01,
+ 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64,
+ 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69,
+ 0x63, 0x2f, 0x73, 0x75, 0x62, 0x50, 0x01,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.proto b/cmd/protoc-gen-go/testdata/import_public/sub/a.proto
index 83c407e..17ede61 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/a.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/a.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public.sub;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub";
import "import_public/sub/b.proto";
import public "import_public/sub2/a.proto";
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
index 93c3966..c6f06ef 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
@@ -4,10 +4,10 @@
package sub
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -49,12 +49,11 @@
0x73, 0x75, 0x62, 0x2f, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x67, 0x6f, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x69, 0x6d, 0x70, 0x6f,
0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x73, 0x75, 0x62, 0x22, 0x04, 0x0a,
- 0x02, 0x4d, 0x32, 0x42, 0x4c, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
- 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
- 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x73, 0x75,
- 0x62,
+ 0x02, 0x4d, 0x32, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
+ 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70,
+ 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x73, 0x75, 0x62,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/b.proto b/cmd/protoc-gen-go/testdata/import_public/sub/b.proto
index 017ae18..2f1bb5d 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/b.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/b.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public.sub;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub";
message M2 {
}
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
index bf58d13..a492967 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
@@ -4,10 +4,10 @@
package sub2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -49,12 +49,12 @@
0x73, 0x75, 0x62, 0x32, 0x2f, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x67, 0x6f,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x69, 0x6d, 0x70,
0x6f, 0x72, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x73, 0x75, 0x62, 0x32, 0x22,
- 0x0d, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x32, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x4d,
- 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f,
- 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67,
- 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72,
- 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x73, 0x75, 0x62, 0x32,
+ 0x0d, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x32, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x4a,
+ 0x5a, 0x48, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
+ 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74,
+ 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x70,
+ 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x73, 0x75, 0x62, 0x32,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub2/a.proto b/cmd/protoc-gen-go/testdata/import_public/sub2/a.proto
index e63240d..ec8aa90 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub2/a.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/sub2/a.proto
@@ -6,6 +6,6 @@
package goproto.protoc.import_public.sub2;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/import_public/sub2";
message Sub2Message {}
diff --git a/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go b/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
index 5821f22..4d0b765 100644
--- a/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
@@ -4,10 +4,10 @@
package fmt
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -47,11 +47,11 @@
var file_imports_fmt_m_proto_rawDesc = []byte{
0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x66, 0x6d, 0x74, 0x2f, 0x6d, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x66, 0x6d, 0x74, 0x22, 0x03, 0x0a, 0x01, 0x4d, 0x42,
- 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
- 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f,
- 0x72, 0x74, 0x73, 0x2f, 0x66, 0x6d, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x43, 0x5a, 0x41, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d,
+ 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73,
+ 0x2f, 0x66, 0x6d, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/fmt/m.proto b/cmd/protoc-gen-go/testdata/imports/fmt/m.proto
index f29c44d..580c2b5 100644
--- a/cmd/protoc-gen-go/testdata/imports/fmt/m.proto
+++ b/cmd/protoc-gen-go/testdata/imports/fmt/m.proto
@@ -4,5 +4,5 @@
syntax = "proto3";
package fmt;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/fmt";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/fmt";
message M {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
index 18c004d..36ac2d6 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
@@ -4,10 +4,10 @@
package test_a_1
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -126,12 +126,12 @@
0x31, 0x12, 0x1a, 0x0a, 0x02, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
0x74, 0x65, 0x73, 0x74, 0x2e, 0x61, 0x2e, 0x4d, 0x31, 0x52, 0x02, 0x6d, 0x31, 0x2a, 0x11, 0x0a,
0x02, 0x45, 0x31, 0x12, 0x0b, 0x0a, 0x07, 0x45, 0x31, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00,
- 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67,
- 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76,
- 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
- 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70,
- 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x31, 0x62, 0x06, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x42, 0x48, 0x5a, 0x46, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e,
+ 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63,
+ 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f,
+ 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74,
+ 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.proto b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.proto
index dde5f32..0c2f3e1 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.proto
@@ -4,7 +4,7 @@
syntax = "proto3";
package test.a;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_1";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_1";
message M1 {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
index f9b829f..5b940a3 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
@@ -4,10 +4,10 @@
package test_a_1
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -47,12 +47,12 @@
var file_imports_test_a_1_m2_proto_rawDesc = []byte{
0x0a, 0x19, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61,
0x5f, 0x31, 0x2f, 0x6d, 0x32, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x74, 0x65, 0x73,
- 0x74, 0x2e, 0x61, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x32, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74,
- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73,
- 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65,
- 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x2e, 0x61, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x32, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
+ 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f,
+ 0x61, 0x5f, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.proto b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.proto
index cdaf137..31aa909 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.proto
@@ -4,5 +4,5 @@
syntax = "proto3";
package test.a;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_1";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_1";
message M2 {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
index 24adcf8..863ede3 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
@@ -4,10 +4,10 @@
package test_a_2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -47,12 +47,12 @@
var file_imports_test_a_2_m3_proto_rawDesc = []byte{
0x0a, 0x19, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61,
0x5f, 0x32, 0x2f, 0x6d, 0x33, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x74, 0x65, 0x73,
- 0x74, 0x2e, 0x61, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x33, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74,
- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73,
- 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65,
- 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x2e, 0x61, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x33, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
+ 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f,
+ 0x61, 0x5f, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.proto b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.proto
index 5316d5f..c9b3f34 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.proto
@@ -4,5 +4,5 @@
syntax = "proto3";
package test.a;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_2";
message M3 {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
index 9a12200..727105f 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
@@ -4,10 +4,10 @@
package test_a_2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -47,12 +47,12 @@
var file_imports_test_a_2_m4_proto_rawDesc = []byte{
0x0a, 0x19, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61,
0x5f, 0x32, 0x2f, 0x6d, 0x34, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x74, 0x65, 0x73,
- 0x74, 0x2e, 0x61, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x34, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74,
- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73,
- 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65,
- 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x2e, 0x61, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x34, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
+ 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f,
+ 0x61, 0x5f, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.proto b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.proto
index 40edc82..248e073 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.proto
@@ -4,5 +4,5 @@
syntax = "proto3";
package test.a;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_2";
message M4 {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
index 1a3bbbe..ee0fee9 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
@@ -4,10 +4,10 @@
package beta
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -48,12 +48,12 @@
0x0a, 0x19, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x62,
0x5f, 0x31, 0x2f, 0x6d, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x74, 0x65, 0x73,
0x74, 0x2e, 0x62, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x31, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x31, 0x42,
- 0x50, 0x5a, 0x4e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
- 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f,
- 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x5f, 0x31, 0x3b, 0x62, 0x65, 0x74,
- 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x4d, 0x5a, 0x4b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d,
+ 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73,
+ 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x5f, 0x31, 0x3b, 0x62, 0x65, 0x74, 0x61, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.proto b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.proto
index 0168cec..77e0fc6 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.proto
@@ -4,5 +4,5 @@
syntax = "proto3";
package test.b.part1;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_b_1;beta";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_b_1;beta";
message M1 {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
index d72785e..dc717c0 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
@@ -4,10 +4,10 @@
package beta
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -48,12 +48,12 @@
0x0a, 0x19, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x62,
0x5f, 0x31, 0x2f, 0x6d, 0x32, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x74, 0x65, 0x73,
0x74, 0x2e, 0x62, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x32, 0x22, 0x04, 0x0a, 0x02, 0x4d, 0x32, 0x42,
- 0x50, 0x5a, 0x4e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
- 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f,
- 0x72, 0x74, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x5f, 0x31, 0x3b, 0x62, 0x65, 0x74,
- 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x4d, 0x5a, 0x4b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d,
+ 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73,
+ 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x5f, 0x31, 0x3b, 0x62, 0x65, 0x74, 0x61, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.proto b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.proto
index ad662b3..ed68630 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.proto
@@ -4,5 +4,5 @@
syntax = "proto3";
package test.b.part2;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_b_1;beta";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_b_1;beta";
message M2 {}
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
index a2704df..db25972 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
@@ -4,11 +4,11 @@
package imports
import (
- test_a_1 "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_1"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ test_a_1 "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_1"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -60,11 +60,11 @@
0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x31, 0x2f, 0x6d, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x22, 0x20, 0x0a, 0x04, 0x41, 0x31, 0x4d, 0x31, 0x12, 0x18, 0x0a, 0x01, 0x66, 0x18, 0x01,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x61, 0x2e, 0x4d, 0x31,
- 0x52, 0x01, 0x66, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
- 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
- 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x01, 0x66, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
+ 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70,
+ 0x6f, 0x72, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.proto b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.proto
index 3454fed..d9a82e7 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.proto
@@ -6,7 +6,7 @@
package test;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports";
import "imports/test_a_1/m1.proto";
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
index c337a1b..e634cfc 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
@@ -4,11 +4,11 @@
package imports
import (
- test_a_1 "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_1"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ test_a_1 "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_1"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -60,11 +60,11 @@
0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x5f, 0x31, 0x2f, 0x6d, 0x32, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x22, 0x20, 0x0a, 0x04, 0x41, 0x31, 0x4d, 0x32, 0x12, 0x18, 0x0a, 0x01, 0x66, 0x18, 0x01,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x61, 0x2e, 0x4d, 0x32,
- 0x52, 0x01, 0x66, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
- 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
- 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x01, 0x66, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
+ 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70,
+ 0x6f, 0x72, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.proto b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.proto
index 1c9a61e..4676458 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.proto
@@ -6,7 +6,7 @@
package test;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports";
import "imports/test_a_1/m2.proto";
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
index 90fed57..4d21640 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
@@ -4,14 +4,14 @@
package imports
import (
- fmt "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/fmt"
- test_a_1 "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_1"
- _ "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_a_2"
- test_b_1 "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports/test_b_1"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ fmt "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/fmt"
+ test_a_1 "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_1"
+ _ "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_a_2"
+ test_b_1 "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports/test_b_1"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -113,11 +113,11 @@
0x0b, 0x32, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x62, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x32,
0x2e, 0x4d, 0x32, 0x52, 0x03, 0x62, 0x6d, 0x32, 0x12, 0x18, 0x0a, 0x03, 0x66, 0x6d, 0x74, 0x18,
0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x66, 0x6d, 0x74, 0x2e, 0x4d, 0x52, 0x03, 0x66,
- 0x6d, 0x74, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
- 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
- 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67,
- 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69,
- 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6d, 0x74, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c,
+ 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+ 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
+ 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x69, 0x6d, 0x70, 0x6f,
+ 0x72, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_all.proto b/cmd/protoc-gen-go/testdata/imports/test_import_all.proto
index 471ce7f..6a56c1d 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_all.proto
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_all.proto
@@ -6,7 +6,7 @@
package test;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/imports";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/imports";
// test_a_1/m*.proto are in the same Go package and proto package.
// test_a_*/*.proto are in different Go packages, but the same proto package.
diff --git a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
index b87e4d4..65c1987 100644
--- a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
+++ b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
@@ -4,10 +4,10 @@
package oneoftest
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
diff --git a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
index 2b40692..a6950ca 100644
--- a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
+++ b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
@@ -4,10 +4,10 @@
package nopackage
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
index c9b935f..d66a422 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
@@ -4,10 +4,10 @@
package proto2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -464,11 +464,11 @@
0x63, 0x61, 0x74, 0x65, 0x31, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x64, 0x75, 0x70, 0x6c, 0x69,
0x63, 0x61, 0x74, 0x65, 0x32, 0x10, 0x01, 0x1a, 0x02, 0x10, 0x01, 0x22, 0x04, 0x08, 0x02, 0x10,
0x02, 0x22, 0x04, 0x08, 0x03, 0x10, 0x03, 0x2a, 0x09, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45,
- 0x44, 0x31, 0x2a, 0x09, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x32, 0x42, 0x41, 0x5a,
- 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61,
- 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63,
- 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f,
- 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
+ 0x44, 0x31, 0x2a, 0x09, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x32, 0x42, 0x3e, 0x5a,
+ 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
+ 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65,
+ 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.proto b/cmd/protoc-gen-go/testdata/proto2/enum.proto
index 87b9005..c30c8ec 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto2";
// EnumType1 comment.
enum EnumType1 {
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
index fcd6452..187c725 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
@@ -4,10 +4,10 @@
package proto2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
math "math"
sync "sync"
)
@@ -1668,11 +1668,11 @@
0x77, 0x6f, 0x4a, 0x06, 0x08, 0x90, 0x4e, 0x10, 0x91, 0x4e, 0x4a, 0x06, 0x08, 0x91, 0x4e, 0x10,
0x92, 0x4e, 0x52, 0x0c, 0x54, 0x45, 0x4e, 0x5f, 0x54, 0x48, 0x4f, 0x55, 0x53, 0x41, 0x4e, 0x44,
0x52, 0x14, 0x54, 0x45, 0x4e, 0x5f, 0x54, 0x48, 0x4f, 0x55, 0x53, 0x41, 0x4e, 0x44, 0x5f, 0x41,
- 0x4e, 0x44, 0x5f, 0x4f, 0x4e, 0x45, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
- 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
- 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
+ 0x4e, 0x44, 0x5f, 0x4f, 0x4e, 0x45, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d,
+ 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.proto b/cmd/protoc-gen-go/testdata/proto2/fields.proto
index 35cfbd2..f3c4c91 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto2";
message FieldTestMessage {
optional bool optional_bool = 1;
diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
index 1244664..ef4753a 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
@@ -4,10 +4,10 @@
package proto2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -143,11 +143,11 @@
0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x32, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x31, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x32, 0x2e,
0x4c, 0x61, 0x79, 0x65, 0x72, 0x33, 0x52, 0x02, 0x6c, 0x33, 0x1a, 0x08, 0x0a, 0x06, 0x4c, 0x61,
- 0x79, 0x65, 0x72, 0x33, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
- 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
- 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
- 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61,
- 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
+ 0x79, 0x65, 0x72, 0x33, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67,
+ 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65,
+ 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x32,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto b/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto
index bb92a0a..e42af75 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto2";
message Layer1 {
message Layer2 {
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
index 40670b2..2853112 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
@@ -4,10 +4,10 @@
package proto2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -68,11 +68,11 @@
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x69, 0x33, 0x32, 0x12, 0x2c, 0x0a, 0x01, 0x6d, 0x18, 0x02,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x4d, 0x65, 0x73,
- 0x73, 0x61, 0x67, 0x65, 0x52, 0x01, 0x6d, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75,
- 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64,
- 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
+ 0x73, 0x61, 0x67, 0x65, 0x52, 0x01, 0x6d, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+ 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.proto b/cmd/protoc-gen-go/testdata/proto2/proto2.proto
index fe610cf..55e052e 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto2";
message Message {
optional int32 i32 = 1;
diff --git a/cmd/protoc-gen-go/testdata/proto3/enum.pb.go b/cmd/protoc-gen-go/testdata/proto3/enum.pb.go
index ca06b43..84de309 100644
--- a/cmd/protoc-gen-go/testdata/proto3/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto3/enum.pb.go
@@ -4,9 +4,9 @@
package proto3
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -63,12 +63,12 @@
0x6f, 0x74, 0x6f, 0x12, 0x15, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x2a, 0x22, 0x0a, 0x04, 0x45, 0x6e,
0x75, 0x6d, 0x12, 0x08, 0x0a, 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03,
- 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x57, 0x4f, 0x10, 0x02, 0x42, 0x41,
- 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f,
- 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67,
- 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x57, 0x4f, 0x10, 0x02, 0x42, 0x3e,
+ 0x5a, 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
+ 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74,
+ 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/proto3/enum.proto b/cmd/protoc-gen-go/testdata/proto3/enum.proto
index e7a4db6..595af3d 100644
--- a/cmd/protoc-gen-go/testdata/proto3/enum.proto
+++ b/cmd/protoc-gen-go/testdata/proto3/enum.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto3;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto3";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto3";
enum Enum {
ZERO = 0;
diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
index de46ea6..be06063 100644
--- a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
@@ -4,10 +4,10 @@
package proto3
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -552,11 +552,11 @@
0x67, 0x65, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
0x38, 0x01, 0x1a, 0x09, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x10, 0x0a,
0x04, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x08, 0x0a, 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42,
- 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
- 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x3e, 0x5a, 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d,
+ 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x62,
+ 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.proto b/cmd/protoc-gen-go/testdata/proto3/fields.proto
index ba61364..1dfd705 100644
--- a/cmd/protoc-gen-go/testdata/proto3/fields.proto
+++ b/cmd/protoc-gen-go/testdata/proto3/fields.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto3;
-option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto3";
+option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/proto3";
message FieldTestMessage {
string optional_bool = 1;
diff --git a/encoding/bench_test.go b/encoding/bench_test.go
index fdb33d1..0341b19 100644
--- a/encoding/bench_test.go
+++ b/encoding/bench_test.go
@@ -11,11 +11,11 @@
jsonpbV1 "github.com/golang/protobuf/jsonpb"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/encoding/jsonpb"
- "github.com/golang/protobuf/v2/encoding/textpb"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/encoding/jsonpb"
+ "google.golang.org/protobuf/encoding/textpb"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
- tpb "github.com/golang/protobuf/v2/internal/testprotos/test"
+ tpb "google.golang.org/protobuf/internal/testprotos/test"
)
// The results of these microbenchmarks are unlikely to correspond well
diff --git a/encoding/jsonpb/bench_test.go b/encoding/jsonpb/bench_test.go
index eba4119..3dcc5e0 100644
--- a/encoding/jsonpb/bench_test.go
+++ b/encoding/jsonpb/bench_test.go
@@ -7,8 +7,8 @@
import (
"testing"
- "github.com/golang/protobuf/v2/encoding/jsonpb"
- knownpb "github.com/golang/protobuf/v2/types/known"
+ "google.golang.org/protobuf/encoding/jsonpb"
+ knownpb "google.golang.org/protobuf/types/known"
)
func BenchmarkUnmarshal_Duration(b *testing.B) {
diff --git a/encoding/jsonpb/decode.go b/encoding/jsonpb/decode.go
index 1b5a5af..1712bf6 100644
--- a/encoding/jsonpb/decode.go
+++ b/encoding/jsonpb/decode.go
@@ -11,13 +11,13 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/internal/encoding/json"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/internal/set"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/encoding/json"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/internal/set"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
)
// Unmarshal reads the given []byte into the given proto.Message.
diff --git a/encoding/jsonpb/decode_test.go b/encoding/jsonpb/decode_test.go
index 05e619d..0410d53 100644
--- a/encoding/jsonpb/decode_test.go
+++ b/encoding/jsonpb/decode_test.go
@@ -10,16 +10,16 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/encoding/jsonpb"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb2"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb3"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
- "github.com/golang/protobuf/v2/runtime/protoiface"
+ "google.golang.org/protobuf/encoding/jsonpb"
+ "google.golang.org/protobuf/encoding/testprotos/pb2"
+ "google.golang.org/protobuf/encoding/testprotos/pb3"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
+ "google.golang.org/protobuf/runtime/protoiface"
- knownpb "github.com/golang/protobuf/v2/types/known"
+ knownpb "google.golang.org/protobuf/types/known"
)
func init() {
diff --git a/encoding/jsonpb/encode.go b/encoding/jsonpb/encode.go
index 256cd74..1d353b7 100644
--- a/encoding/jsonpb/encode.go
+++ b/encoding/jsonpb/encode.go
@@ -9,12 +9,12 @@
"fmt"
"sort"
- "github.com/golang/protobuf/v2/internal/encoding/json"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/encoding/json"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
)
// Marshal writes the given proto.Message in JSON format using default options.
diff --git a/encoding/jsonpb/encode_test.go b/encoding/jsonpb/encode_test.go
index c2dd2d2..6043209 100644
--- a/encoding/jsonpb/encode_test.go
+++ b/encoding/jsonpb/encode_test.go
@@ -11,20 +11,20 @@
"strings"
"testing"
- "github.com/golang/protobuf/v2/encoding/jsonpb"
- "github.com/golang/protobuf/v2/internal/encoding/pack"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
- "github.com/golang/protobuf/v2/runtime/protoiface"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+ "google.golang.org/protobuf/encoding/jsonpb"
+ "google.golang.org/protobuf/internal/encoding/pack"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
+ "google.golang.org/protobuf/runtime/protoiface"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb2"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb3"
- knownpb "github.com/golang/protobuf/v2/types/known"
+ "google.golang.org/protobuf/encoding/testprotos/pb2"
+ "google.golang.org/protobuf/encoding/testprotos/pb3"
+ knownpb "google.golang.org/protobuf/types/known"
)
// splitLines is a cmpopts.Option for comparing strings with line breaks.
diff --git a/encoding/jsonpb/well_known_types.go b/encoding/jsonpb/well_known_types.go
index ddd7e97..c3ca47e 100644
--- a/encoding/jsonpb/well_known_types.go
+++ b/encoding/jsonpb/well_known_types.go
@@ -11,11 +11,11 @@
"strings"
"time"
- "github.com/golang/protobuf/v2/internal/encoding/json"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/fieldnum"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/json"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/fieldnum"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// isCustomType returns true if type name has special JSON conversion rules.
diff --git a/encoding/testprotos/pb2/test.pb.go b/encoding/testprotos/pb2/test.pb.go
index abc47c8..80f90d0 100644
--- a/encoding/testprotos/pb2/test.pb.go
+++ b/encoding/testprotos/pb2/test.pb.go
@@ -4,11 +4,11 @@
package pb2
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
- known "github.com/golang/protobuf/v2/types/known"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ known "google.golang.org/protobuf/types/known"
sync "sync"
)
@@ -1922,10 +1922,10 @@
0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73,
0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65,
- 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
- 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2f,
- 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x70, 0x62, 0x32,
+ 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+ 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x74, 0x65, 0x73,
+ 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x70, 0x62, 0x32,
}
var (
diff --git a/encoding/testprotos/pb2/test.proto b/encoding/testprotos/pb2/test.proto
index db4752e..fe3842b 100644
--- a/encoding/testprotos/pb2/test.proto
+++ b/encoding/testprotos/pb2/test.proto
@@ -6,7 +6,7 @@
syntax = "proto2";
package pb2;
-option go_package = "github.com/golang/protobuf/v2/encoding/testprotos/pb2";
+option go_package = "google.golang.org/protobuf/encoding/testprotos/pb2";
import "google/protobuf/any.proto";
import "google/protobuf/empty.proto";
diff --git a/encoding/testprotos/pb3/test.pb.go b/encoding/testprotos/pb3/test.pb.go
index c5892af..992de19 100644
--- a/encoding/testprotos/pb3/test.pb.go
+++ b/encoding/testprotos/pb3/test.pb.go
@@ -4,10 +4,10 @@
package pb3
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -694,11 +694,11 @@
0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x6f, 0x6f, 0x5f, 0x62, 0x61, 0x72,
0x2a, 0x2b, 0x0a, 0x04, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x08, 0x0a, 0x04, 0x5a, 0x45, 0x52, 0x4f,
0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54,
- 0x57, 0x4f, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x45, 0x4e, 0x10, 0x0a, 0x42, 0x37, 0x5a,
- 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61,
- 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x65,
- 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x73, 0x2f, 0x70, 0x62, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x57, 0x4f, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x45, 0x4e, 0x10, 0x0a, 0x42, 0x34, 0x5a,
+ 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
+ 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6e, 0x63, 0x6f,
+ 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
+ 0x70, 0x62, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/encoding/testprotos/pb3/test.proto b/encoding/testprotos/pb3/test.proto
index 598c268..402aff8 100644
--- a/encoding/testprotos/pb3/test.proto
+++ b/encoding/testprotos/pb3/test.proto
@@ -6,7 +6,7 @@
syntax = "proto3";
package pb3;
-option go_package = "github.com/golang/protobuf/v2/encoding/testprotos/pb3";
+option go_package = "google.golang.org/protobuf/encoding/testprotos/pb3";
// Scalars contains scalar field types.
message Scalars {
diff --git a/encoding/textpb/decode.go b/encoding/textpb/decode.go
index c586331..88ac20e 100644
--- a/encoding/textpb/decode.go
+++ b/encoding/textpb/decode.go
@@ -9,14 +9,14 @@
"strings"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/text"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/fieldnum"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/internal/set"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/encoding/text"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/fieldnum"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/internal/set"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
)
// Unmarshal reads the given []byte into the given proto.Message.
diff --git a/encoding/textpb/decode_test.go b/encoding/textpb/decode_test.go
index dd166cd..d1e7b14 100644
--- a/encoding/textpb/decode_test.go
+++ b/encoding/textpb/decode_test.go
@@ -9,16 +9,16 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/encoding/textpb"
- "github.com/golang/protobuf/v2/internal/errors"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/internal/errors"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb2"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb3"
- knownpb "github.com/golang/protobuf/v2/types/known"
+ "google.golang.org/protobuf/encoding/testprotos/pb2"
+ "google.golang.org/protobuf/encoding/testprotos/pb3"
+ knownpb "google.golang.org/protobuf/types/known"
)
func TestUnmarshal(t *testing.T) {
diff --git a/encoding/textpb/encode.go b/encoding/textpb/encode.go
index 9bd8279..3964a33 100644
--- a/encoding/textpb/encode.go
+++ b/encoding/textpb/encode.go
@@ -9,15 +9,15 @@
"sort"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/text"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/fieldnum"
- "github.com/golang/protobuf/v2/internal/mapsort"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/encoding/text"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/fieldnum"
+ "google.golang.org/protobuf/internal/mapsort"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
)
// Marshal writes the given proto.Message in textproto format using default options.
diff --git a/encoding/textpb/encode_test.go b/encoding/textpb/encode_test.go
index e4ca966..03872e1 100644
--- a/encoding/textpb/encode_test.go
+++ b/encoding/textpb/encode_test.go
@@ -11,21 +11,21 @@
"strings"
"testing"
- "github.com/golang/protobuf/v2/encoding/textpb"
- "github.com/golang/protobuf/v2/internal/detrand"
- "github.com/golang/protobuf/v2/internal/encoding/pack"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
- "github.com/golang/protobuf/v2/runtime/protoiface"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+ "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/internal/detrand"
+ "google.golang.org/protobuf/internal/encoding/pack"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
+ "google.golang.org/protobuf/runtime/protoiface"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb2"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb3"
- knownpb "github.com/golang/protobuf/v2/types/known"
+ "google.golang.org/protobuf/encoding/testprotos/pb2"
+ "google.golang.org/protobuf/encoding/testprotos/pb3"
+ knownpb "google.golang.org/protobuf/types/known"
)
func init() {
diff --git a/encoding/textpb/other_test.go b/encoding/textpb/other_test.go
index 5b1552d..008c090 100644
--- a/encoding/textpb/other_test.go
+++ b/encoding/textpb/other_test.go
@@ -4,15 +4,15 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/encoding/textpb"
- "github.com/golang/protobuf/v2/internal/impl"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/internal/impl"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
- "github.com/golang/protobuf/v2/encoding/testprotos/pb2"
- knownpb "github.com/golang/protobuf/v2/types/known"
+ "google.golang.org/protobuf/encoding/testprotos/pb2"
+ knownpb "google.golang.org/protobuf/types/known"
)
func TestRoundTrip(t *testing.T) {
diff --git a/go.mod b/go.mod
deleted file mode 100644
index adbcc9a..0000000
--- a/go.mod
+++ /dev/null
@@ -1,6 +0,0 @@
-module github.com/golang/protobuf/v2
-
-require (
- github.com/golang/protobuf v1.2.1-0.20190509013249-911a20d79252
- github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42
-)
diff --git a/go.sum b/go.sum
deleted file mode 100644
index 8606bea..0000000
--- a/go.sum
+++ /dev/null
@@ -1,12 +0,0 @@
-github.com/golang/protobuf v1.2.1-0.20190322195920-d94fb84e04b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.2.1-0.20190326022002-be03c15fcaa2/go.mod h1:rZ4veVXHB1S2+o7TKqD9Isxml062IeDutnCDtFPUlCc=
-github.com/golang/protobuf v1.2.1-0.20190416233244-13cf6e79fd39/go.mod h1:RgnTNLHWo9HXezTFX5MTeuXnXx9eeQX8y3Cukv+9HaE=
-github.com/golang/protobuf v1.2.1-0.20190420064300-2b4f3c98b458/go.mod h1:hPB+itxf2EbA0J6prVtJg+ohMeLFLEhlSXXPS2qxTZE=
-github.com/golang/protobuf v1.2.1-0.20190509013249-911a20d79252 h1:8GDqfGafxw0x8/UPOzOaVQPi1eceOzX0jrbRXPPck1E=
-github.com/golang/protobuf v1.2.1-0.20190509013249-911a20d79252/go.mod h1:1lePdeOu8oinPqnsR0b0MT7mXK8t1iCeDN4TrHzKWEU=
-github.com/golang/protobuf/v2 v2.0.0-20190322201422-f503c300f70e/go.mod h1:25ZALhydMFaBRgPH58a8zpFe9YXMAMjOYWtB6pNPcoo=
-github.com/golang/protobuf/v2 v2.0.0-20190416222953-ab61d41ec93f/go.mod h1:baUT2weUsA1MR7ocRtLXLmi2B1s4VrUT3S6tO8AYzMw=
-github.com/golang/protobuf/v2 v2.0.0-20190420063524-d24bc72368a2/go.mod h1:wcEMLTNPNYxBFS3yY7kunR0QKUgP/f+wzZaPeTbHi0g=
-github.com/golang/protobuf/v2 v2.0.0-20190509012650-00a323deed55/go.mod h1:pWnbrfE+N2TBYiklDHixM32oa26kuZCiJwxIu0DAl7Y=
-github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42 h1:q3pnF5JFBNRz8sRD+IRj7Y6DMyYGTNqnZ9axTbSfoNI=
-github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
diff --git a/integration_test.go b/integration_test.go
index 9bd3024..a18c105 100644
--- a/integration_test.go
+++ b/integration_test.go
@@ -290,21 +290,21 @@
javaPackageRx := regexp.MustCompile(`^option\s+java_package\s*=\s*".*"\s*;\s*$`)
goPackageRx := regexp.MustCompile(`^option\s+go_package\s*=\s*".*"\s*;\s*$`)
files := map[string]string{
- "src/google/protobuf/any.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/api.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/duration.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/empty.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/field_mask.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/source_context.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/struct.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/timestamp.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/type.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/wrappers.proto": "github.com/golang/protobuf/v2/types/known;known_proto",
- "src/google/protobuf/descriptor.proto": "github.com/golang/protobuf/v2/types/descriptor;descriptor_proto",
- "src/google/protobuf/compiler/plugin.proto": "github.com/golang/protobuf/v2/types/plugin;plugin_proto",
- "conformance/conformance.proto": "github.com/golang/protobuf/v2/internal/testprotos/conformance;conformance",
- "src/google/protobuf/test_messages_proto2.proto": "github.com/golang/protobuf/v2/internal/testprotos/conformance;conformance",
- "src/google/protobuf/test_messages_proto3.proto": "github.com/golang/protobuf/v2/internal/testprotos/conformance;conformance",
+ "src/google/protobuf/any.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/api.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/duration.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/empty.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/field_mask.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/source_context.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/struct.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/timestamp.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/type.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/wrappers.proto": "google.golang.org/protobuf/types/known;known_proto",
+ "src/google/protobuf/descriptor.proto": "google.golang.org/protobuf/types/descriptor;descriptor_proto",
+ "src/google/protobuf/compiler/plugin.proto": "google.golang.org/protobuf/types/plugin;plugin_proto",
+ "conformance/conformance.proto": "google.golang.org/protobuf/internal/testprotos/conformance;conformance",
+ "src/google/protobuf/test_messages_proto2.proto": "google.golang.org/protobuf/internal/testprotos/conformance;conformance",
+ "src/google/protobuf/test_messages_proto3.proto": "google.golang.org/protobuf/internal/testprotos/conformance;conformance",
}
for pbpath, gopath := range files {
b, err := ioutil.ReadFile(filepath.Join(repoRoot, pbpath))
diff --git a/internal/cmd/conformance/main.go b/internal/cmd/conformance/main.go
index 9f1abb7..6783c16 100644
--- a/internal/cmd/conformance/main.go
+++ b/internal/cmd/conformance/main.go
@@ -12,10 +12,10 @@
"log"
"os"
- "github.com/golang/protobuf/v2/encoding/jsonpb"
- "github.com/golang/protobuf/v2/proto"
+ "google.golang.org/protobuf/encoding/jsonpb"
+ "google.golang.org/protobuf/proto"
- pb "github.com/golang/protobuf/v2/internal/testprotos/conformance"
+ pb "google.golang.org/protobuf/internal/testprotos/conformance"
)
func main() {
diff --git a/internal/cmd/generate-protos/main.go b/internal/cmd/generate-protos/main.go
index 2d03750..1763a92 100644
--- a/internal/cmd/generate-protos/main.go
+++ b/internal/cmd/generate-protos/main.go
@@ -19,11 +19,11 @@
"sort"
"strings"
- gengogrpc "github.com/golang/protobuf/v2/cmd/protoc-gen-go-grpc/internal_gengogrpc"
- gengo "github.com/golang/protobuf/v2/cmd/protoc-gen-go/internal_gengo"
- "github.com/golang/protobuf/v2/internal/detrand"
- "github.com/golang/protobuf/v2/protogen"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ gengogrpc "google.golang.org/protobuf/cmd/protoc-gen-go-grpc/internal_gengogrpc"
+ gengo "google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo"
+ "google.golang.org/protobuf/internal/detrand"
+ "google.golang.org/protobuf/protogen"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
func init() {
diff --git a/internal/cmd/generate-types/main.go b/internal/cmd/generate-types/main.go
index c8931d4..8ae3a52 100644
--- a/internal/cmd/generate-types/main.go
+++ b/internal/cmd/generate-types/main.go
@@ -314,11 +314,11 @@
"sync",
"unicode/utf8",
"",
- "github.com/golang/protobuf/v2/internal/encoding/wire",
- "github.com/golang/protobuf/v2/internal/errors",
- "github.com/golang/protobuf/v2/internal/pragma",
- "github.com/golang/protobuf/v2/internal/typefmt",
- "github.com/golang/protobuf/v2/reflect/protoreflect",
+ "google.golang.org/protobuf/internal/encoding/wire",
+ "google.golang.org/protobuf/internal/errors",
+ "google.golang.org/protobuf/internal/pragma",
+ "google.golang.org/protobuf/internal/typefmt",
+ "google.golang.org/protobuf/reflect/protoreflect",
} {
if pkg == "" {
imports = append(imports, "") // blank line between stdlib and proto packages
diff --git a/internal/cmd/pbdump/pbdump.go b/internal/cmd/pbdump/pbdump.go
index c6cb7c7..a3ce569 100644
--- a/internal/cmd/pbdump/pbdump.go
+++ b/internal/cmd/pbdump/pbdump.go
@@ -17,13 +17,13 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/internal/encoding/pack"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/prototype"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/pack"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/prototype"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
func main() {
diff --git a/internal/cmd/pbdump/pbdump_test.go b/internal/cmd/pbdump/pbdump_test.go
index 9e50ec4..57ec1b5 100644
--- a/internal/cmd/pbdump/pbdump_test.go
+++ b/internal/cmd/pbdump/pbdump_test.go
@@ -12,8 +12,8 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func TestFields(t *testing.T) {
diff --git a/internal/descopts/options.go b/internal/descopts/options.go
index 58284b6..8ea9307 100644
--- a/internal/descopts/options.go
+++ b/internal/descopts/options.go
@@ -9,7 +9,7 @@
// descriptor proto package).
package descopts
-import pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+import pref "google.golang.org/protobuf/reflect/protoreflect"
// These variables are set by the init function in descriptor.pb.go via logic
// in internal/fileinit. In other words, so long as the descriptor proto package
diff --git a/internal/encoding/defval/default.go b/internal/encoding/defval/default.go
index e2c62a9..a15df02 100644
--- a/internal/encoding/defval/default.go
+++ b/internal/encoding/defval/default.go
@@ -14,9 +14,9 @@
"math"
"strconv"
- ptext "github.com/golang/protobuf/v2/internal/encoding/text"
- errors "github.com/golang/protobuf/v2/internal/errors"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ ptext "google.golang.org/protobuf/internal/encoding/text"
+ errors "google.golang.org/protobuf/internal/errors"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// Format is the serialization format used to represent the default value.
diff --git a/internal/encoding/defval/default_test.go b/internal/encoding/defval/default_test.go
index e91eb7e..a25a93f 100644
--- a/internal/encoding/defval/default_test.go
+++ b/internal/encoding/defval/default_test.go
@@ -9,7 +9,7 @@
"reflect"
"testing"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func Test(t *testing.T) {
diff --git a/internal/encoding/json/bench_test.go b/internal/encoding/json/bench_test.go
index 6c3f1d1..db7d761 100644
--- a/internal/encoding/json/bench_test.go
+++ b/internal/encoding/json/bench_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- "github.com/golang/protobuf/v2/internal/encoding/json"
+ "google.golang.org/protobuf/internal/encoding/json"
)
func BenchmarkFloat(b *testing.B) {
diff --git a/internal/encoding/json/decode.go b/internal/encoding/json/decode.go
index 545fb42..27dff34 100644
--- a/internal/encoding/json/decode.go
+++ b/internal/encoding/json/decode.go
@@ -12,7 +12,7 @@
"strconv"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/errors"
+ "google.golang.org/protobuf/internal/errors"
)
// call specifies which Decoder method was invoked.
diff --git a/internal/encoding/json/decode_test.go b/internal/encoding/json/decode_test.go
index b402b0a..daf3f7c 100644
--- a/internal/encoding/json/decode_test.go
+++ b/internal/encoding/json/decode_test.go
@@ -9,7 +9,7 @@
"testing"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/json"
+ "google.golang.org/protobuf/internal/encoding/json"
)
type R struct {
diff --git a/internal/encoding/json/encode.go b/internal/encoding/json/encode.go
index f73e224..39a5014 100644
--- a/internal/encoding/json/encode.go
+++ b/internal/encoding/json/encode.go
@@ -8,7 +8,7 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/internal/errors"
+ "google.golang.org/protobuf/internal/errors"
)
// Encoder provides methods to write out JSON constructs and values. The user is
diff --git a/internal/encoding/json/encode_test.go b/internal/encoding/json/encode_test.go
index d3f0afd..3f85f65 100644
--- a/internal/encoding/json/encode_test.go
+++ b/internal/encoding/json/encode_test.go
@@ -9,9 +9,9 @@
"strings"
"testing"
- "github.com/golang/protobuf/v2/internal/encoding/json"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+ "google.golang.org/protobuf/internal/encoding/json"
)
// splitLines is a cmpopts.Option for comparing strings with line breaks.
diff --git a/internal/encoding/json/string.go b/internal/encoding/json/string.go
index 7f70cff..1d89aca 100644
--- a/internal/encoding/json/string.go
+++ b/internal/encoding/json/string.go
@@ -12,7 +12,7 @@
"unicode/utf16"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/errors"
+ "google.golang.org/protobuf/internal/errors"
)
func appendString(out []byte, in string) ([]byte, error) {
diff --git a/internal/encoding/pack/pack.go b/internal/encoding/pack/pack.go
index 6cb9aa2..4e172e6 100644
--- a/internal/encoding/pack/pack.go
+++ b/internal/encoding/pack/pack.go
@@ -21,8 +21,8 @@
"unicode"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// Number is the field number; aliased from the wire package for convenience.
diff --git a/internal/encoding/pack/pack_test.go b/internal/encoding/pack/pack_test.go
index 6ac901c..d2f8baa 100644
--- a/internal/encoding/pack/pack_test.go
+++ b/internal/encoding/pack/pack_test.go
@@ -11,9 +11,9 @@
"math"
"testing"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
cmp "github.com/google/go-cmp/cmp"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
var msgDesc = func() pref.MessageDescriptor {
diff --git a/internal/encoding/tag/tag.go b/internal/encoding/tag/tag.go
index d4e868f..f1f24e8 100644
--- a/internal/encoding/tag/tag.go
+++ b/internal/encoding/tag/tag.go
@@ -11,9 +11,9 @@
"strconv"
"strings"
- defval "github.com/golang/protobuf/v2/internal/encoding/defval"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ defval "google.golang.org/protobuf/internal/encoding/defval"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
var byteType = reflect.TypeOf(byte(0))
diff --git a/internal/encoding/tag/tag_test.go b/internal/encoding/tag/tag_test.go
index cb34993..0433b42 100644
--- a/internal/encoding/tag/tag_test.go
+++ b/internal/encoding/tag/tag_test.go
@@ -8,10 +8,10 @@
"reflect"
"testing"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func Test(t *testing.T) {
diff --git a/internal/encoding/text/decode.go b/internal/encoding/text/decode.go
index 090177a..0babddf 100644
--- a/internal/encoding/text/decode.go
+++ b/internal/encoding/text/decode.go
@@ -10,8 +10,8 @@
"regexp"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
type syntaxError struct{ error }
diff --git a/internal/encoding/text/encode.go b/internal/encoding/text/encode.go
index d3e2986..c6878ee 100644
--- a/internal/encoding/text/encode.go
+++ b/internal/encoding/text/encode.go
@@ -8,8 +8,8 @@
"bytes"
"strings"
- "github.com/golang/protobuf/v2/internal/detrand"
- "github.com/golang/protobuf/v2/internal/errors"
+ "google.golang.org/protobuf/internal/detrand"
+ "google.golang.org/protobuf/internal/errors"
)
// Marshal serializes v as the proto text format, where v must be a Message.
diff --git a/internal/encoding/text/number.go b/internal/encoding/text/number.go
index 9c30a18..a2e08f9 100644
--- a/internal/encoding/text/number.go
+++ b/internal/encoding/text/number.go
@@ -12,7 +12,7 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/internal/errors"
+ "google.golang.org/protobuf/internal/errors"
)
// marshalNumber encodes v as either a Bool, Int, Uint, Float32, or Float64.
diff --git a/internal/encoding/text/string.go b/internal/encoding/text/string.go
index 6a0b730..56f13cd 100644
--- a/internal/encoding/text/string.go
+++ b/internal/encoding/text/string.go
@@ -15,7 +15,7 @@
"unicode/utf16"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/errors"
+ "google.golang.org/protobuf/internal/errors"
)
func (p *encoder) marshalString(v Value) error {
diff --git a/internal/encoding/text/text_test.go b/internal/encoding/text/text_test.go
index 2ac4bf0..97caa74 100644
--- a/internal/encoding/text/text_test.go
+++ b/internal/encoding/text/text_test.go
@@ -11,11 +11,11 @@
"testing"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/detrand"
- "github.com/golang/protobuf/v2/internal/flags"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+ "google.golang.org/protobuf/internal/detrand"
+ "google.golang.org/protobuf/internal/flags"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// Disable detrand to enable direct comparisons on outputs.
diff --git a/internal/encoding/text/value.go b/internal/encoding/text/value.go
index 2498f66..8387707 100644
--- a/internal/encoding/text/value.go
+++ b/internal/encoding/text/value.go
@@ -33,8 +33,8 @@
"math"
"strings"
- "github.com/golang/protobuf/v2/internal/flags"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/flags"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// Type represents a type expressible in the text format.
diff --git a/internal/encoding/wire/wire.go b/internal/encoding/wire/wire.go
index 0706234..456fc54 100644
--- a/internal/encoding/wire/wire.go
+++ b/internal/encoding/wire/wire.go
@@ -12,8 +12,8 @@
"math"
"math/bits"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/flags"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/flags"
)
// Number represents the field number.
diff --git a/internal/fileinit/desc.go b/internal/fileinit/desc.go
index 8854cab..a341d3c 100644
--- a/internal/fileinit/desc.go
+++ b/internal/fileinit/desc.go
@@ -13,14 +13,14 @@
"reflect"
"sync"
- descopts "github.com/golang/protobuf/v2/internal/descopts"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ descopts "google.golang.org/protobuf/internal/descopts"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
+ piface "google.golang.org/protobuf/runtime/protoiface"
)
// FileBuilder construct a protoreflect.FileDescriptor from the
diff --git a/internal/fileinit/desc_init.go b/internal/fileinit/desc_init.go
index 29d0531..6905b23 100644
--- a/internal/fileinit/desc_init.go
+++ b/internal/fileinit/desc_init.go
@@ -5,9 +5,9 @@
package fileinit
import (
- wire "github.com/golang/protobuf/v2/internal/encoding/wire"
- fieldnum "github.com/golang/protobuf/v2/internal/fieldnum"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ wire "google.golang.org/protobuf/internal/encoding/wire"
+ fieldnum "google.golang.org/protobuf/internal/fieldnum"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func newFileDesc(fb FileBuilder) *fileDesc {
diff --git a/internal/fileinit/desc_lazy.go b/internal/fileinit/desc_lazy.go
index 7382d80..018b8e4 100644
--- a/internal/fileinit/desc_lazy.go
+++ b/internal/fileinit/desc_lazy.go
@@ -9,14 +9,14 @@
"fmt"
"reflect"
- defval "github.com/golang/protobuf/v2/internal/encoding/defval"
- wire "github.com/golang/protobuf/v2/internal/encoding/wire"
- fieldnum "github.com/golang/protobuf/v2/internal/fieldnum"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
+ defval "google.golang.org/protobuf/internal/encoding/defval"
+ wire "google.golang.org/protobuf/internal/encoding/wire"
+ fieldnum "google.golang.org/protobuf/internal/fieldnum"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
)
func (file *fileDesc) lazyInit() *fileLazy {
diff --git a/internal/fileinit/desc_list.go b/internal/fileinit/desc_list.go
index 6531fcd..5f3443f 100644
--- a/internal/fileinit/desc_list.go
+++ b/internal/fileinit/desc_list.go
@@ -9,9 +9,9 @@
"sort"
"sync"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
type fileImports []pref.FileImport
diff --git a/internal/fileinit/desc_list_gen.go b/internal/fileinit/desc_list_gen.go
index 367b921..4018c9b 100644
--- a/internal/fileinit/desc_list_gen.go
+++ b/internal/fileinit/desc_list_gen.go
@@ -10,9 +10,9 @@
"fmt"
"sync"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/internal/typefmt"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/internal/typefmt"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
type enumDescs struct {
diff --git a/internal/fileinit/fileinit_test.go b/internal/fileinit/fileinit_test.go
index dd58fd0..c5c0dc5 100644
--- a/internal/fileinit/fileinit_test.go
+++ b/internal/fileinit/fileinit_test.go
@@ -7,10 +7,10 @@
"testing"
proto "github.com/golang/protobuf/proto"
- testpb "github.com/golang/protobuf/v2/internal/testprotos/test"
- "github.com/golang/protobuf/v2/reflect/protodesc"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
+ "google.golang.org/protobuf/reflect/protodesc"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
func TestInit(t *testing.T) {
diff --git a/internal/fileinit/name_pure.go b/internal/fileinit/name_pure.go
index d03ffed..5d1e6fe 100644
--- a/internal/fileinit/name_pure.go
+++ b/internal/fileinit/name_pure.go
@@ -6,7 +6,7 @@
package fileinit
-import pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+import pref "google.golang.org/protobuf/reflect/protoreflect"
func getNameBuilder() *nameBuilder { return nil }
func putNameBuilder(*nameBuilder) {}
diff --git a/internal/fileinit/name_unsafe.go b/internal/fileinit/name_unsafe.go
index 2baca9b..ec1da6f 100644
--- a/internal/fileinit/name_unsafe.go
+++ b/internal/fileinit/name_unsafe.go
@@ -10,7 +10,7 @@
"sync"
"unsafe"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
var nameBuilderPool = sync.Pool{
diff --git a/internal/impl/export.go b/internal/impl/export.go
index 0b53d78..ae0e9fa 100644
--- a/internal/impl/export.go
+++ b/internal/impl/export.go
@@ -8,8 +8,8 @@
"reflect"
"strconv"
- "github.com/golang/protobuf/v2/encoding/textpb"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/encoding/textpb"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// Export is a zero-length named type that exists only to export a set of
diff --git a/internal/impl/legacy_export.go b/internal/impl/legacy_export.go
index 8038333..f08f242 100644
--- a/internal/impl/legacy_export.go
+++ b/internal/impl/legacy_export.go
@@ -10,8 +10,8 @@
"hash/crc32"
"math"
- "github.com/golang/protobuf/v2/internal/errors"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/errors"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// These functions exist to support exported APIs in generated protobufs.
diff --git a/internal/impl/legacy_extension.go b/internal/impl/legacy_extension.go
index 7a8fea7..eac04b9 100644
--- a/internal/impl/legacy_extension.go
+++ b/internal/impl/legacy_extension.go
@@ -7,8 +7,8 @@
import (
"reflect"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ piface "google.golang.org/protobuf/runtime/protoiface"
)
func makeLegacyExtensionFieldsFunc(t reflect.Type) func(p *messageDataType) pref.KnownFields {
diff --git a/internal/impl/legacy_hook.go b/internal/impl/legacy_hook.go
index 86fe95e..f3ffe63 100644
--- a/internal/impl/legacy_hook.go
+++ b/internal/impl/legacy_hook.go
@@ -4,7 +4,7 @@
package impl
-import pvalue "github.com/golang/protobuf/v2/internal/value"
+import pvalue "google.golang.org/protobuf/internal/value"
// TODO: Add a default LegacyWrapper that panics with a more helpful message?
var legacyWrapper pvalue.LegacyWrapper
diff --git a/internal/impl/legacy_test.go b/internal/impl/legacy_test.go
index d5d4e54..a01dac1 100644
--- a/internal/impl/legacy_test.go
+++ b/internal/impl/legacy_test.go
@@ -10,19 +10,19 @@
"reflect"
"testing"
- pack "github.com/golang/protobuf/v2/internal/encoding/pack"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- plegacy "github.com/golang/protobuf/v2/internal/legacy"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- scalar "github.com/golang/protobuf/v2/internal/scalar"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
cmp "github.com/google/go-cmp/cmp"
cmpopts "github.com/google/go-cmp/cmp/cmpopts"
+ pack "google.golang.org/protobuf/internal/encoding/pack"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ plegacy "google.golang.org/protobuf/internal/legacy"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ scalar "google.golang.org/protobuf/internal/scalar"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
+ piface "google.golang.org/protobuf/runtime/protoiface"
- proto2_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
+ proto2_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
)
type legacyTestMessage struct {
diff --git a/internal/impl/legacy_unknown.go b/internal/impl/legacy_unknown.go
index 919d02d..6dc88f6 100644
--- a/internal/impl/legacy_unknown.go
+++ b/internal/impl/legacy_unknown.go
@@ -8,8 +8,8 @@
"container/list"
"reflect"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
var bytesType = reflect.TypeOf([]byte(nil))
diff --git a/internal/impl/message.go b/internal/impl/message.go
index a98e7bb..96efec9 100644
--- a/internal/impl/message.go
+++ b/internal/impl/message.go
@@ -11,9 +11,9 @@
"strings"
"sync"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ piface "google.golang.org/protobuf/runtime/protoiface"
)
// MessageType provides protobuf related functionality for a given Go type
diff --git a/internal/impl/message_field.go b/internal/impl/message_field.go
index 10405d0..356ec78 100644
--- a/internal/impl/message_field.go
+++ b/internal/impl/message_field.go
@@ -9,8 +9,8 @@
"math"
"reflect"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
type fieldInfo struct {
diff --git a/internal/impl/message_test.go b/internal/impl/message_test.go
index 49e3a0a..f2c8749 100644
--- a/internal/impl/message_test.go
+++ b/internal/impl/message_test.go
@@ -12,20 +12,20 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- scalar "github.com/golang/protobuf/v2/internal/scalar"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
cmp "github.com/google/go-cmp/cmp"
cmpopts "github.com/google/go-cmp/cmp/cmpopts"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ scalar "google.golang.org/protobuf/internal/scalar"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
// The legacy package must be imported prior to use of any legacy messages.
// TODO: Remove this when protoV1 registers these hooks for you.
- _ "github.com/golang/protobuf/v2/internal/legacy"
+ _ "google.golang.org/protobuf/internal/legacy"
- proto2_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ proto2_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
// List of test operations to perform on messages, lists, or maps.
diff --git a/internal/legacy/enum.go b/internal/legacy/enum.go
index 2a57b0b..67a43f9 100644
--- a/internal/legacy/enum.go
+++ b/internal/legacy/enum.go
@@ -10,9 +10,9 @@
"reflect"
"sync"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// wrapEnum wraps v as a protoreflect.Enum,
diff --git a/internal/legacy/export.go b/internal/legacy/export.go
index fa4375a..794a5e4 100644
--- a/internal/legacy/export.go
+++ b/internal/legacy/export.go
@@ -7,10 +7,10 @@
import (
"reflect"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ piface "google.golang.org/protobuf/runtime/protoiface"
)
// Export is a zero-length named type that exists only to export a set of
diff --git a/internal/legacy/extension.go b/internal/legacy/extension.go
index b700a7f..216cb4e 100644
--- a/internal/legacy/extension.go
+++ b/internal/legacy/extension.go
@@ -9,14 +9,14 @@
"reflect"
"sync"
- ptag "github.com/golang/protobuf/v2/internal/encoding/tag"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- pvalue "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ ptag "google.golang.org/protobuf/internal/encoding/tag"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ pvalue "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
+ piface "google.golang.org/protobuf/runtime/protoiface"
)
// extensionDescKey is a comparable version of protoiface.ExtensionDescV1
diff --git a/internal/legacy/extension_test.go b/internal/legacy/extension_test.go
index cdba627..c9bc9d4 100644
--- a/internal/legacy/extension_test.go
+++ b/internal/legacy/extension_test.go
@@ -8,13 +8,13 @@
"reflect"
"testing"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- plegacy "github.com/golang/protobuf/v2/internal/legacy"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ plegacy "google.golang.org/protobuf/internal/legacy"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ piface "google.golang.org/protobuf/runtime/protoiface"
- proto2_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
+ proto2_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
)
type legacyTestMessage struct {
diff --git a/internal/legacy/file_test.go b/internal/legacy/file_test.go
index c8d9af5..268172c 100644
--- a/internal/legacy/file_test.go
+++ b/internal/legacy/file_test.go
@@ -11,26 +11,26 @@
"reflect"
"testing"
- legacy "github.com/golang/protobuf/v2/internal/legacy"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/proto"
- pdesc "github.com/golang/protobuf/v2/reflect/protodesc"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
cmp "github.com/google/go-cmp/cmp"
+ legacy "google.golang.org/protobuf/internal/legacy"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/proto"
+ pdesc "google.golang.org/protobuf/reflect/protodesc"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
- proto2_20160225 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5"
- proto2_20160519 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5"
- proto2_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
- proto2_20180430 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
- proto2_20180814 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
- proto2_20181126 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1"
- proto3_20160225 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5"
- proto3_20160519 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5"
- proto3_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152"
- proto3_20180430 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
- proto3_20180814 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
- proto3_20181126 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1"
+ proto2_20160225 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5"
+ proto2_20160519 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5"
+ proto2_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
+ proto2_20180430 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
+ proto2_20180814 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
+ proto2_20181126 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1"
+ proto3_20160225 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5"
+ proto3_20160519 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5"
+ proto3_20180125 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152"
+ proto3_20180430 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
+ proto3_20180814 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
+ proto3_20181126 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1"
)
func mustLoadFileDesc(b []byte, _ []int) pref.FileDescriptor {
diff --git a/internal/legacy/legacy_test.go b/internal/legacy/legacy_test.go
index 9bb484c..be57f53 100644
--- a/internal/legacy/legacy_test.go
+++ b/internal/legacy/legacy_test.go
@@ -8,7 +8,7 @@
"sync"
"testing"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
type (
diff --git a/internal/legacy/message.go b/internal/legacy/message.go
index ee242ca..174615d 100644
--- a/internal/legacy/message.go
+++ b/internal/legacy/message.go
@@ -11,10 +11,10 @@
"sync"
"unicode"
- ptag "github.com/golang/protobuf/v2/internal/encoding/tag"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ ptag "google.golang.org/protobuf/internal/encoding/tag"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// wrapMessage wraps v as a protoreflect.ProtoMessage,
diff --git a/internal/legacy/parse.go b/internal/legacy/parse.go
index eac1256..6de9578 100644
--- a/internal/legacy/parse.go
+++ b/internal/legacy/parse.go
@@ -5,8 +5,8 @@
package legacy
import (
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/fieldnum"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/fieldnum"
)
// To avoid a dependency from legacy to descriptor.proto, use a hand-written parser
diff --git a/internal/mapsort/mapsort.go b/internal/mapsort/mapsort.go
index 8999b50..6afb487 100644
--- a/internal/mapsort/mapsort.go
+++ b/internal/mapsort/mapsort.go
@@ -8,7 +8,7 @@
import (
"sort"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// Range iterates over every map entry in sorted key order,
diff --git a/internal/mapsort/mapsort_test.go b/internal/mapsort/mapsort_test.go
index 680dcb8..bc33c4d 100644
--- a/internal/mapsort/mapsort_test.go
+++ b/internal/mapsort/mapsort_test.go
@@ -8,9 +8,9 @@
"reflect"
"testing"
- "github.com/golang/protobuf/v2/internal/mapsort"
- "github.com/golang/protobuf/v2/internal/value"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/mapsort"
+ "google.golang.org/protobuf/internal/value"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func TestRange(t *testing.T) {
diff --git a/internal/prototype/desc_test.go b/internal/prototype/desc_test.go
index a071a10..05b2e1d 100644
--- a/internal/prototype/desc_test.go
+++ b/internal/prototype/desc_test.go
@@ -8,7 +8,7 @@
"reflect"
"testing"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// TestDescriptors tests that the implementations do not declare additional
diff --git a/internal/prototype/go_type.go b/internal/prototype/go_type.go
index 6110e95..255558c 100644
--- a/internal/prototype/go_type.go
+++ b/internal/prototype/go_type.go
@@ -9,9 +9,9 @@
"reflect"
"sync"
- "github.com/golang/protobuf/v2/internal/typefmt"
- "github.com/golang/protobuf/v2/internal/value"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/typefmt"
+ "google.golang.org/protobuf/internal/value"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// GoEnum creates a new protoreflect.EnumType by combining the provided
diff --git a/internal/prototype/name_pure.go b/internal/prototype/name_pure.go
index 3720729..3ec33e5 100644
--- a/internal/prototype/name_pure.go
+++ b/internal/prototype/name_pure.go
@@ -6,7 +6,7 @@
package prototype
-import pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+import pref "google.golang.org/protobuf/reflect/protoreflect"
func getNameBuilder() *nameBuilder { return nil }
func putNameBuilder(*nameBuilder) {}
diff --git a/internal/prototype/name_unsafe.go b/internal/prototype/name_unsafe.go
index 27b22ad..588bdbc 100644
--- a/internal/prototype/name_unsafe.go
+++ b/internal/prototype/name_unsafe.go
@@ -11,7 +11,7 @@
"sync"
"unsafe"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
var nameBuilderPool = sync.Pool{
diff --git a/internal/prototype/placeholder.go b/internal/prototype/placeholder.go
index 3a5ffdc..87ebb30 100644
--- a/internal/prototype/placeholder.go
+++ b/internal/prototype/placeholder.go
@@ -4,7 +4,7 @@
package prototype
-import "github.com/golang/protobuf/v2/reflect/protoreflect"
+import "google.golang.org/protobuf/reflect/protoreflect"
// PlaceholderFile returns a placeholder protoreflect.FileType where
// only the Path and Package accessors are valid.
diff --git a/internal/prototype/placeholder_type.go b/internal/prototype/placeholder_type.go
index d4c0107..53d5e24 100644
--- a/internal/prototype/placeholder_type.go
+++ b/internal/prototype/placeholder_type.go
@@ -7,10 +7,10 @@
import (
"fmt"
- descopts "github.com/golang/protobuf/v2/internal/descopts"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ descopts "google.golang.org/protobuf/internal/descopts"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
var (
diff --git a/internal/prototype/protofile.go b/internal/prototype/protofile.go
index 601d474..48ba9ee 100644
--- a/internal/prototype/protofile.go
+++ b/internal/prototype/protofile.go
@@ -23,7 +23,7 @@
// as a field of the corresponding type (e.g., prototype.Message.MapEntry).
package prototype
-import "github.com/golang/protobuf/v2/reflect/protoreflect"
+import "google.golang.org/protobuf/reflect/protoreflect"
// Every struct has a "meta" struct embedded within it as a pointer.
// The meta type provides additional data structures for efficient lookup on
diff --git a/internal/prototype/protofile_list.go b/internal/prototype/protofile_list.go
index 99f1cc0..ad37f68 100644
--- a/internal/prototype/protofile_list.go
+++ b/internal/prototype/protofile_list.go
@@ -8,10 +8,10 @@
"fmt"
"sync"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- pset "github.com/golang/protobuf/v2/internal/set"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ pset "google.golang.org/protobuf/internal/set"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
type names []pref.Name
diff --git a/internal/prototype/protofile_list_gen.go b/internal/prototype/protofile_list_gen.go
index fb3d741..6001603 100644
--- a/internal/prototype/protofile_list_gen.go
+++ b/internal/prototype/protofile_list_gen.go
@@ -10,9 +10,9 @@
"fmt"
"sync"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/internal/typefmt"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/internal/typefmt"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
type messagesMeta struct {
diff --git a/internal/prototype/protofile_type.go b/internal/prototype/protofile_type.go
index a9d7bc3..cf96277 100644
--- a/internal/prototype/protofile_type.go
+++ b/internal/prototype/protofile_type.go
@@ -10,11 +10,11 @@
"strings"
"sync"
- descopts "github.com/golang/protobuf/v2/internal/descopts"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ descopts "google.golang.org/protobuf/internal/descopts"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// inheritedMeta is information inherited from the parent.
diff --git a/internal/prototype/resolve_test.go b/internal/prototype/resolve_test.go
index de0b758..09fb195 100644
--- a/internal/prototype/resolve_test.go
+++ b/internal/prototype/resolve_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func TestResolve(t *testing.T) {
diff --git a/internal/prototype/standalone.go b/internal/prototype/standalone.go
index 4184e82..05b123e 100644
--- a/internal/prototype/standalone.go
+++ b/internal/prototype/standalone.go
@@ -5,8 +5,8 @@
package prototype
import (
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// TODO: Should the constructors take in a value rather than a pointer?
diff --git a/internal/prototype/standalone_type.go b/internal/prototype/standalone_type.go
index a9b54e9..54a6ef5 100644
--- a/internal/prototype/standalone_type.go
+++ b/internal/prototype/standalone_type.go
@@ -7,10 +7,10 @@
import (
"fmt"
- descopts "github.com/golang/protobuf/v2/internal/descopts"
- pragma "github.com/golang/protobuf/v2/internal/pragma"
- pfmt "github.com/golang/protobuf/v2/internal/typefmt"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ descopts "google.golang.org/protobuf/internal/descopts"
+ pragma "google.golang.org/protobuf/internal/pragma"
+ pfmt "google.golang.org/protobuf/internal/typefmt"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
type standaloneMessage struct{ m *StandaloneMessage }
diff --git a/internal/prototype/type_test.go b/internal/prototype/type_test.go
index c00a816..d62e699 100644
--- a/internal/prototype/type_test.go
+++ b/internal/prototype/type_test.go
@@ -13,14 +13,14 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- detrand "github.com/golang/protobuf/v2/internal/detrand"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- scalar "github.com/golang/protobuf/v2/internal/scalar"
- pdesc "github.com/golang/protobuf/v2/reflect/protodesc"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
"github.com/google/go-cmp/cmp"
+ detrand "google.golang.org/protobuf/internal/detrand"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ scalar "google.golang.org/protobuf/internal/scalar"
+ pdesc "google.golang.org/protobuf/reflect/protodesc"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
func init() {
diff --git a/internal/prototype/validate.go b/internal/prototype/validate.go
index b4f2ad3..406d5e0 100644
--- a/internal/prototype/validate.go
+++ b/internal/prototype/validate.go
@@ -5,7 +5,7 @@
package prototype
import (
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// TODO: This is important to prevent users from creating invalid types,
diff --git a/internal/testprotos/conformance/conformance.pb.go b/internal/testprotos/conformance/conformance.pb.go
index 90a1076..4a34a12 100644
--- a/internal/testprotos/conformance/conformance.pb.go
+++ b/internal/testprotos/conformance/conformance.pb.go
@@ -4,10 +4,10 @@
package conformance
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -632,15 +632,15 @@
0x52, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x50, 0x41, 0x52, 0x53, 0x49,
0x4e, 0x47, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x50,
0x42, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x45, 0x58, 0x54,
- 0x5f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x05, 0x42, 0x6c,
+ 0x5f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x05, 0x42, 0x69,
0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63,
- 0x65, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65,
- 0x3b, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x5a, 0x46, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e,
+ 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x3b, 0x63, 0x6f,
+ 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x33,
}
var (
diff --git a/internal/testprotos/conformance/test_messages_proto2.pb.go b/internal/testprotos/conformance/test_messages_proto2.pb.go
index cde3e92..96b9e89 100644
--- a/internal/testprotos/conformance/test_messages_proto2.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto2.pb.go
@@ -4,10 +4,10 @@
package conformance
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -1803,15 +1803,15 @@
0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73,
0x50, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x18, 0x78, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x65, 0x78,
- 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x42, 0x7a, 0x0a, 0x28,
+ 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x42, 0x77, 0x0a, 0x28,
0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x62, 0x75, 0x66, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
- 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x48, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68,
- 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
- 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f,
- 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x3b, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72,
- 0x6d, 0x61, 0x6e, 0x63, 0x65, 0xf8, 0x01, 0x01,
+ 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x48, 0x01, 0x5a, 0x46, 0x67, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x6f,
+ 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x3b, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e,
+ 0x63, 0x65, 0xf8, 0x01, 0x01,
}
var (
diff --git a/internal/testprotos/conformance/test_messages_proto3.pb.go b/internal/testprotos/conformance/test_messages_proto3.pb.go
index c49c66d..a7be64e 100644
--- a/internal/testprotos/conformance/test_messages_proto3.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto3.pb.go
@@ -4,11 +4,11 @@
package conformance
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
- known "github.com/golang/protobuf/v2/types/known"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ known "google.golang.org/protobuf/types/known"
sync "sync"
)
@@ -1993,16 +1993,16 @@
0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52, 0x45, 0x49,
0x47, 0x4e, 0x5f, 0x46, 0x4f, 0x4f, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52, 0x45,
0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52,
- 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x5a, 0x10, 0x02, 0x42, 0x83, 0x01, 0x0a, 0x28, 0x63,
+ 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x5a, 0x10, 0x02, 0x42, 0x80, 0x01, 0x0a, 0x28, 0x63,
0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
0x75, 0x66, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73,
- 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x48, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75,
- 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
- 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e,
- 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x3b, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d,
- 0x61, 0x6e, 0x63, 0x65, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x06, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x33,
- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x48, 0x01, 0x5a, 0x46, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74,
+ 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72,
+ 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x3b, 0x63, 0x6f, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63,
+ 0x65, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x06, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x62, 0x06, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/internal/testprotos/legacy/legacy.pb.go b/internal/testprotos/legacy/legacy.pb.go
index cc3dbc1..8253547 100644
--- a/internal/testprotos/legacy/legacy.pb.go
+++ b/internal/testprotos/legacy/legacy.pb.go
@@ -4,22 +4,22 @@
package legacy
import (
- proto2_v0_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5"
- proto2_v0_01 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5"
- proto2_v1_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
- proto2_v1_1 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
- proto2_v1_2 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
- proto2_v1_21 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1"
- proto3_v0_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5"
- proto3_v0_01 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5"
- proto3_v1_0 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152"
- proto3_v1_1 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
- proto3_v1_2 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
- proto3_v1_21 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ proto2_v0_0 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5"
+ proto2_v0_01 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5"
+ proto2_v1_0 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
+ proto2_v1_1 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
+ proto2_v1_2 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
+ proto2_v1_21 "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1"
+ proto3_v0_0 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5"
+ proto3_v0_01 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5"
+ proto3_v1_0 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152"
+ proto3_v1_1 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
+ proto3_v1_2 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
+ proto3_v1_21 "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -239,12 +239,11 @@
0x3c, 0x0a, 0x03, 0x66, 0x31, 0x32, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67,
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x38, 0x31, 0x31, 0x32, 0x36,
- 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x66, 0x31, 0x32, 0x42, 0x3a, 0x5a,
- 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61,
- 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69,
- 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x66, 0x31, 0x32, 0x42, 0x37, 0x5a,
+ 0x35, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
+ 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
+ 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
+ 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/internal/testprotos/legacy/legacy.proto b/internal/testprotos/legacy/legacy.proto
index 700fefe..631368d 100644
--- a/internal/testprotos/legacy/legacy.proto
+++ b/internal/testprotos/legacy/legacy.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy";
// This file imports other files generated from a build of protoc-gen-go
// locked to a specific version. For all imports, they were built using
diff --git a/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5/test.proto b/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5/test.proto
index 47e0a36..68418b5 100644
--- a/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5/test.proto
+++ b/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5/test.proto
@@ -5,7 +5,7 @@
syntax = "proto2";
package google.golang.org.proto2_20160225;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5/test.proto b/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5/test.proto
index ad2764c..0298828 100644
--- a/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5/test.proto
+++ b/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5/test.proto
@@ -5,7 +5,7 @@
syntax = "proto2";
package google.golang.org.proto2_20160519;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152/test.proto b/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152/test.proto
index 8419f74..6525a45 100644
--- a/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152/test.proto
+++ b/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152/test.proto
@@ -5,7 +5,7 @@
syntax = "proto2";
package google.golang.org.proto2_20180125;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.pb.go b/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.pb.go
index d6870ec..3531f06 100644
--- a/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.pb.go
+++ b/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: proto2.v1.1.0-20180430-b4deda09/test.proto
-package proto2_v1_1_0_20180430_b4deda09 // import "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
+package proto2_v1_1_0_20180430_b4deda09 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09"
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
diff --git a/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.proto b/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.proto
index b53a638..5465113 100644
--- a/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.proto
+++ b/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09/test.proto
@@ -5,7 +5,7 @@
syntax = "proto2";
package google.golang.org.proto2_20180430;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.pb.go b/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.pb.go
index c85a645..c286f1d 100644
--- a/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.pb.go
+++ b/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: proto2.v1.2.0-20180814-aa810b61/test.proto
-package proto2_v1_2_0_20180814_aa810b61 // import "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
+package proto2_v1_2_0_20180814_aa810b61 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61"
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
diff --git a/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.proto b/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.proto
index 2bfc4ca..af16375 100644
--- a/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.proto
+++ b/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61/test.proto
@@ -5,7 +5,7 @@
syntax = "proto2";
package google.golang.org.proto2_20180814;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1/test.proto b/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1/test.proto
index 3f4fd61..9d28ad2 100644
--- a/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1/test.proto
+++ b/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1/test.proto
@@ -5,7 +5,7 @@
syntax = "proto2";
package google.golang.org.proto2_20181126;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto2.v1.2.1-20181126-8d0c54c1";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5/test.proto b/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5/test.proto
index cff7157..8e7599e 100644
--- a/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5/test.proto
+++ b/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5/test.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org.proto3_20160225;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5/test.proto b/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5/test.proto
index fcc8c34..39a0e1f 100644
--- a/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5/test.proto
+++ b/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5/test.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org.proto3_20160519;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152/test.proto b/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152/test.proto
index eab35a0..7c3dd42 100644
--- a/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152/test.proto
+++ b/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152/test.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org.proto3_20180125;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.pb.go b/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.pb.go
index b1e6e4b..fe35c37 100644
--- a/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.pb.go
+++ b/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: proto3.v1.1.0-20180430-b4deda09/test.proto
-package proto3_v1_1_0_20180430_b4deda09 // import "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
+package proto3_v1_1_0_20180430_b4deda09 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09"
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
diff --git a/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.proto b/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.proto
index 78f3747..33b3cb8 100644
--- a/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.proto
+++ b/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09/test.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org.proto3_20180430;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.pb.go b/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.pb.go
index 45b4ca2..50fcdf1 100644
--- a/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.pb.go
+++ b/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: proto3.v1.2.0-20180814-aa810b61/test.proto
-package proto3_v1_2_0_20180814_aa810b61 // import "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
+package proto3_v1_2_0_20180814_aa810b61 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61"
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
diff --git a/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.proto b/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.proto
index b6e0bf7..83f93ac 100644
--- a/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.proto
+++ b/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61/test.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org.proto3_20180814;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1/test.proto b/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1/test.proto
index 7328bde..98efcf7 100644
--- a/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1/test.proto
+++ b/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1/test.proto
@@ -5,7 +5,7 @@
syntax = "proto3";
package google.golang.org.proto3_20181126;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1";
+option go_package = "google.golang.org/protobuf/internal/testprotos/legacy/proto3.v1.2.1-20181126-8d0c54c1";
enum SiblingEnum {
ALPHA = 0;
diff --git a/internal/testprotos/test/ext.pb.go b/internal/testprotos/test/ext.pb.go
index 43cf2b1..9f6915d 100644
--- a/internal/testprotos/test/ext.pb.go
+++ b/internal/testprotos/test/ext.pb.go
@@ -4,10 +4,10 @@
package test
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -39,10 +39,10 @@
0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74,
0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15,
0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x78, 0x74, 0x65,
- 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
- 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
- 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
+ 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+ 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73,
+ 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
}
var (
diff --git a/internal/testprotos/test/ext.proto b/internal/testprotos/test/ext.proto
index e264653..eec689c 100644
--- a/internal/testprotos/test/ext.proto
+++ b/internal/testprotos/test/ext.proto
@@ -8,7 +8,7 @@
import "test/test.proto";
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test";
extend TestAllExtensions {
optional int32 foreign_int32_extension = 2000;
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index 7d512da..91ac82e 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -4,11 +4,11 @@
package test
import (
- weak "github.com/golang/protobuf/v2/internal/testprotos/test/weak"
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ weak "google.golang.org/protobuf/internal/testprotos/test/weak"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -3294,11 +3294,11 @@
0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45,
0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5f, 0x20, 0x01, 0x28, 0x0c, 0x3a,
0x05, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x52, 0x15, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42,
- 0x79, 0x74, 0x65, 0x73, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x38, 0x5a,
- 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61,
- 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69,
- 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x50, 0x01, 0x58, 0x02,
+ 0x79, 0x74, 0x65, 0x73, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x35, 0x5a,
+ 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
+ 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
+ 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x50, 0x01, 0x58, 0x02,
}
var (
diff --git a/internal/testprotos/test/test.proto b/internal/testprotos/test/test.proto
index 86e93fc..932983c 100644
--- a/internal/testprotos/test/test.proto
+++ b/internal/testprotos/test/test.proto
@@ -10,7 +10,7 @@
import public "test/test_public.proto";
import weak "test/weak/test_weak.proto";
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test";
message TestAllTypes {
message NestedMessage {
diff --git a/internal/testprotos/test/test_import.pb.go b/internal/testprotos/test/test_import.pb.go
index 1682ef5..dc8365c 100644
--- a/internal/testprotos/test/test_import.pb.go
+++ b/internal/testprotos/test/test_import.pb.go
@@ -4,10 +4,10 @@
package test
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -104,11 +104,11 @@
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x22, 0x0f, 0x0a, 0x0d,
0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x1d, 0x0a,
0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a, 0x0b, 0x49,
- 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x38, 0x5a, 0x36,
- 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e,
- 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e,
- 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
+ 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x35, 0x5a, 0x33,
+ 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72,
+ 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72,
+ 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74,
+ 0x65, 0x73, 0x74,
}
var (
diff --git a/internal/testprotos/test/test_import.proto b/internal/testprotos/test/test_import.proto
index 5c327cc..fa80cfa 100644
--- a/internal/testprotos/test/test_import.proto
+++ b/internal/testprotos/test/test_import.proto
@@ -6,7 +6,7 @@
package goproto.proto.test;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test";
message ImportMessage {
}
diff --git a/internal/testprotos/test/test_public.pb.go b/internal/testprotos/test/test_public.pb.go
index 4f12706..ba065fc 100644
--- a/internal/testprotos/test/test_public.pb.go
+++ b/internal/testprotos/test/test_public.pb.go
@@ -4,10 +4,10 @@
package test
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -49,10 +49,10 @@
0x69, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x22, 0x15, 0x0a, 0x13,
0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73,
- 0x61, 0x67, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65,
- 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
+ 0x61, 0x67, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
}
var (
diff --git a/internal/testprotos/test/test_public.proto b/internal/testprotos/test/test_public.proto
index f3e61c3..d2f14a7 100644
--- a/internal/testprotos/test/test_public.proto
+++ b/internal/testprotos/test/test_public.proto
@@ -6,7 +6,7 @@
package goproto.proto.test;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test";
message PublicImportMessage {
}
diff --git a/internal/testprotos/test/weak/test_weak.pb.go b/internal/testprotos/test/weak/test_weak.pb.go
index 2028dae..2cb834a 100644
--- a/internal/testprotos/test/weak/test_weak.pb.go
+++ b/internal/testprotos/test/weak/test_weak.pb.go
@@ -4,10 +4,10 @@
package weak
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -58,11 +58,11 @@
0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
0x77, 0x65, 0x61, 0x6b, 0x22, 0x21, 0x0a, 0x11, 0x57, 0x65, 0x61, 0x6b, 0x49, 0x6d, 0x70, 0x6f,
0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
- 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
- 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73,
- 0x74, 0x2f, 0x77, 0x65, 0x61, 0x6b,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74,
+ 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x77,
+ 0x65, 0x61, 0x6b,
}
var (
diff --git a/internal/testprotos/test/weak/test_weak.proto b/internal/testprotos/test/weak/test_weak.proto
index ff72c7f..d2caf2c 100644
--- a/internal/testprotos/test/weak/test_weak.proto
+++ b/internal/testprotos/test/weak/test_weak.proto
@@ -6,7 +6,7 @@
package goproto.proto.test.weak;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test/weak";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test/weak";
message WeakImportMessage {
optional int32 a = 1;
diff --git a/internal/testprotos/test3/test.pb.go b/internal/testprotos/test3/test.pb.go
index 262f7c9..ded5e83 100644
--- a/internal/testprotos/test3/test.pb.go
+++ b/internal/testprotos/test3/test.pb.go
@@ -4,10 +4,10 @@
package test3
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -1239,11 +1239,11 @@
0x4e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52, 0x45,
0x49, 0x47, 0x4e, 0x5f, 0x46, 0x4f, 0x4f, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52,
0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f,
- 0x52, 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x5a, 0x10, 0x06, 0x42, 0x39, 0x5a, 0x37, 0x67,
- 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
- 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74,
- 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
- 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x5a, 0x10, 0x06, 0x42, 0x36, 0x5a, 0x34, 0x67,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+ 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65,
+ 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/internal/testprotos/test3/test.proto b/internal/testprotos/test3/test.proto
index 7bfaabe..95269ac 100644
--- a/internal/testprotos/test3/test.proto
+++ b/internal/testprotos/test3/test.proto
@@ -8,7 +8,7 @@
import "test3/test_import.proto";
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test3";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test3";
message TestAllTypes {
message NestedMessage {
diff --git a/internal/testprotos/test3/test_import.pb.go b/internal/testprotos/test3/test_import.pb.go
index 3ea92b6..8376505 100644
--- a/internal/testprotos/test3/test_import.pb.go
+++ b/internal/testprotos/test3/test_import.pb.go
@@ -4,10 +4,10 @@
package test3
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -88,12 +88,11 @@
0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x22, 0x0f,
0x0a, 0x0d, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a,
0x1d, 0x0a, 0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a,
- 0x0b, 0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x39,
- 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f,
- 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x0b, 0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x36,
+ 0x5a, 0x34, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
+ 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74,
+ 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
+ 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/internal/testprotos/test3/test_import.proto b/internal/testprotos/test3/test_import.proto
index df41765..d639bd3 100644
--- a/internal/testprotos/test3/test_import.proto
+++ b/internal/testprotos/test3/test_import.proto
@@ -6,7 +6,7 @@
package goproto.proto.test3;
-option go_package = "github.com/golang/protobuf/v2/internal/testprotos/test3";
+option go_package = "google.golang.org/protobuf/internal/testprotos/test3";
message ImportMessage {
}
diff --git a/internal/typefmt/stringer.go b/internal/typefmt/stringer.go
index fdb1bdc..6c61f32 100644
--- a/internal/typefmt/stringer.go
+++ b/internal/typefmt/stringer.go
@@ -12,9 +12,9 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/internal/detrand"
- "github.com/golang/protobuf/v2/internal/pragma"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/detrand"
+ "google.golang.org/protobuf/internal/pragma"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
type list interface {
diff --git a/internal/value/convert.go b/internal/value/convert.go
index 4852b40..793af22 100644
--- a/internal/value/convert.go
+++ b/internal/value/convert.go
@@ -10,8 +10,8 @@
"fmt"
"reflect"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- piface "github.com/golang/protobuf/v2/runtime/protoiface"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ piface "google.golang.org/protobuf/runtime/protoiface"
)
// Unwrapper unwraps the value to the underlying value.
diff --git a/internal/value/list.go b/internal/value/list.go
index 37f9b55..f40a73f 100644
--- a/internal/value/list.go
+++ b/internal/value/list.go
@@ -7,7 +7,7 @@
import (
"reflect"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func ListOf(p interface{}, c Converter) interface {
diff --git a/internal/value/map.go b/internal/value/map.go
index 2637f94..3461d2e 100644
--- a/internal/value/map.go
+++ b/internal/value/map.go
@@ -7,7 +7,7 @@
import (
"reflect"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
func MapOf(p interface{}, kc, kv Converter) interface {
diff --git a/proto/bench_test.go b/proto/bench_test.go
index a38d11b..dfaf141 100644
--- a/proto/bench_test.go
+++ b/proto/bench_test.go
@@ -11,7 +11,7 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/proto"
+ "google.golang.org/protobuf/proto"
)
// The results of these microbenchmarks are unlikely to correspond well
diff --git a/proto/decode.go b/proto/decode.go
index 37334be..3d3d0da 100644
--- a/proto/decode.go
+++ b/proto/decode.go
@@ -5,12 +5,12 @@
package proto
import (
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
- "github.com/golang/protobuf/v2/runtime/protoiface"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
+ "google.golang.org/protobuf/runtime/protoiface"
)
// UnmarshalOptions configures the unmarshaler.
diff --git a/proto/decode_gen.go b/proto/decode_gen.go
index 1a3ef15..36071e7 100644
--- a/proto/decode_gen.go
+++ b/proto/decode_gen.go
@@ -10,9 +10,9 @@
"math"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// unmarshalScalar decodes a value of the given kind.
diff --git a/proto/decode_test.go b/proto/decode_test.go
index 4eb2598..c1810c5 100644
--- a/proto/decode_test.go
+++ b/proto/decode_test.go
@@ -10,16 +10,16 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/encoding/textpb"
- "github.com/golang/protobuf/v2/internal/encoding/pack"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/runtime/protolegacy"
+ "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/internal/encoding/pack"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/runtime/protolegacy"
- testpb "github.com/golang/protobuf/v2/internal/testprotos/test"
- test3pb "github.com/golang/protobuf/v2/internal/testprotos/test3"
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
+ test3pb "google.golang.org/protobuf/internal/testprotos/test3"
)
type testProto struct {
diff --git a/proto/encode.go b/proto/encode.go
index 96d6799..187bfc6 100644
--- a/proto/encode.go
+++ b/proto/encode.go
@@ -8,12 +8,12 @@
"fmt"
"sort"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/mapsort"
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/runtime/protoiface"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/mapsort"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/runtime/protoiface"
)
// MarshalOptions configures the marshaler.
diff --git a/proto/encode_gen.go b/proto/encode_gen.go
index 4919b96..6198c38 100644
--- a/proto/encode_gen.go
+++ b/proto/encode_gen.go
@@ -10,9 +10,9 @@
"math"
"unicode/utf8"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
var wireTypes = map[protoreflect.Kind]wire.Type{
diff --git a/proto/encode_test.go b/proto/encode_test.go
index 6ed5250..3f015b7 100644
--- a/proto/encode_test.go
+++ b/proto/encode_test.go
@@ -7,11 +7,11 @@
"testing"
protoV1 "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
"github.com/google/go-cmp/cmp"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
- test3pb "github.com/golang/protobuf/v2/internal/testprotos/test3"
+ test3pb "google.golang.org/protobuf/internal/testprotos/test3"
)
func TestEncode(t *testing.T) {
diff --git a/proto/equal.go b/proto/equal.go
index 3931b1a..a5a0acb 100644
--- a/proto/equal.go
+++ b/proto/equal.go
@@ -7,7 +7,7 @@
import (
"bytes"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// Equal returns true of two messages are equal.
diff --git a/proto/equal_test.go b/proto/equal_test.go
index 1c3915c..637edae 100644
--- a/proto/equal_test.go
+++ b/proto/equal_test.go
@@ -7,11 +7,11 @@
import (
"testing"
- "github.com/golang/protobuf/v2/internal/encoding/pack"
- "github.com/golang/protobuf/v2/internal/scalar"
- testpb "github.com/golang/protobuf/v2/internal/testprotos/test"
- test3pb "github.com/golang/protobuf/v2/internal/testprotos/test3"
- "github.com/golang/protobuf/v2/proto"
+ "google.golang.org/protobuf/internal/encoding/pack"
+ "google.golang.org/protobuf/internal/scalar"
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
+ test3pb "google.golang.org/protobuf/internal/testprotos/test3"
+ "google.golang.org/protobuf/proto"
)
func TestEqual(t *testing.T) {
diff --git a/proto/isinit.go b/proto/isinit.go
index 01f956d..22430d9 100644
--- a/proto/isinit.go
+++ b/proto/isinit.go
@@ -8,8 +8,8 @@
"bytes"
"fmt"
- "github.com/golang/protobuf/v2/internal/errors"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/errors"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// IsInitialized returns an error if any required fields in m are not set.
diff --git a/proto/isinit_test.go b/proto/isinit_test.go
index 951b95f..232202f 100644
--- a/proto/isinit_test.go
+++ b/proto/isinit_test.go
@@ -8,10 +8,10 @@
"fmt"
"testing"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
- testpb "github.com/golang/protobuf/v2/internal/testprotos/test"
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
)
func TestIsInitializedErrors(t *testing.T) {
diff --git a/proto/proto.go b/proto/proto.go
index da2a22c..de7f2be 100644
--- a/proto/proto.go
+++ b/proto/proto.go
@@ -5,8 +5,8 @@
package proto
import (
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// Message is the top-level interface that all messages must implement.
diff --git a/proto/proto_methods.go b/proto/proto_methods.go
index 360a1ee..61349f4 100644
--- a/proto/proto_methods.go
+++ b/proto/proto_methods.go
@@ -7,7 +7,7 @@
package proto
-import "github.com/golang/protobuf/v2/runtime/protoiface"
+import "google.golang.org/protobuf/runtime/protoiface"
func protoMethods(m Message) *protoiface.Methods {
if x, ok := m.(protoiface.Methoder); ok {
diff --git a/proto/proto_reflect.go b/proto/proto_reflect.go
index b282f3c..829b334 100644
--- a/proto/proto_reflect.go
+++ b/proto/proto_reflect.go
@@ -7,7 +7,7 @@
package proto
-import "github.com/golang/protobuf/v2/runtime/protoiface"
+import "google.golang.org/protobuf/runtime/protoiface"
func protoMethods(m Message) *protoiface.Methods {
return nil
diff --git a/proto/size.go b/proto/size.go
index e2a75b6..9a982cb 100644
--- a/proto/size.go
+++ b/proto/size.go
@@ -7,8 +7,8 @@
import (
"fmt"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// Size returns the size in bytes of the wire-format encoding of m.
diff --git a/proto/size_gen.go b/proto/size_gen.go
index d71c7c7..3e96e45 100644
--- a/proto/size_gen.go
+++ b/proto/size_gen.go
@@ -7,8 +7,8 @@
package proto
import (
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
func sizeSingular(num wire.Number, kind protoreflect.Kind, v protoreflect.Value) int {
diff --git a/protogen/names.go b/protogen/names.go
index 5cf953c..ae41a5a 100644
--- a/protogen/names.go
+++ b/protogen/names.go
@@ -12,7 +12,7 @@
"unicode"
"unicode/utf8"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// A GoIdent is a Go identifier, consisting of a name and import path.
diff --git a/protogen/protogen.go b/protogen/protogen.go
index d84c6d0..ceaece0 100644
--- a/protogen/protogen.go
+++ b/protogen/protogen.go
@@ -28,16 +28,16 @@
"strconv"
"strings"
- "github.com/golang/protobuf/v2/encoding/textpb"
- "github.com/golang/protobuf/v2/internal/fieldnum"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/proto"
- "github.com/golang/protobuf/v2/reflect/protodesc"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/internal/fieldnum"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
+ "google.golang.org/protobuf/reflect/protodesc"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
- pluginpb "github.com/golang/protobuf/v2/types/plugin"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
+ pluginpb "google.golang.org/protobuf/types/plugin"
)
// Run executes a function as a protoc plugin.
diff --git a/protogen/protogen_test.go b/protogen/protogen_test.go
index f3852d7..d4da172 100644
--- a/protogen/protogen_test.go
+++ b/protogen/protogen_test.go
@@ -9,12 +9,12 @@
"fmt"
"testing"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
"github.com/google/go-cmp/cmp"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
- pluginpb "github.com/golang/protobuf/v2/types/plugin"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
+ pluginpb "google.golang.org/protobuf/types/plugin"
)
func TestPluginParameters(t *testing.T) {
diff --git a/reflect/protodesc/protodesc.go b/reflect/protodesc/protodesc.go
index 7bc2191..696f904 100644
--- a/reflect/protodesc/protodesc.go
+++ b/reflect/protodesc/protodesc.go
@@ -9,13 +9,13 @@
import (
"strings"
- "github.com/golang/protobuf/v2/internal/encoding/defval"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/internal/prototype"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/encoding/defval"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/internal/prototype"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
// TODO: Should we be responsible for validating other parts of the descriptor
diff --git a/reflect/protodesc/protodesc_test.go b/reflect/protodesc/protodesc_test.go
index 9da39a8..bbaaef5 100644
--- a/reflect/protodesc/protodesc_test.go
+++ b/reflect/protodesc/protodesc_test.go
@@ -4,10 +4,10 @@
"strings"
"testing"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/reflect/protoregistry"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
// Tests validation logic for malformed descriptors.
diff --git a/reflect/protodesc/toproto.go b/reflect/protodesc/toproto.go
index cba59db..695cc99 100644
--- a/reflect/protodesc/toproto.go
+++ b/reflect/protodesc/toproto.go
@@ -6,10 +6,10 @@
import (
"fmt"
- "github.com/golang/protobuf/v2/internal/encoding/defval"
- "github.com/golang/protobuf/v2/internal/scalar"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+ "google.golang.org/protobuf/internal/encoding/defval"
+ "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ descriptorpb "google.golang.org/protobuf/types/descriptor"
)
// ToFileDescriptorProto converts a FileDescriptor to a
diff --git a/reflect/protoreflect/proto.go b/reflect/protoreflect/proto.go
index c8c7b44..fef5145 100644
--- a/reflect/protoreflect/proto.go
+++ b/reflect/protoreflect/proto.go
@@ -30,8 +30,8 @@
"regexp"
"strings"
- "github.com/golang/protobuf/v2/internal/encoding/wire"
- "github.com/golang/protobuf/v2/internal/pragma"
+ "google.golang.org/protobuf/internal/encoding/wire"
+ "google.golang.org/protobuf/internal/pragma"
)
type doNotImplement pragma.DoNotImplement
diff --git a/reflect/protoreflect/value.go b/reflect/protoreflect/value.go
index 36baf85..318ab14 100644
--- a/reflect/protoreflect/value.go
+++ b/reflect/protoreflect/value.go
@@ -4,7 +4,7 @@
package protoreflect
-import "github.com/golang/protobuf/v2/internal/encoding/wire"
+import "google.golang.org/protobuf/internal/encoding/wire"
// Enum is a reflection interface for a concrete enum value,
// which provides type information and a getter for the enum number.
diff --git a/reflect/protoreflect/value_pure.go b/reflect/protoreflect/value_pure.go
index a52ce47..918e685 100644
--- a/reflect/protoreflect/value_pure.go
+++ b/reflect/protoreflect/value_pure.go
@@ -6,7 +6,7 @@
package protoreflect
-import "github.com/golang/protobuf/v2/internal/pragma"
+import "google.golang.org/protobuf/internal/pragma"
type valueType int
diff --git a/reflect/protoreflect/value_unsafe.go b/reflect/protoreflect/value_unsafe.go
index 64e0419..c45debd 100644
--- a/reflect/protoreflect/value_unsafe.go
+++ b/reflect/protoreflect/value_unsafe.go
@@ -9,7 +9,7 @@
import (
"unsafe"
- "github.com/golang/protobuf/v2/internal/pragma"
+ "google.golang.org/protobuf/internal/pragma"
)
type (
diff --git a/reflect/protoregistry/registry.go b/reflect/protoregistry/registry.go
index 9d021de..d3ea3fc 100644
--- a/reflect/protoregistry/registry.go
+++ b/reflect/protoregistry/registry.go
@@ -20,8 +20,8 @@
"reflect"
"strings"
- "github.com/golang/protobuf/v2/internal/errors"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/internal/errors"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
// TODO: Perhaps Register should record the frame of where the function was
diff --git a/reflect/protoregistry/registry_test.go b/reflect/protoregistry/registry_test.go
index c20f132..5da8f3d 100644
--- a/reflect/protoregistry/registry_test.go
+++ b/reflect/protoregistry/registry_test.go
@@ -12,13 +12,13 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
- pimpl "github.com/golang/protobuf/v2/internal/impl"
- ptype "github.com/golang/protobuf/v2/internal/prototype"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
- preg "github.com/golang/protobuf/v2/reflect/protoregistry"
+ pimpl "google.golang.org/protobuf/internal/impl"
+ ptype "google.golang.org/protobuf/internal/prototype"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
+ preg "google.golang.org/protobuf/reflect/protoregistry"
- test2pb "github.com/golang/protobuf/v2/internal/testprotos/test"
- testpb "github.com/golang/protobuf/v2/reflect/protoregistry/testprotos"
+ test2pb "google.golang.org/protobuf/internal/testprotos/test"
+ testpb "google.golang.org/protobuf/reflect/protoregistry/testprotos"
)
func TestFiles(t *testing.T) {
diff --git a/reflect/protoregistry/testprotos/test.pb.go b/reflect/protoregistry/testprotos/test.pb.go
index c34bcc1..5f8495b 100644
--- a/reflect/protoregistry/testprotos/test.pb.go
+++ b/reflect/protoregistry/testprotos/test.pb.go
@@ -4,10 +4,10 @@
package testprotos
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -417,11 +417,11 @@
0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
0x31, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x52, 0x0c, 0x6d,
- 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x40, 0x5a, 0x3e, 0x67,
- 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
- 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x65, 0x66,
- 0x6c, 0x65, 0x63, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74,
- 0x72, 0x79, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
+ 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x3d, 0x5a, 0x3b, 0x67,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x72, 0x65, 0x66, 0x6c, 0x65, 0x63,
+ 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f,
+ 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
}
var (
diff --git a/reflect/protoregistry/testprotos/test.proto b/reflect/protoregistry/testprotos/test.proto
index 5a4c77b..76c1c05 100644
--- a/reflect/protoregistry/testprotos/test.proto
+++ b/reflect/protoregistry/testprotos/test.proto
@@ -6,7 +6,7 @@
syntax = "proto2";
package testprotos;
-option go_package = "github.com/golang/protobuf/v2/reflect/protoregistry/testprotos";
+option go_package = "google.golang.org/protobuf/reflect/protoregistry/testprotos";
message Message1 {
extensions 10 to max;
diff --git a/runtime/protoiface/legacy.go b/runtime/protoiface/legacy.go
index 90edaf9..c560ba8 100644
--- a/runtime/protoiface/legacy.go
+++ b/runtime/protoiface/legacy.go
@@ -10,7 +10,7 @@
package protoiface
import (
- "github.com/golang/protobuf/v2/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoreflect"
)
type MessageV1 interface {
diff --git a/runtime/protoiface/methods.go b/runtime/protoiface/methods.go
index fe17ca7..0ba9d5c 100644
--- a/runtime/protoiface/methods.go
+++ b/runtime/protoiface/methods.go
@@ -5,9 +5,9 @@
package protoiface
import (
- "github.com/golang/protobuf/v2/internal/pragma"
- "github.com/golang/protobuf/v2/reflect/protoreflect"
- "github.com/golang/protobuf/v2/reflect/protoregistry"
+ "google.golang.org/protobuf/internal/pragma"
+ "google.golang.org/protobuf/reflect/protoreflect"
+ "google.golang.org/protobuf/reflect/protoregistry"
)
// Methoder is an optional interface implemented by generated messages to
diff --git a/runtime/protoimpl/impl.go b/runtime/protoimpl/impl.go
index 617aed6..ccdc91d 100644
--- a/runtime/protoimpl/impl.go
+++ b/runtime/protoimpl/impl.go
@@ -12,8 +12,8 @@
package protoimpl
import (
- "github.com/golang/protobuf/v2/internal/fileinit"
- "github.com/golang/protobuf/v2/internal/impl"
+ "google.golang.org/protobuf/internal/fileinit"
+ "google.golang.org/protobuf/internal/impl"
)
// Version is the current minor version of the package.
@@ -29,7 +29,7 @@
// needs to be updated to a more recent version.
//
// This package can be upgraded by running:
- // go get -u github.com/golang/protobuf/v2/...
+ // go get -u google.golang.org/protobuf/...
//
// Example usage by generated code:
// const _ = protoimpl.EnforceVersion(protoimpl.Version - genVersion)
diff --git a/runtime/protolegacy/legacy.go b/runtime/protolegacy/legacy.go
index 1544a50..b9bad19 100644
--- a/runtime/protolegacy/legacy.go
+++ b/runtime/protolegacy/legacy.go
@@ -11,6 +11,6 @@
// usages of this package are not the author's responsibility.
package protolegacy
-import "github.com/golang/protobuf/v2/internal/legacy"
+import "google.golang.org/protobuf/internal/legacy"
var X legacy.Export
diff --git a/testing/prototest/prototest.go b/testing/prototest/prototest.go
index 058ef24..c9f7c7a 100644
--- a/testing/prototest/prototest.go
+++ b/testing/prototest/prototest.go
@@ -12,9 +12,9 @@
"sort"
"testing"
- textpb "github.com/golang/protobuf/v2/encoding/textpb"
- "github.com/golang/protobuf/v2/proto"
- pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ textpb "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/proto"
+ pref "google.golang.org/protobuf/reflect/protoreflect"
)
// TestMessage runs the provided message through a series of tests
diff --git a/testing/prototest/prototest_test.go b/testing/prototest/prototest_test.go
index 5e4902f..82eb5b2 100644
--- a/testing/prototest/prototest_test.go
+++ b/testing/prototest/prototest_test.go
@@ -8,10 +8,10 @@
"fmt"
"testing"
- testpb "github.com/golang/protobuf/v2/internal/testprotos/test"
- test3pb "github.com/golang/protobuf/v2/internal/testprotos/test3"
- "github.com/golang/protobuf/v2/proto"
- "github.com/golang/protobuf/v2/testing/prototest"
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
+ test3pb "google.golang.org/protobuf/internal/testprotos/test3"
+ "google.golang.org/protobuf/proto"
+ "google.golang.org/protobuf/testing/prototest"
)
func Test(t *testing.T) {
diff --git a/types/descriptor/descriptor.pb.go b/types/descriptor/descriptor.pb.go
index 38d10fd..585d46c 100644
--- a/types/descriptor/descriptor.pb.go
+++ b/types/descriptor/descriptor.pb.go
@@ -4,10 +4,10 @@
package descriptor_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -3199,16 +3199,16 @@
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x04,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x42, 0x90, 0x01, 0x0a, 0x13, 0x63, 0x6f,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x42, 0x8d, 0x01, 0x0a, 0x13, 0x63, 0x6f,
0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x42, 0x10, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
- 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
- 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72,
- 0x69, 0x70, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
- 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa,
- 0x02, 0x1a, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2e, 0x52, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+ 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a, 0x3c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
+ 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+ 0x6f, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1a, 0x47,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52,
+ 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
}
var (
diff --git a/types/known/any.pb.go b/types/known/any.pb.go
index ee1396c..0fbafc2 100644
--- a/types/known/any.pb.go
+++ b/types/known/any.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -178,15 +178,15 @@
0x41, 0x6e, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x42, 0x7f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+ 0x61, 0x6c, 0x75, 0x65, 0x42, 0x7c, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x08, 0x41, 0x6e, 0x79,
- 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
- 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f,
- 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02,
- 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72,
- 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e,
- 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+ 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b,
+ 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x03, 0x47, 0x50,
+ 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70,
+ 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/api.pb.go b/types/known/api.pb.go
index cdd0563..30a4e1c 100644
--- a/types/known/api.pb.go
+++ b/types/known/api.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -407,16 +407,15 @@
0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x22, 0x2f, 0x0a, 0x05, 0x4d, 0x69, 0x78, 0x69, 0x6e,
0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x42, 0x7f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e,
+ 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x42, 0x7c, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42,
- 0x08, 0x41, 0x70, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74,
- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73,
- 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c,
- 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b,
- 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x08, 0x41, 0x70, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e,
+ 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2,
+ 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77,
+ 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/duration.pb.go b/types/known/duration.pb.go
index 2783593..281a6c9 100644
--- a/types/known/duration.pb.go
+++ b/types/known/duration.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -138,16 +138,16 @@
0x66, 0x22, 0x3a, 0x0a, 0x08, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a,
0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42, 0x87, 0x01,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42, 0x84, 0x01,
0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x0d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50,
- 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
- 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
- 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77,
- 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01,
- 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
- 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f,
- 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67,
+ 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b,
+ 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03,
+ 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54,
+ 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/empty.pb.go b/types/known/empty.pb.go
index 3b1a662..e6fdc03 100644
--- a/types/known/empty.pb.go
+++ b/types/known/empty.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -59,16 +59,16 @@
0x0a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x67,
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x22, 0x07,
- 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x84, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e,
+ 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x81, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42,
- 0x0a, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67,
- 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
- 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70,
- 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e,
- 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
- 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x0a, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f,
+ 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c,
+ 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/field_mask.pb.go b/types/known/field_mask.pb.go
index 3174b91..e867db5 100644
--- a/types/known/field_mask.pb.go
+++ b/types/known/field_mask.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -258,16 +258,16 @@
0x74, 0x6f, 0x12, 0x0f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x62, 0x75, 0x66, 0x22, 0x21, 0x0a, 0x09, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b,
0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
- 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x42, 0x88, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67,
+ 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x42, 0x85, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67,
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x0e,
0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
- 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f,
- 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77,
- 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42,
- 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62,
- 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65,
- 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
+ 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70,
+ 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+ 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/source_context.pb.go b/types/known/source_context.pb.go
index 5538d09..b6e61dd 100644
--- a/types/known/source_context.pb.go
+++ b/types/known/source_context.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -63,16 +63,16 @@
0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x22, 0x2c, 0x0a, 0x0d, 0x53, 0x6f, 0x75, 0x72, 0x63,
0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65,
0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c,
- 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x89, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f,
+ 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x86, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f,
0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x12, 0x53,
0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x50, 0x72, 0x6f, 0x74,
- 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
- 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
- 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b,
- 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42,
- 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62,
- 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65,
- 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61,
+ 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
+ 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77,
+ 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+ 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/struct.pb.go b/types/known/struct.pb.go
index a2148c6..1721cb0 100644
--- a/types/known/struct.pb.go
+++ b/types/known/struct.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -343,16 +343,16 @@
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56,
0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2a, 0x1b, 0x0a, 0x09,
0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x55, 0x4c,
- 0x4c, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10, 0x00, 0x42, 0x85, 0x01, 0x0a, 0x13, 0x63, 0x6f,
+ 0x4c, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10, 0x00, 0x42, 0x82, 0x01, 0x0a, 0x13, 0x63, 0x6f,
0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
- 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f,
- 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77,
- 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42,
- 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62,
- 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65,
- 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
+ 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70,
+ 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+ 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/timestamp.pb.go b/types/known/timestamp.pb.go
index 3201e48..827d5fe 100644
--- a/types/known/timestamp.pb.go
+++ b/types/known/timestamp.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -159,16 +159,15 @@
0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
0x52, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e,
0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42,
- 0x88, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+ 0x85, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x0e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
- 0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75,
- 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b,
- 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67,
- 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c,
- 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x33,
+ 0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77,
+ 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01,
+ 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+ 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f,
+ 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/type.pb.go b/types/known/type.pb.go
index 98bba0c..f2588a7 100644
--- a/types/known/type.pb.go
+++ b/types/known/type.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -722,16 +722,16 @@
0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x2e, 0x0a,
0x06, 0x53, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x59, 0x4e, 0x54, 0x41,
0x58, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x32, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x59,
- 0x4e, 0x54, 0x41, 0x58, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x33, 0x10, 0x01, 0x42, 0x83, 0x01,
+ 0x4e, 0x54, 0x41, 0x58, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x33, 0x10, 0x01, 0x42, 0x80, 0x01,
0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x09, 0x54, 0x79, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
- 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67,
- 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76,
- 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e,
- 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47,
- 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
- 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79,
- 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e,
+ 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74,
+ 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e,
+ 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa,
+ 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73,
+ 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/known/wrappers.pb.go b/types/known/wrappers.pb.go
index 143bd9c..9cc022a 100644
--- a/types/known/wrappers.pb.go
+++ b/types/known/wrappers.pb.go
@@ -4,10 +4,10 @@
package known_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
)
@@ -426,16 +426,16 @@
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x22, 0x22, 0x0a, 0x0a, 0x42, 0x79, 0x74, 0x65, 0x73, 0x56, 0x61, 0x6c,
0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x87, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d,
+ 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x84, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d,
0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
0x42, 0x0d, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
- 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f,
- 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x32,
- 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f,
- 0x77, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50,
- 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
- 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70,
- 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+ 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79,
+ 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x3b, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02,
+ 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+ 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62,
+ 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/types/plugin/plugin.pb.go b/types/plugin/plugin.pb.go
index e7606d5..f968d59 100644
--- a/types/plugin/plugin.pb.go
+++ b/types/plugin/plugin.pb.go
@@ -4,11 +4,11 @@
package plugin_proto
import (
- protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
- protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
- protoiface "github.com/golang/protobuf/v2/runtime/protoiface"
- protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
- descriptor "github.com/golang/protobuf/v2/types/descriptor"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ protoiface "google.golang.org/protobuf/runtime/protoiface"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ descriptor "google.golang.org/protobuf/types/descriptor"
sync "sync"
)
@@ -360,13 +360,13 @@
0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x73,
0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63,
0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f,
- 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x65, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f,
+ 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x62, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f,
0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d,
0x70, 0x69, 0x6c, 0x65, 0x72, 0x42, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x50, 0x72, 0x6f,
- 0x74, 0x6f, 0x73, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
- 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
- 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x3b,
- 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x74, 0x6f, 0x73, 0x5a, 0x34, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61,
+ 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
+ 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x3b, 0x70, 0x6c, 0x75,
+ 0x67, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
}
var (
