Skip to content

Commit 31a159a

Browse files
CMogilkoCMogilko
committed
prepare for v4
1 parent ea25a76 commit 31a159a

File tree

120 files changed

+201
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+201
-200
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
language: go
22

33
go:
4-
- 1.7.5
5-
- 1.8.1
6-
- 1.9.2
4+
- 1.7.x
5+
- 1.8.x
6+
- 1.9.x
77
- tip
88

99
cache: apt
1010

11-
go_import_path: gopkg.in/gorethink/gorethink.v3
11+
go_import_path: gopkg.in/gorethink/gorethink.v4
12+
13+
install: go get -t ./...
1214

1315
before_script:
14-
- go get -t ./...
1516
- source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
1617
- wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
1718
- sudo apt-get update

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
test:
2-
test -d ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3 && mv ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3 ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3.bak; true
3-
cp -R . ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3
4-
go test -coverprofile=cover.out -race gopkg.in/gorethink/gorethink.v3; true
2+
test -d ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4 && mv ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4 ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4.bak; true
3+
cp -R . ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4
4+
go test -coverprofile=cover.out -race gopkg.in/gorethink/gorethink.v4; true
55
go tool cover -html=cover.out -o cover.html; true
66
rm -f cover.out; true
7-
rm -rf ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3
8-
test -d ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3.bak && mv ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3.bak ${GOPATH}/src/gopkg.in/gorethink/gorethink.v3; true
7+
rm -rf ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4
8+
test -d ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4.bak && mv ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4.bak ${GOPATH}/src/gopkg.in/gorethink/gorethink.v4; true

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you need any help you can find me on the [RethinkDB slack](http://slack.rethi
2020
## Installation
2121

2222
```
23-
go get gopkg.in/gorethink/gorethink.v3
23+
go get gopkg.in/gorethink/gorethink.v4
2424
```
2525

2626
Replace `v3` with `v2` or `v1` to use previous versions.
@@ -35,7 +35,7 @@ import (
3535
"fmt"
3636
"log"
3737

38-
r "gopkg.in/gorethink/gorethink.v3"
38+
r "gopkg.in/gorethink/gorethink.v4"
3939
)
4040

4141
func Example() {

‎connection.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"golang.org/x/net/context"
13-
p "gopkg.in/gorethink/gorethink.v3/ql2"
13+
p "gopkg.in/gorethink/gorethink.v4/ql2"
1414
"sync"
1515
"github.com/opentracing/opentracing-go"
1616
"github.com/opentracing/opentracing-go/ext"

‎connection_handshake.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"golang.org/x/crypto/pbkdf2"
1818

19-
p "gopkg.in/gorethink/gorethink.v3/ql2"
19+
p "gopkg.in/gorethink/gorethink.v4/ql2"
2020
)
2121

2222
type HandshakeVersion int

‎connection_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package gorethink
22

33
import (
44
test "gopkg.in/check.v1"
5-
p "gopkg.in/gorethink/gorethink.v3/ql2"
5+
p "gopkg.in/gorethink/gorethink.v4/ql2"
66
"golang.org/x/net/context"
77
"encoding/binary"
88
"encoding/json"

‎cursor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"sync"
99

1010
"golang.org/x/net/context"
11-
"gopkg.in/gorethink/gorethink.v3/encoding"
12-
p "gopkg.in/gorethink/gorethink.v3/ql2"
11+
"gopkg.in/gorethink/gorethink.v4/encoding"
12+
p "gopkg.in/gorethink/gorethink.v4/ql2"
1313
"github.com/opentracing/opentracing-go"
1414
)
1515

‎errors.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"strings"
99

10-
p "gopkg.in/gorethink/gorethink.v3/ql2"
10+
p "gopkg.in/gorethink/gorethink.v4/ql2"
1111
)
1212

1313
var (

‎gorethink.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/sirupsen/logrus"
77

8-
"gopkg.in/gorethink/gorethink.v3/encoding"
8+
"gopkg.in/gorethink/gorethink.v4/encoding"
99
"io/ioutil"
1010
)
1111

‎internal/integration/reql_tests/common.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"time"
1010

1111
"github.com/stretchr/testify/suite"
12-
r "gopkg.in/gorethink/gorethink.v3"
13-
"gopkg.in/gorethink/gorethink.v3/internal/compare"
12+
r "gopkg.in/gorethink/gorethink.v4"
13+
"gopkg.in/gorethink/gorethink.v4/internal/compare"
1414
)
1515

1616
func maybeRun(query interface{}, session *r.Session, opts r.RunOpts) interface{} {

0 commit comments

Comments
 (0)