Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update library package to point to google.golang.org/protobuf/proto #326

Closed
wants to merge 1 commit into from
Closed

Update library package to point to google.golang.org/protobuf/proto #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appengine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"context"
"net/http"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine/internal"
)
Expand Down
2 changes: 1 addition & 1 deletion blobstore/blobstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"
"time"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
"golang.org/x/text/encoding/htmlindex"

"google.golang.org/appengine"
Expand Down
2 changes: 1 addition & 1 deletion blobstore/read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"os"
"sync"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine"
"google.golang.org/appengine/internal"
Expand Down
2 changes: 1 addition & 1 deletion datastore/datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"fmt"
"reflect"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine"
"google.golang.org/appengine/internal"
Expand Down
2 changes: 1 addition & 1 deletion datastore/internal/cloudkey/cloudkey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"errors"
"strings"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
cloudpb "google.golang.org/appengine/datastore/internal/cloudpb"
)

Expand Down
2 changes: 1 addition & 1 deletion datastore/internal/cloudpb/entity.pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import (
"fmt"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
)

// A partition ID identifies a grouping of entities. The grouping is always
Expand Down Expand Up @@ -44,7 +44,7 @@
}

func (m *PartitionId) Reset() { *m = PartitionId{} }
func (m *PartitionId) String() string { return proto.CompactTextString(m) }

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.CompactTextString

Check failure on line 47 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.CompactTextString
func (*PartitionId) ProtoMessage() {}
func (*PartitionId) Descriptor() ([]byte, []int) {
return fileDescriptor_entity_096a297364b049a5, []int{0}
Expand All @@ -65,7 +65,7 @@
xxx_messageInfo_PartitionId.DiscardUnknown(m)
}

var xxx_messageInfo_PartitionId proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.InternalMessageInfo

Check failure on line 68 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.InternalMessageInfo

func (m *PartitionId) GetProjectId() string {
if m != nil {
Expand Down Expand Up @@ -113,7 +113,7 @@
}

func (m *Key) Reset() { *m = Key{} }
func (m *Key) String() string { return proto.CompactTextString(m) }

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.CompactTextString

Check failure on line 116 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.CompactTextString
func (*Key) ProtoMessage() {}
func (*Key) Descriptor() ([]byte, []int) {
return fileDescriptor_entity_096a297364b049a5, []int{1}
Expand Down Expand Up @@ -156,7 +156,7 @@
}

func (m *Key_PathElement) Reset() { *m = Key_PathElement{} }
func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.CompactTextString

Check failure on line 159 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.CompactTextString
func (*Key_PathElement) ProtoMessage() {}
func (*Key_PathElement) Descriptor() ([]byte, []int) {
return fileDescriptor_entity_096a297364b049a5, []int{1, 0}
Expand All @@ -177,7 +177,7 @@
xxx_messageInfo_Key_PathElement.DiscardUnknown(m)
}

var xxx_messageInfo_Key_PathElement proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.InternalMessageInfo

Check failure on line 180 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.InternalMessageInfo

func (m *Key_PathElement) GetKind() string {
if m != nil {
Expand Down Expand Up @@ -224,15 +224,15 @@
}

// XXX_OneofFuncs is for the internal use of the proto package.
func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.Buffer

Check failure on line 227 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.Buffer
return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
(*Key_PathElement_Id)(nil),
(*Key_PathElement_Name)(nil),
}
}

func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.Buffer

Check failure on line 234 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.Buffer
m := msg.(*Key_PathElement)

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

impossible type assertion:

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

impossible type assertion:

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

impossible type assertion: msg.(*Key_PathElement)

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

impossible type assertion: msg.(*Key_PathElement)

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

impossible type assertion:

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

impossible type assertion: msg.(*Key_PathElement)

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

impossible type assertion:

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

impossible type assertion: msg.(*Key_PathElement)

Check failure on line 235 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

impossible type assertion:
// id_type
switch x := m.IdType.(type) {
case *Key_PathElement_Id:
Expand All @@ -248,7 +248,7 @@
return nil
}

func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.Buffer

Check failure on line 251 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.Buffer
m := msg.(*Key_PathElement)
switch tag {
case 2: // id_type.id
Expand Down Expand Up @@ -341,4 +341,4 @@
0x00, 0x00, 0xff, 0xff, 0xf3, 0xdd, 0x11, 0x96, 0x45, 0x06, 0x00, 0x00,
}

var xxx_messageInfo_Key proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.16.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.13.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.20.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.18.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.11.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.19.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.11.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gomod-v2 (1.21.x) 

undefined: proto.InternalMessageInfo

Check failure on line 344 in datastore/internal/cloudpb/entity.pb.go

View workflow job for this annotation

GitHub Actions / test-gopath-v2 (1.12.x) 

undefined: proto.InternalMessageInfo
2 changes: 1 addition & 1 deletion datastore/key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strconv"
"strings"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine/internal"
pb "google.golang.org/appengine/internal/datastore"
Expand Down
2 changes: 1 addition & 1 deletion datastore/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
"google.golang.org/appengine"
pb "google.golang.org/appengine/internal/datastore"
)
Expand Down
2 changes: 1 addition & 1 deletion datastore/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"testing"

proto "github.com/golang/protobuf/proto"
proto "google.golang.org/protobuf/proto"
pb "google.golang.org/appengine/internal/datastore"
)

Expand Down
2 changes: 1 addition & 1 deletion datastore/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"reflect"
"strings"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine/internal"
pb "google.golang.org/appengine/internal/datastore"
Expand Down
2 changes: 1 addition & 1 deletion datastore/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"testing"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine/internal"
"google.golang.org/appengine/internal/aetesting"
Expand Down
2 changes: 1 addition & 1 deletion datastore/save.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"reflect"
"time"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine"
pb "google.golang.org/appengine/internal/datastore"
Expand Down
2 changes: 1 addition & 1 deletion delay/delay_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"reflect"
"testing"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine/internal"
"google.golang.org/appengine/taskqueue"
Expand Down
5 changes: 2 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module google.golang.org/appengine
go 1.11

require (
github.com/golang/protobuf v1.5.2
golang.org/x/text v0.3.8
google.golang.org/protobuf v1.26.0
golang.org/x/text v0.13.0
google.golang.org/protobuf v1.31.0
)
17 changes: 11 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2 changes: 1 addition & 1 deletion internal/aetesting/fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"reflect"
"testing"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

"google.golang.org/appengine/internal"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"sync/atomic"
"time"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

basepb "google.golang.org/appengine/internal/base"
logpb "google.golang.org/appengine/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/api_classic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"appengine_internal"
basepb "appengine_internal/base"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
)

var contextKey = "holds an appengine.Context"
Expand Down
2 changes: 1 addition & 1 deletion internal/api_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"errors"
"os"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
)

type ctxKey string
Expand Down
2 changes: 1 addition & 1 deletion internal/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"testing"
"time"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

basepb "google.golang.org/appengine/internal/base"
remotepb "google.golang.org/appengine/internal/remote_api"
Expand Down
2 changes: 1 addition & 1 deletion internal/app_identity/app_identity_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/base/api_base.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/blobstore/blobstore_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/capability/capability_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/channel/channel_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/datastore/datastore_v3.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/image/images_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package internal
import (
"fmt"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

remotepb "google.golang.org/appengine/internal/remote_api"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/log/log_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/mail/mail_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/modules/modules_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/remote_api/remote_api.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/search/search.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/socket/socket_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/system/system_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/taskqueue/taskqueue_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"errors"
"reflect"

"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

basepb "google.golang.org/appengine/internal/base"
pb "google.golang.org/appengine/internal/datastore"
Expand Down
2 changes: 1 addition & 1 deletion internal/urlfetch/urlfetch_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/user/user_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/xmpp/xmpp_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading