rewire protoc-gen-gogo

Makefile

@@ -181,7 +181,7 @@ contributors:
 js:
 ifeq (go1.12, $(findstring go1.12, $(GO_VERSION)))
 	go get -u github.com/gopherjs/gopherjs
-	gopherjs build github.com/gogo/protobuf/protoc-gen-gogo
+	gopherjs build github.com/tron-us/protobuf/protoc-gen-gogo
 endif
 
 purego:

Readme.md

@@ -153,7 +153,7 @@ Install protoc-gen-gogo:
 
     go get github.com/gogo/protobuf/proto
     go get github.com/gogo/protobuf/jsonpb
-    go get github.com/gogo/protobuf/protoc-gen-gogo
+    go get github.com/tron-us/protobuf/protoc-gen-gogo
     go get github.com/gogo/protobuf/gogoproto
 
 ## GRPC

gogoproto/Makefile

@@ -27,8 +27,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
-	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:../../../../ --proto_path=../../../../:../protobuf/:. *.proto
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
+	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:../../../../ --proto_path=../../../../:../protobuf/:. *.proto
 
 restore:
 	cp gogo.pb.golden gogo.pb.go

gogoproto/gogo.pb.golden

@@ -7,7 +7,7 @@ package gogoproto
 import proto "github.com/gogo/protobuf/proto"
 import json "encoding/json"
 import math "math"
-import google_protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+import google_protobuf "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 
 // Reference proto, json, and math imports to suppress error if they are not otherwise used.
 var _ = proto.Marshal

gogoproto/helper.go

@@ -28,7 +28,7 @@
 
 package gogoproto
 
-import google_protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+import google_protobuf "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 import proto "github.com/gogo/protobuf/proto"
 
 func IsEmbed(field *google_protobuf.FieldDescriptorProto) bool {

plugin/compare/compare.go

@@ -31,8 +31,8 @@ package compare
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

plugin/description/description.go

@@ -81,7 +81,7 @@ import (
 	"fmt"
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
@@ -107,7 +107,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 	localName := generator.FileName(file)
 
 	p.PluginImports = generator.NewPluginImports(p.Generator)
-	descriptorPkg := p.NewImport("github.com/gogo/protobuf/protoc-gen-gogo/descriptor")
+	descriptorPkg := p.NewImport("github.com/tron-us/protobuf/protoc-gen-gogo/descriptor")
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
 	gzipPkg := p.NewImport("compress/gzip")
 	bytesPkg := p.NewImport("bytes")

plugin/equal/equal.go

@@ -159,8 +159,8 @@ package equal
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

plugin/marshalto/marshalto.go

@@ -151,8 +151,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

plugin/populate/populate.go

@@ -91,8 +91,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

plugin/size/size.go

@@ -130,8 +130,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

plugin/unmarshal/unmarshal.go

@@ -181,7 +181,7 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

proto/all_test.go

@@ -49,7 +49,7 @@ import (
 	. "github.com/gogo/protobuf/proto"
 	pb3 "github.com/gogo/protobuf/proto/proto3_proto"
 	. "github.com/gogo/protobuf/proto/test_proto"
-	descriptorpb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptorpb "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 var globalO *Buffer

protobuf/Makefile

@@ -2,7 +2,7 @@ VERSION=3.9.1
 URL="https://raw.githubusercontent.com/protocolbuffers/protobuf/v${VERSION}/src/google/protobuf"
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogotypes
+	go install github.com/tron-us/protobuf/protoc-gen-gogotypes
 	go install github.com/gogo/protobuf/protoc-min-version
 
 	protoc-min-version \

protoc-gen-gogo/descriptor/Makefile

@@ -30,7 +30,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-gen-gostring
 	protoc --gogo_out=. -I=../../protobuf/google/protobuf ../../protobuf/google/protobuf/descriptor.proto
 	protoc --gostring_out=. -I=../../protobuf/google/protobuf ../../protobuf/google/protobuf/descriptor.proto

protoc-gen-gogo/descriptor/descriptor_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	tpb "github.com/gogo/protobuf/proto/test_proto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func TestMessage(t *testing.T) {

protoc-gen-gogo/generator/generator.go

@@ -64,9 +64,9 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator/internal/remap"
+	plugin "github.com/tron-us/protobuf/protoc-gen-gogo/plugin"
 )
 
 // generatedCodeVersion indicates a version of the generated code.

protoc-gen-gogo/generator/helper.go

@@ -38,8 +38,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
+	plugin "github.com/tron-us/protobuf/protoc-gen-gogo/plugin"
 )
 
 func (d *FileDescriptor) Messages() []*Descriptor {

protoc-gen-gogo/generator/name_test.go

@@ -34,7 +34,7 @@ package generator
 import (
 	"testing"
 
-	"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func TestCamelCase(t *testing.T) {

protoc-gen-gogo/grpc/grpc.go

@@ -39,7 +39,7 @@ import (
 	"strconv"
 	"strings"
 
-	pb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	pb "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 

protoc-gen-gogo/plugin/Makefile

@@ -33,5 +33,5 @@
 # at src/google/protobuf/compiler/plugin.proto
 # Also we need to fix an import.
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
-	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. -I=../../protobuf/google/protobuf/compiler/:../../protobuf/ ../../protobuf/google/protobuf/compiler/plugin.proto
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
+	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:. -I=../../protobuf/google/protobuf/compiler/:../../protobuf/ ../../protobuf/google/protobuf/compiler/plugin.proto

protoc-gen-gogo/testdata/deprecated/deprecated.proto

@@ -34,7 +34,7 @@ syntax = "proto3";
 // package deprecated contains only deprecated messages and services.
 package deprecated;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/deprecated";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/deprecated";
 
 option deprecated = true; // file-level deprecation
 

protoc-gen-gogo/testdata/extension_base/extension_base.proto

@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package extension_base;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_base";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_base";
 
 message BaseMessage {
   optional int32 height = 1;

protoc-gen-gogo/testdata/extension_extra/extension_extra.proto

@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package extension_extra;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_extra";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_extra";
 
 message ExtraMessage {
   optional int32 width = 1;

protoc-gen-gogo/testdata/extension_test.go

@@ -39,8 +39,8 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
-	base "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_base"
-	user "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_user"
+	base "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_base"
+	user "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_user"
 )
 
 func TestSingleFieldExtension(t *testing.T) {