Skip to content

Commit c2db396

Browse files
authored
Merge pull request #403 from se7entyse7en/bblfsh-go-client-migration
Migrates from client-go to go-client
2 parents 77cd5e5 + 7902626 commit c2db396

File tree

11 files changed

+22
-23
lines changed

11 files changed

+22
-23
lines changed

Gopkg.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
name = "github.com/stretchr/testify"
3535
version = "1.2.2"
3636

37-
[[constraint]]
38-
name = "gopkg.in/bblfsh/client-go.v3"
39-
version = "3.2.0"
40-
4137
[[constraint]]
4238
name = "gopkg.in/bblfsh/sdk.v2"
4339
version = "2.3.0"
@@ -53,3 +49,7 @@
5349
[[constraint]]
5450
name = "gopkg.in/src-d/go-cli.v0"
5551
branch= "master"
52+
53+
[[constraint]]
54+
name = "github.com/bblfsh/go-client"
55+
version = "4.0.0"

server/handler/uast.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/src-d/gitbase-web/server/serializer"
1212
"github.com/src-d/gitbase-web/server/service"
1313

14-
"gopkg.in/bblfsh/client-go.v3"
15-
"gopkg.in/bblfsh/client-go.v3/tools"
14+
bblfsh "github.com/bblfsh/go-client"
15+
"github.com/bblfsh/go-client/tools"
1616
"gopkg.in/bblfsh/sdk.v2/uast/nodes"
1717
)
1818

server/handler/version.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package handler
33
import (
44
"net/http"
55

6-
bblfsh "gopkg.in/bblfsh/client-go.v3"
7-
6+
bblfsh "github.com/bblfsh/go-client"
87
"github.com/src-d/gitbase-web/server/serializer"
98
"github.com/src-d/gitbase-web/server/service"
109
)

server/service/uast.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"fmt"
66

7-
bblfsh "gopkg.in/bblfsh/client-go.v3"
7+
bblfsh "github.com/bblfsh/go-client"
88
"gopkg.in/bblfsh/sdk.v2/uast/nodes"
99
"gopkg.in/bblfsh/sdk.v2/uast/nodes/nodesproto"
1010
errors "gopkg.in/src-d/go-errors.v1"

vendor/gopkg.in/bblfsh/client-go.v3/doc.go renamed to vendor/github.com/bblfsh/go-client/doc.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)