Update protobuf version (rebased from 6d25d51519a65220a50042b447f02075d848faf9)

Some change is not adopted since it would break the code base. These changes will be reintroduced at a later date.

app/reverse/portal.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v4/common"
 	"github.com/v2fly/v2ray-core/v4/common/buf"

common/serial/typed_message.go

@@ -2,9 +2,8 @@ package serial
 
 import (
 	"errors"
-	"reflect"
-
 	"github.com/golang/protobuf/proto"
+	"reflect"
 )
 
 // ToTypedMessage converts a proto Message into TypedMessage.

infra/conf/trojan.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v4/common/net"
 	"github.com/v2fly/v2ray-core/v4/common/protocol"

proxy/vless/encoding/addons.go

@@ -6,7 +6,7 @@ package encoding
 import (
 	"io"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v4/common/buf"
 	"github.com/v2fly/v2ray-core/v4/common/errors"

testing/scenarios/common.go

@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	core "github.com/v2fly/v2ray-core/v4"
 	"github.com/v2fly/v2ray-core/v4/app/dispatcher"

v2ray_test.go

@@ -3,7 +3,7 @@ package core_test
 import (
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	. "github.com/v2fly/v2ray-core/v4"
 	"github.com/v2fly/v2ray-core/v4/app/dispatcher"