Skip to content

Commit

Permalink
Upgrade to dgo v200.03.0 and Go 1.14 (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
RJKeevil committed Apr 11, 2020
1 parent f73f758 commit 4bb8568
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 280 deletions.
4 changes: 2 additions & 2 deletions delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"bytes"
"context"

"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200/protos/api"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/authapp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"log"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200"
"github.com/dgraph-io/dgo/v200/protos/api"
"github.com/dolan-in/dgman"
"github.com/gin-gonic/gin"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion examples/authapp/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"time"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"
"github.com/dolan-in/dgman"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/mutate/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/dolan-in/dgman"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"

"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200/protos/api"
"google.golang.org/grpc"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/schema/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/dolan-in/dgman"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"

"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200/protos/api"
"google.golang.org/grpc"
)

Expand Down
29 changes: 6 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
module github.com/dolan-in/dgman

require (
cloud.google.com/go/bigquery v1.4.0 // indirect
dmitri.shuralyov.com/gpu/mtl v0.0.0-20191203043605-d42048ed14fd // indirect
github.com/cncf/udpa/go v0.0.0-20200124205748-db4b343e48c1 // indirect
github.com/creack/pty v1.1.9 // indirect
github.com/dgraph-io/dgo/v2 v2.1.0
github.com/envoyproxy/go-control-plane v0.9.2 // indirect
github.com/dgraph-io/dgo/v200 v200.0.0-20200401175452-e463f9234453
github.com/gin-gonic/gin v1.5.0
github.com/golang/mock v1.4.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/google/go-cmp v0.4.0 // indirect
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515
github.com/kr/pretty v0.2.0 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_model v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.5.2 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.4.0
golang.org/x/crypto v0.0.0-20200117160349-530e935923ad // indirect
golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
golang.org/x/mobile v0.0.0-20200123024942-82c397c4c527 // indirect
golang.org/x/mod v0.2.0 // indirect
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa // indirect
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 // indirect
golang.org/x/tools/gopls v0.1.8-0.20191220234730-f13409bbebaf // indirect
google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150 // indirect
google.golang.org/grpc v1.26.0
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
grpc.go4.org v0.0.0-20170609214715-11d0a25b4919 // indirect
rsc.io/sampler v1.99.99 // indirect
)

go 1.13
go 1.14
245 changes: 7 additions & 238 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dgman
import (
"context"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"
)

// TxnInterface provides interface for dgman.TxnContext
Expand Down
4 changes: 2 additions & 2 deletions mutate.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"strconv"
"strings"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200"
"github.com/dgraph-io/dgo/v200/protos/api"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions query.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"strconv"
"strings"

"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200/protos/api"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"reflect"
"strings"

"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200/protos/api"
"github.com/kr/logfmt"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"
)

const tagName = "dgraph"
Expand Down
2 changes: 1 addition & 1 deletion txn.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"
)

// TxnContext is dgo transaction coupled with context
Expand Down
4 changes: 2 additions & 2 deletions utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"strconv"
"strings"

"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v200"

"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v200/protos/api"
"google.golang.org/grpc"
)

Expand Down

0 comments on commit 4bb8568

Please sign in to comment.