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/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) {