From a603a77447f30ae1cb6832bd9b7cc5674543bd68 Mon Sep 17 00:00:00 2001 From: Denys Smirnov Date: Wed, 17 Apr 2019 18:43:53 +0300 Subject: [PATCH] switch to go modules Signed-off-by: Denys Smirnov --- .travis.yml | 14 +- Dockerfile | 12 +- Gopkg.lock | 391 ------------------------------- Gopkg.toml | 14 -- README.md | 9 +- build.go | 2 +- driver/fixtures/fixtures_test.go | 8 +- driver/impl/impl.go | 4 +- driver/main.go | 2 +- driver/normalizer/annotation.go | 14 +- driver/normalizer/normalizer.go | 6 +- driver/normalizer/transforms.go | 3 +- driver/sdk_test.go | 2 +- go.mod | 15 ++ go.sum | 135 +++++++++++ manifest.toml | 2 +- test.go | 2 +- update.go | 2 +- 18 files changed, 194 insertions(+), 443 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod create mode 100644 go.sum diff --git a/.travis.yml b/.travis.yml index f54d882..0e6e8b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,18 @@ language: go go: - - '1.11' + - '1.12.x' services: - docker env: - - BBLFSHD_VERSION=v2.11.8 + global: + - GO111MODULE=on + - BBLFSHD_VERSION=v2.12.1 install: - - curl -L https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 > $GOPATH/bin/dep - - chmod +x $GOPATH/bin/dep - - dep ensure --vendor-only - - go get ./vendor/gopkg.in/bblfsh/sdk.v2/cmd/... - - go install ./vendor/gopkg.in/bblfsh/sdk.v2/cmd/... + - go mod download - docker pull bblfsh/bblfshd:$BBLFSHD_VERSION script: @@ -23,4 +21,4 @@ script: - go run test.go --bblfshd $BBLFSHD_VERSION ci-build after_success: - - bblfsh-sdk push ci-build + - go run github.com/bblfsh/sdk/v3/cmd/bblfsh-sdk push ci-build diff --git a/Dockerfile b/Dockerfile index 70f8730..a636512 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,13 @@ +# This file can be used directly with Docker. +# # Prerequisites: -# dep ensure --vendor-only +# go mod vendor # bblfsh-sdk release +# +# However, the preferred way is: +# go run ./build.go driver:tag +# +# This will regenerate all necessary files before building the driver. #============================== # Stage 1: Native Driver Build @@ -29,11 +36,14 @@ FROM golang:1.10 as driver ENV DRIVER_REPO=github.com/bblfsh/csharp-driver ENV DRIVER_REPO_PATH=/go/src/$DRIVER_REPO +ADD go.* $DRIVER_REPO_PATH/ ADD vendor $DRIVER_REPO_PATH/vendor ADD driver $DRIVER_REPO_PATH/driver WORKDIR $DRIVER_REPO_PATH/ +ENV GO111MODULE=on GOFLAGS=-mod=vendor + # build server binary RUN go build -o /tmp/driver ./driver/main.go # build tests diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index b6239de..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,391 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - name = "github.com/Azure/go-ansiterm" - packages = [ - ".", - "winterm" - ] - revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" - -[[projects]] - name = "github.com/BurntSushi/toml" - packages = ["."] - revision = "b26d9c308763d68093482582cea63d69be07a0f0" - version = "v0.3.0" - -[[projects]] - name = "github.com/Microsoft/go-winio" - packages = ["."] - revision = "1a8911d1ed007260465c3bfbbc785ac6915a0bb8" - version = "v0.4.12" - -[[projects]] - branch = "master" - name = "github.com/Nvveen/Gotty" - packages = ["."] - revision = "cd527374f1e5bff4938207604a14f2e38a9cf512" - -[[projects]] - branch = "master" - name = "github.com/codahale/hdrhistogram" - packages = ["."] - revision = "3a0bb77429bd3a61596f5e8a3172445844342120" - -[[projects]] - branch = "master" - name = "github.com/containerd/continuity" - packages = ["pathdriver"] - revision = "004b46473808b3e7a4a3049c20e4376c91eb966d" - -[[projects]] - name = "github.com/davecgh/go-spew" - packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - name = "github.com/docker/go-connections" - packages = ["nat"] - revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d" - version = "v0.3.0" - -[[projects]] - name = "github.com/docker/go-units" - packages = ["."] - revision = "47565b4f722fb6ceae66b95f853feed578a4a51c" - version = "v0.3.3" - -[[projects]] - name = "github.com/fatih/color" - packages = ["."] - revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - version = "v1.7.0" - -[[projects]] - name = "github.com/gogo/protobuf" - packages = [ - "gogoproto", - "proto", - "protoc-gen-gogo/descriptor", - "sortkeys", - "types" - ] - revision = "636bf0302bc95575d69441b25a2603156ffdddf1" - version = "v1.1.1" - -[[projects]] - name = "github.com/golang/protobuf" - packages = [ - "proto", - "ptypes", - "ptypes/any", - "ptypes/duration", - "ptypes/timestamp" - ] - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" - -[[projects]] - branch = "master" - name = "github.com/grpc-ecosystem/grpc-opentracing" - packages = ["go/otgrpc"] - revision = "8e809c8a86450a29b90dcc9efbf062d0fe6d9746" - -[[projects]] - name = "github.com/mattn/go-colorable" - packages = ["."] - revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" - version = "v0.0.9" - -[[projects]] - name = "github.com/mattn/go-isatty" - packages = ["."] - revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" - version = "v0.0.3" - -[[projects]] - branch = "master" - name = "github.com/mcuadros/go-lookup" - packages = ["."] - revision = "5650f26be7675b629fff8356a50d906fa03e9c8b" - -[[projects]] - branch = "master" - name = "github.com/mgutz/ansi" - packages = ["."] - revision = "9520e82c474b0a04dd04f8a40959027271bab992" - -[[projects]] - name = "github.com/opencontainers/go-digest" - packages = ["."] - revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" - version = "v1.0.0-rc1" - -[[projects]] - name = "github.com/opencontainers/image-spec" - packages = [ - "specs-go", - "specs-go/v1" - ] - revision = "d60099175f88c47cd379c4738d158884749ed235" - version = "v1.0.1" - -[[projects]] - name = "github.com/opencontainers/runc" - packages = ["libcontainer/user"] - revision = "69ae5da6afdcaaf38285a10b36f362e41cb298d6" - version = "v1.0.0-rc7" - -[[projects]] - name = "github.com/opentracing/opentracing-go" - packages = [ - ".", - "ext", - "log" - ] - revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38" - version = "v1.0.2" - -[[projects]] - name = "github.com/ory/dockertest" - packages = [ - "docker", - "docker/opts", - "docker/pkg/archive", - "docker/pkg/fileutils", - "docker/pkg/homedir", - "docker/pkg/idtools", - "docker/pkg/ioutils", - "docker/pkg/jsonmessage", - "docker/pkg/longpath", - "docker/pkg/mount", - "docker/pkg/pools", - "docker/pkg/stdcopy", - "docker/pkg/system", - "docker/pkg/term", - "docker/pkg/term/windows", - "docker/types", - "docker/types/blkiodev", - "docker/types/container", - "docker/types/filters", - "docker/types/mount", - "docker/types/network", - "docker/types/registry", - "docker/types/strslice", - "docker/types/versions" - ] - revision = "1ff4d597ac09e84e6f3edfc340b22d5544da1eb2" - -[[projects]] - name = "github.com/pkg/errors" - packages = ["."] - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - name = "github.com/sirupsen/logrus" - packages = ["."] - revision = "3e01752db0189b9157070a0e1668a620f9a85da2" - version = "v1.0.6" - -[[projects]] - name = "github.com/stretchr/testify" - packages = [ - "assert", - "require" - ] - revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" - version = "v1.2.2" - -[[projects]] - name = "github.com/uber/jaeger-client-go" - packages = [ - ".", - "config", - "internal/baggage", - "internal/baggage/remote", - "internal/spanlog", - "internal/throttler", - "internal/throttler/remote", - "log", - "rpcmetrics", - "thrift", - "thrift-gen/agent", - "thrift-gen/baggage", - "thrift-gen/jaeger", - "thrift-gen/sampling", - "thrift-gen/zipkincore", - "transport", - "utils" - ] - revision = "1a782e2da844727691fef1757c72eb190c2909f0" - version = "v2.15.0" - -[[projects]] - name = "github.com/uber/jaeger-lib" - packages = ["metrics"] - revision = "ed3a127ec5fef7ae9ea95b01b542c47fbd999ce5" - version = "v1.5.0" - -[[projects]] - name = "github.com/x-cray/logrus-prefixed-formatter" - packages = ["."] - revision = "bb2702d423886830dee131692131d35648c382e2" - version = "v0.5.2" - -[[projects]] - branch = "master" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - revision = "de0752318171da717af4ce24d0a2e8626afaeb11" - -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = [ - "context", - "http/httpguts", - "http2", - "http2/hpack", - "idna", - "internal/timeseries", - "trace" - ] - revision = "f9ce57c11b242f0f1599cf25c89d8cb02c45295a" - -[[projects]] - branch = "master" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows" - ] - revision = "904bdc257025c7b3f43c19360ad3ab85783fad78" - -[[projects]] - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "internal/colltab", - "internal/gen", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable" - ] - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - branch = "master" - name = "google.golang.org/genproto" - packages = ["googleapis/rpc/status"] - revision = "383e8b2c3b9e36c4076b235b32537292176bae20" - -[[projects]] - name = "google.golang.org/grpc" - packages = [ - ".", - "balancer", - "balancer/base", - "balancer/roundrobin", - "codes", - "connectivity", - "credentials", - "encoding", - "encoding/proto", - "grpclog", - "internal", - "internal/backoff", - "internal/channelz", - "internal/envconfig", - "internal/grpcrand", - "internal/transport", - "keepalive", - "metadata", - "naming", - "peer", - "resolver", - "resolver/dns", - "resolver/passthrough", - "stats", - "status", - "tap" - ] - revision = "32fb0ac620c32ba40a4626ddf94d90d12cce3455" - version = "v1.14.0" - -[[projects]] - name = "gopkg.in/bblfsh/sdk.v1" - packages = [ - "manifest", - "protocol", - "uast" - ] - revision = "94e3b212553e761677da180f321d9a7a60ebec5f" - version = "v1.16.1" - -[[projects]] - name = "gopkg.in/bblfsh/sdk.v2" - packages = [ - "assets/build", - "assets/skeleton", - "build", - "cmd", - "driver", - "driver/errors", - "driver/fixtures", - "driver/manifest", - "driver/native", - "driver/native/jsonlines", - "driver/server", - "internal/docker", - "protocol", - "protocol/v1", - "uast", - "uast/nodes", - "uast/nodes/nodesproto", - "uast/nodes/nodesproto/pio", - "uast/role", - "uast/transformer", - "uast/transformer/positioner", - "uast/viewer", - "uast/yaml" - ] - revision = "a7cb6c25d2968d3f254149b7b878c4f5270dd1b6" - version = "v2.16.4" - -[[projects]] - name = "gopkg.in/src-d/go-errors.v1" - packages = ["."] - revision = "8bbbeeb767dfdd053b9b45d5a16a4f4ce2c6f694" - version = "v1.0.0" - -[[projects]] - name = "gopkg.in/yaml.v2" - packages = ["."] - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "8009d9125f6601d7adb6a46ce785385833659a4bb0d3bf04fd206acf7b64c252" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 746c816..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,14 +0,0 @@ -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. - -[[constraint]] - version = "v2.16.x" - name = "gopkg.in/bblfsh/sdk.v2" - -[prune] - go-tests = true - unused-packages = true - [[prune.project]] - name = "gopkg.in/bblfsh/sdk.v2" - unused-packages = false - diff --git a/README.md b/README.md index 2e72375..b8d7ece 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# C# driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/csharp-driver.svg?branch=master)](https://travis-ci.org/bblfsh/csharp-driver) ![Native Version](https://img.shields.io/badge/csharp%20version--aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.10-63afbf.svg) +# C# driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/csharp-driver.svg?branch=master)](https://travis-ci.org/bblfsh/csharp-driver) ![Native Version](https://img.shields.io/badge/csharp%20version--aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.12-63afbf.svg) @@ -7,16 +7,17 @@ Development Environment Requirements: - `docker` -- Go 1.11+ -- SDK dependencies _(dep ensure --vendor-only)_ +- Go 1.12+ To initialize the build system execute: `go test ./driver`, at the root of the project. This will generate the `Dockerfile` for this driver. -To execute the tests just execute `go run test.go`, this will execute the test over the native and the go components of the driver using Docker. +To run the tests just execute `go run test.go`, this will start the test over the native and the Go components of the driver using Docker. The build is done executing `go run build.go`. To evaluate the result using a docker container, execute: `go run build.go test-driver && docker run -it test-driver`. +If the project is located under `$GOPATH`, run all the above with `GO111MODULE=on` environment variable, +or move the project to any other directory outside of `$GOPATH`. License ------- diff --git a/build.go b/build.go index c4f72b2..478c88f 100644 --- a/build.go +++ b/build.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "gopkg.in/bblfsh/sdk.v2/build" + "github.com/bblfsh/sdk/v3/build" ) func main() { diff --git a/driver/fixtures/fixtures_test.go b/driver/fixtures/fixtures_test.go index e28d14e..f5a0a5e 100644 --- a/driver/fixtures/fixtures_test.go +++ b/driver/fixtures/fixtures_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/bblfsh/csharp-driver/driver/normalizer" - "gopkg.in/bblfsh/sdk.v2/driver" - "gopkg.in/bblfsh/sdk.v2/driver/fixtures" - "gopkg.in/bblfsh/sdk.v2/driver/native" - "gopkg.in/bblfsh/sdk.v2/uast/transformer/positioner" + "github.com/bblfsh/sdk/v3/driver" + "github.com/bblfsh/sdk/v3/driver/fixtures" + "github.com/bblfsh/sdk/v3/driver/native" + "github.com/bblfsh/sdk/v3/uast/transformer/positioner" ) const projectRoot = "../../" diff --git a/driver/impl/impl.go b/driver/impl/impl.go index 98616d7..b01db79 100644 --- a/driver/impl/impl.go +++ b/driver/impl/impl.go @@ -1,8 +1,8 @@ package impl import ( - "gopkg.in/bblfsh/sdk.v2/driver/native" - "gopkg.in/bblfsh/sdk.v2/driver/server" + "github.com/bblfsh/sdk/v3/driver/native" + "github.com/bblfsh/sdk/v3/driver/server" ) func init() { diff --git a/driver/main.go b/driver/main.go index b7431e3..d9fd9d8 100644 --- a/driver/main.go +++ b/driver/main.go @@ -4,7 +4,7 @@ import ( _ "github.com/bblfsh/csharp-driver/driver/impl" "github.com/bblfsh/csharp-driver/driver/normalizer" - "gopkg.in/bblfsh/sdk.v2/driver/server" + "github.com/bblfsh/sdk/v3/driver/server" ) func main() { diff --git a/driver/normalizer/annotation.go b/driver/normalizer/annotation.go index 3940ae6..a97ac40 100644 --- a/driver/normalizer/annotation.go +++ b/driver/normalizer/annotation.go @@ -1,16 +1,16 @@ package normalizer import ( - "gopkg.in/bblfsh/sdk.v2/uast" - "gopkg.in/bblfsh/sdk.v2/uast/role" + "github.com/bblfsh/sdk/v3/uast" + "github.com/bblfsh/sdk/v3/uast/role" - . "gopkg.in/bblfsh/sdk.v2/uast/transformer" - "gopkg.in/bblfsh/sdk.v2/uast/transformer/positioner" + . "github.com/bblfsh/sdk/v3/uast/transformer" + "github.com/bblfsh/sdk/v3/uast/transformer/positioner" ) // Native is the of list `transformer.Transformer` to apply to a native AST. // To learn more about the Transformers and the available ones take a look to: -// https://godoc.org/gopkg.in/bblfsh/sdk.v2/uast/transformer +// https://godoc.org/github.com/bblfsh/sdk/v3/uast/transformer var Native = Transformers([][]Transformer{ // The main block of transformation rules. {Mappings(Annotations...)}, @@ -25,7 +25,7 @@ var Native = Transformers([][]Transformer{ // and can access original source code file. It can be used to improve or // fix positional information. // -// https://godoc.org/gopkg.in/bblfsh/sdk.v2/uast/transformer/positioner +// https://godoc.org/github.com/bblfsh/sdk/v3/uast/transformer/positioner var PreprocessCode = []CodeTransformer{ positioner.FromOffset(), positioner.TokenFromSource{ @@ -37,8 +37,6 @@ var PreprocessCode = []CodeTransformer{ }, } -var Code []CodeTransformer // legacy stage, will be deprecated - // Annotations is a list of individual transformations to annotate a native AST with roles. var Annotations = []Mapping{ diff --git a/driver/normalizer/normalizer.go b/driver/normalizer/normalizer.go index 0e6e582..304af18 100644 --- a/driver/normalizer/normalizer.go +++ b/driver/normalizer/normalizer.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "gopkg.in/bblfsh/sdk.v2/uast" - "gopkg.in/bblfsh/sdk.v2/uast/nodes" - . "gopkg.in/bblfsh/sdk.v2/uast/transformer" + "github.com/bblfsh/sdk/v3/uast" + "github.com/bblfsh/sdk/v3/uast/nodes" + . "github.com/bblfsh/sdk/v3/uast/transformer" ) var Preprocess = Transformers([][]Transformer{ diff --git a/driver/normalizer/transforms.go b/driver/normalizer/transforms.go index 02f7d41..0a39d8b 100644 --- a/driver/normalizer/transforms.go +++ b/driver/normalizer/transforms.go @@ -1,6 +1,6 @@ package normalizer -import "gopkg.in/bblfsh/sdk.v2/driver" +import "github.com/bblfsh/sdk/v3/driver" var Transforms = driver.Transforms{ Namespace: "csharp", @@ -8,5 +8,4 @@ var Transforms = driver.Transforms{ PreprocessCode: PreprocessCode, Normalize: Normalize, Annotations: Native, - Code: Code, } diff --git a/driver/sdk_test.go b/driver/sdk_test.go index bec688a..8fd040b 100644 --- a/driver/sdk_test.go +++ b/driver/sdk_test.go @@ -3,7 +3,7 @@ package main_test import ( "testing" - "gopkg.in/bblfsh/sdk.v2/build" + "github.com/bblfsh/sdk/v3/build" ) func TestSDKUpToDate(t *testing.T) { diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..f615b5e --- /dev/null +++ b/go.mod @@ -0,0 +1,15 @@ +module github.com/bblfsh/csharp-driver + +go 1.12 + +require ( + github.com/Microsoft/go-winio v0.4.12 // indirect + github.com/bblfsh/sdk/v3 v3.0.0 + github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect + github.com/gogo/protobuf v1.1.1 // indirect + github.com/opencontainers/runc v1.0.0-rc7 // indirect + github.com/sirupsen/logrus v1.0.6 // indirect + golang.org/x/crypto v0.0.0-20180808211826-de0752318171 // indirect + google.golang.org/genproto v0.0.0-20180808183934-383e8b2c3b9e // indirect + google.golang.org/grpc v1.14.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..057a16e --- /dev/null +++ b/go.sum @@ -0,0 +1,135 @@ +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= +github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Microsoft/go-winio v0.4.8/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc= +github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= +github.com/antchfx/xpath v0.0.0-20180922041825-3de91f3991a1/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= +github.com/bblfsh/sdk/v3 v3.0.0 h1:bCyTC8gEcMSIo1wzuYpbMYKK9L1KFEzgrEckVvraELc= +github.com/bblfsh/sdk/v3 v3.0.0/go.mod h1:juMiu8rP3lYJN1e4neEkSyzNieqiFceZzN4AOo0Rm1Q= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/containerd/continuity v0.0.0-20180712174259-0377f7d76720/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o= +github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gogo/protobuf v1.1.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-github v15.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= +github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/kevinburke/go-bindata v3.13.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +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/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mcuadros/go-lookup v0.0.0-20171110082742-5650f26be767 h1:BrhJNdEFWGuiJk/3/SwsG5Rex3zjFxYsDi2bpd7382Y= +github.com/mcuadros/go-lookup v0.0.0-20171110082742-5650f26be767/go.mod h1:ct+byCpkFokm4J0tiuAvB8cf2ttm6GcCe89Yr25nGKg= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v1.0.0-rc5/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc7 h1:1eqSWkWzuGk04OAMJPPjan7yGMcI1SUjpr/sx3+q1+M= +github.com/opencontainers/runc v1.0.0-rc7/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opentracing/opentracing-go v1.0.2 h1:3jA2P6O1F9UOrWVpwrIo17pu01KWvNWg4X946/Y5Zwg= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/ory/dockertest v0.0.0-20180716164247-1ff4d597ac09 h1:OZVDcuwEAe9yZFMNGjnu3cLtxANRDXliAIa3s4Fg06Y= +github.com/ory/dockertest v0.0.0-20180716164247-1ff4d597ac09/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s= +github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo= +github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= +github.com/uber/jaeger-client-go v2.15.0+incompatible h1:NP3qsSqNxh8VYr956ur1N/1C1PjvOJnJykCzcD5QHbk= +github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-lib v1.5.0 h1:OHbgr8l656Ub3Fw5k9SWnBfIEwvoHQ+W2y+Aa9D1Uyo= +github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg= +github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE= +go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180808211826-de0752318171 h1:vYogbvSFj2YXcjQxFHu/rASSOt9sLytpCaSkiwQ135I= +golang.org/x/crypto v0.0.0-20180808211826-de0752318171/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +google.golang.org/genproto v0.0.0-20180716172848-2731d4fa720b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180808183934-383e8b2c3b9e h1:8mImbC+7codRhTIUj7Js3/j98gpxyF7C4RlC0OdGh64= +google.golang.org/genproto v0.0.0-20180808183934-383e8b2c3b9e/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/bblfsh/sdk.v1 v1.16.1 h1:knNHijV8DddakjzTVNThC+VY7KprdIaMkE3+J/p0bT0= +gopkg.in/bblfsh/sdk.v1 v1.16.1/go.mod h1:C50G07MDlG8LaS4El1h/G7fjz8Ho9VNmH68Dt3cVVnQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/src-d/go-errors.v1 v1.0.0 h1:cooGdZnCjYbeS1zb1s6pVAAimTdKceRrpn7aKOnNIfc= +gopkg.in/src-d/go-errors.v1 v1.0.0/go.mod h1:q1cBlomlw2FnDBDNGlnh6X0jPihy+QxZfMMNxPCbdYg= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/manifest.toml b/manifest.toml index f55ea9e..dcbf0b9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ description = """ [runtime] # go_version describes the version being use to build the driver Go code. -go_version = "1.10" +go_version = "1.12" # native_version describes the version or versions being use to build and # execute the native code, you should define at least one. (eg.: "1.8"). diff --git a/test.go b/test.go index 32d400c..7528b27 100644 --- a/test.go +++ b/test.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "gopkg.in/bblfsh/sdk.v2/build" + "github.com/bblfsh/sdk/v3/build" ) var ( diff --git a/update.go b/update.go index 457751e..2532512 100644 --- a/update.go +++ b/update.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "gopkg.in/bblfsh/sdk.v2/build" + "github.com/bblfsh/sdk/v3/build" ) func main() {