diff --git a/.travis.yml b/.travis.yml index 58f9465..25bc627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ services: - docker before_script: - - go get -v gopkg.in/bblfsh/sdk.v1/... + - go get -v gopkg.in/bblfsh/sdk.v2/... - bblfsh-sdk prepare-build . - go get -v -t ./driver/... diff --git a/README.md b/README.md index c7462d5..13f0036 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Development Environment Requirements: - `docker` -- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v1/...)_ +- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v2/...)_ - UAST converter dependencies _(go get -t -v ./...)_ To initialize the build system execute: `bblfsh-sdk prepare-build`, at the root of the project. This will install the SDK at `.sdk` for this driver. diff --git a/driver/fixtures/fixtures_test.go b/driver/fixtures/fixtures_test.go index 75efa41..0f8b6c1 100644 --- a/driver/fixtures/fixtures_test.go +++ b/driver/fixtures/fixtures_test.go @@ -6,8 +6,8 @@ import ( "github.com/bblfsh/go-driver/driver/golang" "github.com/bblfsh/go-driver/driver/normalizer" - "gopkg.in/bblfsh/sdk.v1/sdk/driver" - "gopkg.in/bblfsh/sdk.v1/sdk/driver/fixtures" + "gopkg.in/bblfsh/sdk.v2/sdk/driver" + "gopkg.in/bblfsh/sdk.v2/sdk/driver/fixtures" ) const projectRoot = "../../" diff --git a/driver/gen/gen.go b/driver/gen/gen.go index 5da31ed..7242798 100644 --- a/driver/gen/gen.go +++ b/driver/gen/gen.go @@ -128,7 +128,7 @@ func main() { fmt.Fprintln(w, genHeader+`package normalizer import ( - "gopkg.in/bblfsh/sdk.v1/uast/role" + "gopkg.in/bblfsh/sdk.v2/uast/role" ) var typeRoles = map[string][]role.Role{`) diff --git a/driver/golang/golang.go b/driver/golang/golang.go index 8ac5ae4..ff596c5 100644 --- a/driver/golang/golang.go +++ b/driver/golang/golang.go @@ -7,9 +7,9 @@ import ( "go/token" "reflect" - "gopkg.in/bblfsh/sdk.v1/protocol" - "gopkg.in/bblfsh/sdk.v1/sdk/driver" - "gopkg.in/bblfsh/sdk.v1/uast" + "gopkg.in/bblfsh/sdk.v2/protocol" + "gopkg.in/bblfsh/sdk.v2/sdk/driver" + "gopkg.in/bblfsh/sdk.v2/uast" ) func ParseString(code string) (*ast.File, error) { diff --git a/driver/golang/golang_test.go b/driver/golang/golang_test.go index 498ef43..36116a2 100644 --- a/driver/golang/golang_test.go +++ b/driver/golang/golang_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gopkg.in/bblfsh/sdk.v1/protocol" - "gopkg.in/bblfsh/sdk.v1/sdk/driver" - "gopkg.in/bblfsh/sdk.v1/uast" + "gopkg.in/bblfsh/sdk.v2/protocol" + "gopkg.in/bblfsh/sdk.v2/sdk/driver" + "gopkg.in/bblfsh/sdk.v2/uast" ) func TestNative(t *testing.T) { diff --git a/driver/impl/impl.go b/driver/impl/impl.go index 86f6b92..3893caf 100644 --- a/driver/impl/impl.go +++ b/driver/impl/impl.go @@ -2,7 +2,7 @@ package impl import ( "github.com/bblfsh/go-driver/driver/golang" - "gopkg.in/bblfsh/sdk.v1/sdk/driver" + "gopkg.in/bblfsh/sdk.v2/sdk/driver" ) func init() { diff --git a/driver/main.go b/driver/main.go index d437dca..56373ce 100644 --- a/driver/main.go +++ b/driver/main.go @@ -4,7 +4,7 @@ import ( _ "github.com/bblfsh/go-driver/driver/impl" "github.com/bblfsh/go-driver/driver/normalizer" - "gopkg.in/bblfsh/sdk.v1/sdk/driver" + "gopkg.in/bblfsh/sdk.v2/sdk/driver" ) func main() { diff --git a/driver/normalizer/ann_gen.go b/driver/normalizer/ann_gen.go index 72c61a7..51837b2 100644 --- a/driver/normalizer/ann_gen.go +++ b/driver/normalizer/ann_gen.go @@ -3,7 +3,7 @@ package normalizer import ( - "gopkg.in/bblfsh/sdk.v1/uast/role" + "gopkg.in/bblfsh/sdk.v2/uast/role" ) var typeRoles = map[string][]role.Role{ diff --git a/driver/normalizer/annotation.go b/driver/normalizer/annotation.go index 36aa425..2a3e893 100644 --- a/driver/normalizer/annotation.go +++ b/driver/normalizer/annotation.go @@ -3,15 +3,15 @@ package normalizer import ( "go/token" - "gopkg.in/bblfsh/sdk.v1/uast" - "gopkg.in/bblfsh/sdk.v1/uast/role" - . "gopkg.in/bblfsh/sdk.v1/uast/transformer" - "gopkg.in/bblfsh/sdk.v1/uast/transformer/positioner" + "gopkg.in/bblfsh/sdk.v2/uast" + "gopkg.in/bblfsh/sdk.v2/uast/role" + . "gopkg.in/bblfsh/sdk.v2/uast/transformer" + "gopkg.in/bblfsh/sdk.v2/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.v1/uast/transformer +// https://godoc.org/gopkg.in/bblfsh/sdk.v2/uast/transformer var Native = Transformers([][]Transformer{ // The main block of transformation rules. {Mappings(Annotations...)}, @@ -29,7 +29,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.v1/uast/transformer/positioner +// https://godoc.org/gopkg.in/bblfsh/sdk.v2/uast/transformer/positioner var Code = []CodeTransformer{ positioner.NewFillLineColFromOffset(), } diff --git a/native/native.go b/native/native.go index 82a5056..306a601 100644 --- a/native/native.go +++ b/native/native.go @@ -2,7 +2,7 @@ package main import ( "github.com/bblfsh/go-driver/driver/golang" - "gopkg.in/bblfsh/sdk.v1/sdk/driver" + "gopkg.in/bblfsh/sdk.v2/sdk/driver" ) func main() {