Fix broken bleve transitive dependency (#377) (02314876) · Commits · public-projects / Nakama

go.mod

+6 −6

Original line number	Diff line number	Diff line
		@@ -6,23 +6,23 @@ require (
		cloud.google.com/go v0.45.1 // indirect
		contrib.go.opencensus.io/exporter/prometheus v0.1.0
		contrib.go.opencensus.io/exporter/stackdriver v0.12.7
		github.com/RoaringBitmap/roaring v0.4.18 // indirect
		github.com/RoaringBitmap/roaring v0.4.20 // indirect
		github.com/aws/aws-sdk-go v1.23.16 // indirect
		github.com/blevesearch/bleve v0.0.0-20190613153557-26d2099fa968
		github.com/blevesearch/bleve v0.8.1-0.20190826155422-1626176d5505
		github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3 // indirect
		github.com/blevesearch/go-porterstemmer v1.0.2 // indirect
		github.com/blevesearch/segment v0.0.0-20160915185041-762005e7a34f // indirect
		github.com/cockroachdb/apd v1.1.0 // indirect
		github.com/couchbase/vellum v0.0.0-20190610201045-ec7b775d247f // indirect
		github.com/couchbase/vellum v0.0.0-20190829182332-ef2e028c01fd // indirect
		github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect
		github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
		github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect
		github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible
		github.com/edsrzf/mmap-go v1.0.0 // indirect
		github.com/etcd-io/bbolt v1.3.3 // indirect
		github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
		github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
		github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
		github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a // indirect
		github.com/go-sql-driver/mysql v1.4.1 // indirect
		github.com/go-yaml/yaml v2.1.0+incompatible
		github.com/gobuffalo/packr v1.30.1
		@@ -36,7 +36,7 @@ require (
		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
		github.com/lib/pq v1.1.1 // indirect
		github.com/lib/pq v1.2.0 // indirect
		github.com/mattn/go-sqlite3 v1.10.0 // indirect
		github.com/pkg/errors v0.8.1
		github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7 // indirect
		@@ -57,7 +57,7 @@ require (
		go.uber.org/zap v1.10.0
		golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472
		golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
		golang.org/x/sys v0.0.0-20190904154756-749cb33beabd // indirect
		golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13 // indirect
		google.golang.org/api v0.10.0 // indirect
		google.golang.org/appengine v1.6.2 // indirect
		google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514

go.sum

+13 −10

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@ contrib.go.opencensus.io/exporter/stackdriver v0.12.7/go.mod h1:ZOhmSfHIoyVaQ+bK
		github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
		github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
		github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
		github.com/RoaringBitmap/roaring v0.4.18 h1:nh8Ngxctxt5QAoMLuR7MHJe4jEqpn+EnsdgDWPryQWo=
		github.com/RoaringBitmap/roaring v0.4.18/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI=
		github.com/RoaringBitmap/roaring v0.4.20 h1:PKmAFTkw47a5khFKgTdu64iObahLTBwTJnVOCN9dg3M=
		github.com/RoaringBitmap/roaring v0.4.20/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI=
		github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
		github.com/aws/aws-sdk-go v1.22.1 h1://WJvJi9iq/i5TWHuK3hIC23xCZYH7Qv7SIN2vZVqxY=
		github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
		@@ -26,8 +26,8 @@ github.com/aws/aws-sdk-go v1.23.16 h1:cMEmZoIeno2dgz3grc4vUQ33ZJh32d/4C67tNDxOER
		github.com/aws/aws-sdk-go v1.23.16/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
		github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
		github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
		github.com/blevesearch/bleve v0.0.0-20190613153557-26d2099fa968 h1:Nlb7k138UDtkkhFh+QIBMnOX+fWQHd9Hj2PsezEgaaM=
		github.com/blevesearch/bleve v0.0.0-20190613153557-26d2099fa968/go.mod h1:Y2lmIkzV6mcNfAnAdOd+ZxHkHchhBfU/xroGIp61wfw=
		github.com/blevesearch/bleve v0.8.1-0.20190826155422-1626176d5505 h1:YfyxuTumj3tzxahXQw8FTy5hhyi1HTZ0nCtpuOERh7Q=
		github.com/blevesearch/bleve v0.8.1-0.20190826155422-1626176d5505/go.mod h1:Y2lmIkzV6mcNfAnAdOd+ZxHkHchhBfU/xroGIp61wfw=
		github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3 h1:U6vnxZrTfItfiUiYx0lf/LgHjRSfaKK5QHSom3lEbnA=
		github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3/go.mod h1:WH+MU2F4T0VmSdaPX+Wu5GYoZBrYWdOZWSjzvYcDmqQ=
		github.com/blevesearch/go-porterstemmer v1.0.2 h1:qe7n69gBd1OLY5sHKnxQHIbzn0LNJA4hpAf+5XDxV2I=
		@@ -45,8 +45,8 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe
		github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
		github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
		github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
		github.com/couchbase/vellum v0.0.0-20190610201045-ec7b775d247f h1:GYBou3TngfETdXk4BDT3lMGeBcgk8LsOF/rxkeoql0c=
		github.com/couchbase/vellum v0.0.0-20190610201045-ec7b775d247f/go.mod h1:prYTC8EgTu3gwbqJihkud9zRXISvyulAplQ6exdCo1g=
		github.com/couchbase/vellum v0.0.0-20190829182332-ef2e028c01fd h1:zeuJhcG3f8eePshH3KxkNE+Xtl53pVln9MOUPMyr/1w=
		github.com/couchbase/vellum v0.0.0-20190829182332-ef2e028c01fd/go.mod h1:xbc8Ff/oG7h2ejd7AlwOpfd+6QZntc92ygpAOfGwcKY=
		github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
		github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8=
		github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
		@@ -74,6 +74,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
		github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
		github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4=
		github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
		github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a h1:FQqoVvjbiUioBBFUL5up+h+GdCa/AnJsL/1bIs/veSI=
		github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
		github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493 h1:OTanQnFt0bi5iLFSdbEVA/idR6Q2WhCm+deb7ir2CcM=
		github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
		github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
		@@ -164,8 +166,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
		github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
		github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
		github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
		github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
		github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
		github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
		github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
		github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
		github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
		github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
		@@ -318,8 +320,9 @@ golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7w
		golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
		golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
		golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
		golang.org/x/sys v0.0.0-20190904154756-749cb33beabd h1:DBH9mDw0zluJT/R+nGuV3jWFWLFaHyYZWD4tOT+cjn0=
		golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
		golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
		golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13 h1:/zi0zzlPHWXYXrO1LjNRByFu8sdGgCkj2JLDdBIB84k=
		golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
		golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
		golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
		golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

vendor/github.com/RoaringBitmap/roaring/.drone.yml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		kind: pipeline
		name: default

		workspace:
		base: /go
		path: src/github.com/RoaringBitmap/roaring

		steps:
		- name: test
		image: golang
		commands:
		- go get -t
		- go test
		- go test -race -run TestConcurrent*
		- go build -tags appengine
		- go test -tags appengine
		- GOARCH=386 go build
		- GOARCH=386 go test
		- GOARCH=arm go build
		- GOARCH=arm64 go build

vendor/github.com/RoaringBitmap/roaring/.travis.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,10 +23,14 @@ branches:
		script:
		- goveralls -v -service travis-ci -ignore arraycontainer_gen.go,bitmapcontainer_gen.go,rle16_gen.go,rle_gen.go,roaringarray_gen.go,rle.go \|\| go test
		- go test -race -run TestConcurrent*
		- go build -tags appengine
		- go test -tags appengine
		- GOARCH=arm64 go build
		- GOARCH=386 go build
		- GOARCH=386 go test
		- GOARCH=arm go build
		- GOARCH=arm64 go build

		matrix:
		allow_failures:
		- go: tip

vendor/github.com/RoaringBitmap/roaring/CONTRIBUTORS

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,4 +12,5 @@ Vali Malinoiu (@0x4139),
		Forud Ghafouri (@fzerorubigd),
		Joe Nall (@joenall),
		(@fredim),
		Edd Robinson (@e-dard)
		Edd Robinson (@e-dard),
		Alexander Petrov (@alldroll)