Skip to content

Commit 2870568

Browse files
kennethye1kennethye1
committed
update proto library to google.golang.org/protobuf
1 parent 7e3e91d commit 2870568

File tree

91 files changed

+103
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+103
-99
lines changed

‎appengine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"context"
1313
"net/http"
1414

15-
"github.com/golang/protobuf/proto"
15+
"google.golang.org/protobuf/proto"
1616

1717
"google.golang.org/appengine/internal"
1818
)

‎blobstore/blobstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26-
"github.com/golang/protobuf/proto"
2726
"golang.org/x/text/encoding/htmlindex"
27+
"google.golang.org/protobuf/proto"
2828

2929
"google.golang.org/appengine"
3030
"google.golang.org/appengine/datastore"

‎blobstore/read.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"os"
1313
"sync"
1414

15-
"github.com/golang/protobuf/proto"
15+
"google.golang.org/protobuf/proto"
1616

1717
"google.golang.org/appengine"
1818
"google.golang.org/appengine/internal"

‎datastore/datastore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"fmt"
1111
"reflect"
1212

13-
"github.com/golang/protobuf/proto"
13+
"google.golang.org/protobuf/proto"
1414

1515
"google.golang.org/appengine"
1616
"google.golang.org/appengine/internal"

‎datastore/internal/cloudkey/cloudkey.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"errors"
1313
"strings"
1414

15-
"github.com/golang/protobuf/proto"
1615
cloudpb "google.golang.org/appengine/datastore/internal/cloudpb"
16+
"google.golang.org/protobuf/proto"
1717
)
1818

1919
/////////////////////////////////////////////////////////////////////

‎datastore/internal/cloudpb/entity.pb.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package cloudpb
1010
import (
1111
"fmt"
1212

13-
"github.com/golang/protobuf/proto"
13+
"google.golang.org/protobuf/proto"
1414
)
1515

1616
// A partition ID identifies a grouping of entities. The grouping is always

‎datastore/key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"strconv"
1515
"strings"
1616

17-
"github.com/golang/protobuf/proto"
17+
"google.golang.org/protobuf/proto"
1818

1919
"google.golang.org/appengine/internal"
2020
pb "google.golang.org/appengine/internal/datastore"

‎datastore/load.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"strings"
1111
"time"
1212

13-
"github.com/golang/protobuf/proto"
1413
"google.golang.org/appengine"
1514
pb "google.golang.org/appengine/internal/datastore"
15+
"google.golang.org/protobuf/proto"
1616
)
1717

1818
var (

‎datastore/load_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"reflect"
99
"testing"
1010

11-
proto "github.com/golang/protobuf/proto"
1211
pb "google.golang.org/appengine/internal/datastore"
12+
proto "google.golang.org/protobuf/proto"
1313
)
1414

1515
type Simple struct {

‎datastore/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"reflect"
1414
"strings"
1515

16-
"github.com/golang/protobuf/proto"
16+
"google.golang.org/protobuf/proto"
1717

1818
"google.golang.org/appengine/internal"
1919
pb "google.golang.org/appengine/internal/datastore"

‎datastore/query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"testing"
1313

14-
"github.com/golang/protobuf/proto"
14+
"google.golang.org/protobuf/proto"
1515

1616
"google.golang.org/appengine/internal"
1717
"google.golang.org/appengine/internal/aetesting"

‎datastore/save.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"reflect"
1212
"time"
1313

14-
"github.com/golang/protobuf/proto"
14+
"google.golang.org/protobuf/proto"
1515

1616
"google.golang.org/appengine"
1717
pb "google.golang.org/appengine/internal/datastore"

‎delay/delay_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"reflect"
1818
"testing"
1919

20-
"github.com/golang/protobuf/proto"
20+
"google.golang.org/protobuf/proto"
2121

2222
"google.golang.org/appengine/internal"
2323
"google.golang.org/appengine/taskqueue"

‎go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module google.golang.org/appengine
33
go 1.11
44

55
require (
6-
github.com/golang/protobuf v1.5.2
7-
golang.org/x/text v0.3.8
8-
google.golang.org/protobuf v1.26.0
6+
golang.org/x/text v0.13.0
7+
google.golang.org/protobuf v1.31.0
98
)

‎go.sum

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,42 @@
11
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
2-
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
3-
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
42
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
53
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
64
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
75
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
86
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
97
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
8+
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
109
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1110
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
1211
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
12+
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
1313
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1414
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15+
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1516
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1617
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1718
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1819
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1920
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2022
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
2123
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
24+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
2225
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
2326
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
2427
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
2528
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
2629
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
30+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
31+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
32+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
2733
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
2834
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
2935
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
36+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
3037
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3138
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
3239
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3340
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
34-
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
35-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
41+
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
42+
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

‎internal/aetesting/fake.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"reflect"
1414
"testing"
1515

16-
"github.com/golang/protobuf/proto"
16+
"google.golang.org/protobuf/proto"
1717

1818
"google.golang.org/appengine/internal"
1919
)

‎internal/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"sync/atomic"
2626
"time"
2727

28-
"github.com/golang/protobuf/proto"
28+
"google.golang.org/protobuf/proto"
2929

3030
basepb "google.golang.org/appengine/internal/base"
3131
logpb "google.golang.org/appengine/internal/log"

‎internal/api_classic.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"appengine_internal"
1919
basepb "appengine_internal/base"
2020

21-
"github.com/golang/protobuf/proto"
21+
"google.golang.org/protobuf/proto"
2222
)
2323

2424
var contextKey = "holds an appengine.Context"

‎internal/api_common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"errors"
1010
"os"
1111

12-
"github.com/golang/protobuf/proto"
12+
"google.golang.org/protobuf/proto"
1313
)
1414

1515
type ctxKey string

‎internal/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"testing"
2626
"time"
2727

28-
"github.com/golang/protobuf/proto"
28+
"google.golang.org/protobuf/proto"
2929

3030
basepb "google.golang.org/appengine/internal/base"
3131
remotepb "google.golang.org/appengine/internal/remote_api"

‎internal/app_identity/app_identity_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/base/api_base.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/blobstore/blobstore_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/capability/capability_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/channel/channel_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/datastore/datastore_v3.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/image/images_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/internal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package internal
1111
import (
1212
"fmt"
1313

14-
"github.com/golang/protobuf/proto"
14+
"google.golang.org/protobuf/proto"
1515

1616
remotepb "google.golang.org/appengine/internal/remote_api"
1717
)

‎internal/log/log_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/mail/mail_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/modules/modules_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/remote_api/remote_api.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/search/search.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/socket/socket_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/system/system_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/taskqueue/taskqueue_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/transaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"errors"
1212
"reflect"
1313

14-
"github.com/golang/protobuf/proto"
14+
"google.golang.org/protobuf/proto"
1515

1616
basepb "google.golang.org/appengine/internal/base"
1717
pb "google.golang.org/appengine/internal/datastore"

‎internal/urlfetch/urlfetch_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/user/user_service.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)