Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix module path #335

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix module path #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/bblfshctl/cmd/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"
"time"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"

"google.golang.org/grpc"
sdk "gopkg.in/bblfsh/sdk.v1/protocol"
Expand Down
4 changes: 2 additions & 2 deletions cmd/bblfshctl/cmd/driver_install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"sync"
"time"

"github.com/bblfsh/bblfshd/daemon"
"github.com/bblfsh/bblfshd/v2/daemon"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"github.com/bblfsh/sdk/v3/driver/manifest/discovery"

"github.com/briandowns/spinner"
Expand Down
2 changes: 1 addition & 1 deletion cmd/bblfshctl/cmd/driver_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"

"github.com/docker/go-units"
"github.com/olekukonko/tablewriter"
Expand Down
2 changes: 1 addition & 1 deletion cmd/bblfshctl/cmd/driver_remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"os"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/bblfshctl/cmd/instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"

"github.com/docker/go-units"
"github.com/olekukonko/tablewriter"
Expand Down
2 changes: 1 addition & 1 deletion cmd/bblfshctl/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"strings"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"

"github.com/olekukonko/tablewriter"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/bblfshctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/bblfsh/bblfshd/cmd/bblfshctl/cmd"
"github.com/bblfsh/bblfshd/v2/cmd/bblfshctl/cmd"

"github.com/jessevdk/go-flags"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/bblfshd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"gopkg.in/src-d/go-log.v1"

"github.com/bblfsh/bblfshd/daemon"
"github.com/bblfsh/bblfshd/runtime"
"github.com/bblfsh/bblfshd/v2/daemon"
"github.com/bblfsh/bblfshd/v2/runtime"

cmdutil "github.com/bblfsh/sdk/v3/cmd"
"github.com/bblfsh/sdk/v3/driver/manifest/discovery"
Expand Down
2 changes: 1 addition & 1 deletion daemon/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/runtime"
"github.com/bblfsh/bblfshd/v2/runtime"

protocol2 "github.com/bblfsh/sdk/v3/protocol"
"github.com/containers/image/types"
Expand Down
4 changes: 2 additions & 2 deletions daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/opentracing/opentracing-go"
"gopkg.in/src-d/go-log.v1"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/runtime"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/runtime"

"github.com/bblfsh/sdk/v3/driver"
"github.com/bblfsh/sdk/v3/driver/manifest"
Expand Down
2 changes: 1 addition & 1 deletion daemon/daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"google.golang.org/grpc"
"gopkg.in/bblfsh/sdk.v1/protocol"

"github.com/bblfsh/bblfshd/runtime"
"github.com/bblfsh/bblfshd/v2/runtime"
)

// actual date format used in bblfshd is different
Expand Down
4 changes: 2 additions & 2 deletions daemon/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"syscall"
"time"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/runtime"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/runtime"

protocol2 "github.com/bblfsh/sdk/v3/protocol"
"github.com/opencontainers/runc/libcontainer/configs"
Expand Down
4 changes: 2 additions & 2 deletions daemon/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/runtime"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/runtime"

"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package daemon

import (
"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"github.com/bblfsh/sdk/v3/driver"
"gopkg.in/src-d/go-errors.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/opentracing/opentracing-go"
"github.com/prometheus/client_golang/prometheus"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"gopkg.in/src-d/go-errors.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion daemon/pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion daemon/protocol/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate proteus -f $GOPATH/src/ -p github.com/bblfsh/bblfshd/daemon/protocol --verbose
//go:generate proteus -f $GOPATH/src/ -p github.com/bblfsh/bblfshd/v2/daemon/protocol --verbose
//go:generate stringer -type=Status -output stringer.go

package protocol
Expand Down
2 changes: 1 addition & 1 deletion daemon/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/opentracing/opentracing-go"
"github.com/prometheus/client_golang/prometheus"

"github.com/bblfsh/bblfshd/daemon/protocol"
"github.com/bblfsh/bblfshd/v2/daemon/protocol"
"github.com/bblfsh/sdk/v3/driver/manifest"
protocol2 "github.com/bblfsh/sdk/v3/protocol"
xcontext "golang.org/x/net/context"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/bblfsh/bblfshd
module github.com/bblfsh/bblfshd/v2

go 1.12

Expand Down