Commit ee536430 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Update to nakama-common 1.3.1.

parent a473f510

go.mod

+4 −4
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ require ( 
	github.com/go-sql-driver/mysql v1.4.1 // indirect

	github.com/gobuffalo/packr v1.30.1

	github.com/gofrs/uuid v0.0.0-20190510204422-abfe1881e60e

	github.com/golang/protobuf v1.3.3

	github.com/golang/protobuf v1.3.4

	github.com/gorilla/handlers v1.4.2

	github.com/gorilla/mux v1.7.4

	github.com/gorilla/websocket v1.4.1

	github.com/grpc-ecosystem/grpc-gateway v1.13.0

	github.com/heroiclabs/nakama-common v1.3.0

	github.com/heroiclabs/nakama-common v1.3.1

	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect

	github.com/jackc/pgx v3.5.0+incompatible

	github.com/jmhodges/levigo v1.0.0 // indirect
@@ -55,11 +55,11 @@ require ( 
	go.uber.org/multierr v1.1.0 // indirect

	go.uber.org/zap v1.10.0

	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d

	golang.org/x/net v0.0.0-20200226051749-491c5fce7268 // indirect

	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect

	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect

	google.golang.org/api v0.10.0 // indirect

	google.golang.org/appengine v1.6.2 // indirect

	google.golang.org/genproto v0.0.0-20200225123651-fc8f55426688

	google.golang.org/genproto v0.0.0-20200226201735-46b91f19d98c

	google.golang.org/grpc v1.27.1

	gopkg.in/gorp.v1 v1.7.2 // indirect

	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20190411184413-94d9e492cc53

go.sum

+8 −8
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs 
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=

github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=

github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=

github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=

github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=

github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=

github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -141,8 +143,8 @@ github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+ 
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=

github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=

github.com/heroiclabs/nakama-common v1.3.0 h1:YjhVIFxt6HEcHeMVcACBQ0pwrG9Ts9LRxo88h9/uWO0=

github.com/heroiclabs/nakama-common v1.3.0/go.mod h1:e8eLcnHLZnElf9yvJqrLGTbvnxXQJRLVGebx/5zRXc4=

github.com/heroiclabs/nakama-common v1.3.1 h1:M2pBuJtvh1QLjXZtHuwTGpRTfGgpNWDGF2y6SOgl9t4=

github.com/heroiclabs/nakama-common v1.3.1/go.mod h1:0lw1qUs5FhJlox1WsEPdODRsdvfZ7Q1c/2jxkbeL++M=

github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -296,8 +298,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR 
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

golang.org/x/net v0.0.0-20200226051749-491c5fce7268 h1:fnuNgko6vrkrxuKfTMd+0eOz50ziv+Wi+t38KUT3j+E=

golang.org/x/net v0.0.0-20200226051749-491c5fce7268/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=

golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
@@ -369,11 +371,9 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn 
google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=

google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=

google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=

google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514 h1:oFSK4421fpCKRrpzIpybyBVWyht05NegY9+L/3TLAZs=

google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=

google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=

google.golang.org/genproto v0.0.0-20200225123651-fc8f55426688 h1:1+0Z5cgv1eDXJD9z2tdQF9PSSQnJXwism490hJydMRI=

google.golang.org/genproto v0.0.0-20200225123651-fc8f55426688/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=

google.golang.org/genproto v0.0.0-20200226201735-46b91f19d98c h1:xFOdgVPpeowWAH0MJ5i0XMp+3yWiWamMtN/kx9xThIQ=

google.golang.org/genproto v0.0.0-20200226201735-46b91f19d98c/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=

google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=

google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=

vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go

+7 −5
Original line number Diff line number Diff line
@@ -1376,8 +1376,8 @@ type FileOptions struct { 
	// determining the namespace.

	PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"`

	// Use this option to change the namespace of php generated metadata classes.

	// Default is empty. When this option is empty, the proto file name will be used

	// for determining the namespace.

	// Default is empty. When this option is empty, the proto file name will be

	// used for determining the namespace.

	PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"`

	// Use this option to change the package of ruby generated classes. Default

	// is empty. When this option is not set, the package name will be used for
@@ -1627,7 +1627,7 @@ type MessageOptions struct { 
	//

	// Implementations may choose not to generate the map_entry=true message, but

	// use a native map in the target language to hold the keys and values.

	// The reflection APIs in such implementions still need to work as

	// The reflection APIs in such implementations still need to work as

	// if the field is a repeated message field.

	//

	// NOTE: Do not set the option in .proto files. Always use the maps syntax
@@ -2377,7 +2377,7 @@ type SourceCodeInfo struct { 
	//   beginning of the "extend" block and is shared by all extensions within

	//   the block.

	// - Just because a location's span is a subset of some other location's span

	//   does not mean that it is a descendent.  For example, a "group" defines

	//   does not mean that it is a descendant.  For example, a "group" defines

	//   both a type and a field in a single declaration.  Thus, the locations

	//   corresponding to the type and field and their components will overlap.

	// - Code which tries to interpret locations should probably be designed to
@@ -2718,7 +2718,9 @@ func init() { 
	proto.RegisterType((*GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation")

}



func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_e5baabe45344a177) }

func init() {

	proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_e5baabe45344a177)

}



var fileDescriptor_e5baabe45344a177 = []byte{

	// 2589 bytes of a gzipped FileDescriptorProto

vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto

+71 −69
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
syntax = "proto2";



package google.protobuf;



option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";

option java_package = "com.google.protobuf";

option java_outer_classname = "DescriptorProtos";
@@ -100,8 +101,8 @@ message DescriptorProto { 
  repeated EnumDescriptorProto enum_type = 4;



  message ExtensionRange {

    optional int32 start = 1;

    optional int32 end = 2;

    optional int32 start = 1;  // Inclusive.

    optional int32 end = 2;    // Exclusive.



    optional ExtensionRangeOptions options = 3;

  }
@@ -165,14 +166,14 @@ message FieldDescriptorProto { 
    TYPE_SFIXED64 = 16;

    TYPE_SINT32 = 17;  // Uses ZigZag encoding.

    TYPE_SINT64 = 18;  // Uses ZigZag encoding.

  };

  }



  enum Label {

    // 0 is reserved for errors

    LABEL_OPTIONAL = 1;

    LABEL_REQUIRED = 2;

    LABEL_REPEATED = 3;

  };

  }



  optional string name = 1;

  optional int32 number = 3;
@@ -314,7 +315,6 @@ message MethodDescriptorProto { 
//   If this turns out to be popular, a web service will be set up

//   to automatically assign option numbers.





message FileOptions {



  // Sets the Java package where classes generated from this .proto will be
@@ -369,6 +369,7 @@ message FileOptions { 








  // Should generic services be generated in each language?  "Generic" services

  // are not specific to any particular RPC system.  They are generated by the

  // main code generators in each language (without additional plugins).
@@ -417,10 +418,9 @@ message FileOptions { 
  // determining the namespace.

  optional string php_namespace = 41;





  // Use this option to change the namespace of php generated metadata classes.

  // Default is empty. When this option is empty, the proto file name will be used

  // for determining the namespace.

  // Default is empty. When this option is empty, the proto file name will be

  // used for determining the namespace.

  optional string php_metadata_namespace = 44;



  // Use this option to change the package of ruby generated classes. Default
@@ -428,6 +428,7 @@ message FileOptions { 
  // determining the ruby package.

  optional string ruby_package = 45;





  // The parser stores options it doesn't recognize here.

  // See the documentation for the "Options" section above.

  repeated UninterpretedOption uninterpreted_option = 999;
@@ -486,7 +487,7 @@ message MessageOptions { 
  //

  // Implementations may choose not to generate the map_entry=true message, but

  // use a native map in the target language to hold the keys and values.

  // The reflection APIs in such implementions still need to work as

  // The reflection APIs in such implementations still need to work as

  // if the field is a repeated message field.

  //

  // NOTE: Do not set the option in .proto files. Always use the maps syntax
@@ -497,6 +498,7 @@ message MessageOptions { 
  reserved 8;  // javalite_serializable

  reserved 9;  // javanano_as_lite





  // The parser stores options it doesn't recognize here. See above.

  repeated UninterpretedOption uninterpreted_option = 999;
@@ -681,8 +683,8 @@ message MethodOptions { 
    NO_SIDE_EFFECTS = 1;  // implies idempotent

    IDEMPOTENT = 2;       // idempotent, but may have side effects

  }

  optional IdempotencyLevel idempotency_level =

      34 [default=IDEMPOTENCY_UNKNOWN];

  optional IdempotencyLevel idempotency_level = 34

      [default = IDEMPOTENCY_UNKNOWN];



  // The parser stores options it doesn't recognize here. See above.

  repeated UninterpretedOption uninterpreted_option = 999;
@@ -763,7 +765,7 @@ message SourceCodeInfo { 
  //   beginning of the "extend" block and is shared by all extensions within

  //   the block.

  // - Just because a location's span is a subset of some other location's span

  //   does not mean that it is a descendent.  For example, a "group" defines

  //   does not mean that it is a descendant.  For example, a "group" defines

  //   both a type and a field in a single declaration.  Thus, the locations

  //   corresponding to the type and field and their components will overlap.

  // - Code which tries to interpret locations should probably be designed to

vendor/github.com/golang/protobuf/ptypes/any/any.pb.go

+5 −2
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package 
//

type Any struct {

	// A URL/resource name that uniquely identifies the type of the serialized

	// protocol buffer message. The last segment of the URL's path must represent

	// protocol buffer message. This string must contain at least

	// one "/" character. The last segment of the URL's path must represent

	// the fully qualified name of the type (as in

	// `path/google.protobuf.Duration`). The name should be in a canonical form

	// (e.g., leading "." is not accepted).
@@ -181,7 +182,9 @@ func init() { 
	proto.RegisterType((*Any)(nil), "google.protobuf.Any")

}



func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) }

func init() {

	proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4)

}



var fileDescriptor_b53526c13ae22eb4 = []byte{

	// 185 bytes of a gzipped FileDescriptorProto