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/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.