Merge pull request #102 from abeaumont/feature/upgrade-to-sdk-v1

[Do not merge] Upgrade to SDK v1
bblfsh · Sep 19, 2017 · 30fca16 · 30fca16
2 parents 9fc311a + d641442
commit 30fca16
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/cmd/bblfsh/client.go b/cmd/bblfsh/client.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"google.golang.org/grpc"
-	"gopkg.in/bblfsh/sdk.v0/protocol"
+	"gopkg.in/bblfsh/sdk.v1/protocol"
 	"gopkg.in/src-d/go-errors.v1"
 )
 

diff --git a/driver.go b/driver.go
@@ -7,8 +7,8 @@ import (
 	"github.com/bblfsh/server/runtime"
 
 	"github.com/Sirupsen/logrus"
-	"gopkg.in/bblfsh/sdk.v0/protocol"
-	"gopkg.in/bblfsh/sdk.v0/protocol/driver"
+	"gopkg.in/bblfsh/sdk.v1/protocol"
+	"gopkg.in/bblfsh/sdk.v1/protocol/driver"
 )
 
 // Driver is a client to communicate with a driver. It provides the parser

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -36,8 +36,8 @@ import:
   version: ^1.1.0
 - package: google.golang.org/grpc
   version: ^1.4.2
-- package: gopkg.in/bblfsh/sdk.v0
-  version: ^0.2.1
+- package: gopkg.in/bblfsh/sdk.v1
+  version: ^1.0.0-rc1
 - package: gopkg.in/src-d/enry.v1
   version: ^1.3.0
 - package: gopkg.in/src-d/go-errors.v1

diff --git a/pool.go b/pool.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"gopkg.in/bblfsh/sdk.v0/protocol"
+	"gopkg.in/bblfsh/sdk.v1/protocol"
 )
 
 var (

diff --git a/pool_test.go b/pool_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/bblfsh/sdk.v0/protocol"
+	"gopkg.in/bblfsh/sdk.v1/protocol"
 )
 
 type mockDriver struct {

diff --git a/runtime/common_test.go b/runtime/common_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/containers/image/types"
-	"gopkg.in/bblfsh/sdk.v0/manifest"
+	"gopkg.in/bblfsh/sdk.v1/manifest"
 )
 
 func init() {

diff --git a/runtime/storage.go b/runtime/storage.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gopkg.in/bblfsh/sdk.v0/manifest"
+	"gopkg.in/bblfsh/sdk.v1/manifest"
 )
 
 var (

diff --git a/runtime/storage_test.go b/runtime/storage_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/bblfsh/sdk.v0/manifest"
+	"gopkg.in/bblfsh/sdk.v1/manifest"
 )
 
 func TestStorageInstall(t *testing.T) {

diff --git a/server.go b/server.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"google.golang.org/grpc"
-	"gopkg.in/bblfsh/sdk.v0/protocol"
-	"gopkg.in/bblfsh/sdk.v0/uast"
+	"gopkg.in/bblfsh/sdk.v1/protocol"
+	"gopkg.in/bblfsh/sdk.v1/uast"
 	"gopkg.in/src-d/go-errors.v1"
 )
 

diff --git a/server_test.go b/server_test.go
@@ -17,8 +17,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"gopkg.in/bblfsh/sdk.v0/protocol"
-	"gopkg.in/bblfsh/sdk.v0/uast"
+	"gopkg.in/bblfsh/sdk.v1/protocol"
+	"gopkg.in/bblfsh/sdk.v1/uast"
 )
 
 type echoDriver struct{}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"time"
     	"github.com/pkg/errors"
-    	"gopkg.in/bblfsh/sdk.v0/protocol"
+    	"gopkg.in/bblfsh/sdk.v1/protocol"
     )
     var (
@@ Expand Down @@