diff --git a/cmd/kouch-replicate/cmd/root.go b/cmd/kouch-replicate/cmd/root.go index 62ae524..2eae226 100644 --- a/cmd/kouch-replicate/cmd/root.go +++ b/cmd/kouch-replicate/cmd/root.go @@ -12,10 +12,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - _ "github.com/go-kivik/couchdb" // The CouchDB driver - _ "github.com/go-kivik/fsdb" // The Filesystem driver - "github.com/go-kivik/kivik" - "github.com/go-kivik/xkivik" + _ "github.com/go-kivik/couchdb/v3" // The CouchDB driver + _ "github.com/go-kivik/fsdb/v3" // The Filesystem driver + "github.com/go-kivik/kivik/v3" + "github.com/go-kivik/xkivik/v3" ) var cfgFile string diff --git a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url index b69dcde..5dc5c79 100644 --- a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url +++ b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url @@ -5,7 +5,7 @@ driverClient: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=22) "Kivik/2.0.0-prerelease", + (string) (len=11) "Kivik/3.0.0", (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" }, Client: (*http.Client)({ @@ -44,7 +44,7 @@ client: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=22) "Kivik/2.0.0-prerelease", + (string) (len=11) "Kivik/3.0.0", (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" }, Client: (*http.Client)({ diff --git a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url index 20b5331..ac97297 100644 --- a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url +++ b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url @@ -5,7 +5,7 @@ driverClient: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=22) "Kivik/2.0.0-prerelease", + (string) (len=11) "Kivik/3.0.0", (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" }, Client: (*http.Client)({ @@ -44,7 +44,7 @@ client: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=22) "Kivik/2.0.0-prerelease", + (string) (len=11) "Kivik/3.0.0", (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" }, Client: (*http.Client)({ diff --git a/cmd/kouch-replicate/main.go b/cmd/kouch-replicate/main.go index 7a89294..5576c52 100644 --- a/cmd/kouch-replicate/main.go +++ b/cmd/kouch-replicate/main.go @@ -1,6 +1,6 @@ package main -import "github.com/go-kivik/xkivik/cmd/kouch-replicate/cmd" +import "github.com/go-kivik/xkivik/v3/cmd/kouch-replicate/cmd" func main() { cmd.Execute() diff --git a/document.go b/document.go index e24c249..4678e6d 100644 --- a/document.go +++ b/document.go @@ -3,7 +3,7 @@ package xkivik import ( "encoding/json" - "github.com/go-kivik/kivik" + "github.com/go-kivik/kivik/v3" ) // Document represents any CouchDB document. diff --git a/document_test.go b/document_test.go index 9a9cf50..2956b09 100644 --- a/document_test.go +++ b/document_test.go @@ -7,7 +7,7 @@ import ( "gitlab.com/flimzy/testy" - "github.com/go-kivik/kivik" + "github.com/go-kivik/kivik/v3" ) func TestDocumentMarshalJSON(t *testing.T) { diff --git a/go.mod b/go.mod index 24f827a..928ff60 100644 --- a/go.mod +++ b/go.mod @@ -1,28 +1,21 @@ -module github.com/go-kivik/xkivik +module github.com/go-kivik/xkivik/v3 go 1.13 require ( - github.com/flimzy/diff v0.1.6 // indirect - github.com/flimzy/testy v0.1.16 // indirect - github.com/go-kivik/couchdb v2.0.0-pre3.0.20190830175249-a8dab644dca9+incompatible - github.com/go-kivik/fsdb v0.0.3-0.20190903102823-68890ff2a340 - github.com/go-kivik/kivik v2.0.0-pre2.0.20190831084228-13d283a000ac+incompatible - github.com/go-kivik/kivikmock v0.0.0-20190709084645-a819252dd98c - github.com/go-kivik/kiviktest v2.0.0-pre2+incompatible - github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de // indirect - github.com/icza/dyno v0.0.0-20180601094105-0c96289f9585 // indirect + github.com/go-kivik/couchdb/v3 v3.0.0 + github.com/go-kivik/fsdb/v3 v3.0.0 + github.com/go-kivik/kivik/v3 v3.0.2 + github.com/go-kivik/kivikmock/v3 v3.0.0 + github.com/go-kivik/kiviktest/v3 v3.0.1 github.com/mitchellh/go-homedir v1.1.0 - github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect github.com/pelletier/go-toml v1.4.0 // indirect github.com/spf13/afero v1.2.2 // indirect github.com/spf13/cobra v0.0.7 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.6.3 - gitlab.com/flimzy/ale v0.0.0-20190725131621-b59d7ca0da24 // indirect gitlab.com/flimzy/parallel v0.0.5 gitlab.com/flimzy/testy v0.1.1 - golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect golang.org/x/sys v0.0.0-20190902133755-9109b7679e13 // indirect golang.org/x/text v0.3.2 // indirect diff --git a/go.sum b/go.sum index 37d70d6..b33242e 100644 --- a/go.sum +++ b/go.sum @@ -23,24 +23,28 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/flimzy/diff v0.1.5/go.mod h1:lFJtC7SPsK0EroDmGTSrdtWKAxOk3rO+q+e04LL05Hs= github.com/flimzy/diff v0.1.6 h1:ufTsTKcDtlaczpJTo3u1NeYqzuP6oRpy1VwQUIrgmBY= github.com/flimzy/diff v0.1.6/go.mod h1:lFJtC7SPsK0EroDmGTSrdtWKAxOk3rO+q+e04LL05Hs= -github.com/flimzy/testy v0.1.16 h1:nchF7XYCkfHJiZKMRhAVKQp8jzpXFPwJYnSrnFysqlI= -github.com/flimzy/testy v0.1.16/go.mod h1:3szguN8NXqgq9bt9Gu8TQVj698PJWmyx/VY1frwwKrM= +github.com/flimzy/testy v0.1.17-0.20190521133342-95b386c3ece6 h1:uw6StVCll2vXdHJMAiKvhfAwcwBYD6d9dgWOIdHMku8= +github.com/flimzy/testy v0.1.17-0.20190521133342-95b386c3ece6/go.mod h1:3szguN8NXqgq9bt9Gu8TQVj698PJWmyx/VY1frwwKrM= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kivik/couchdb v2.0.0-pre3.0.20190830175249-a8dab644dca9+incompatible h1:IVDeZYYs0UuIM8gSd6R9zCCMEnh976KNysa6A36HmQg= -github.com/go-kivik/couchdb v2.0.0-pre3.0.20190830175249-a8dab644dca9+incompatible/go.mod h1:5XJRkAMpBlEVA4q0ktIZjUPYBjoBmRoiWvwUBzP3BOQ= -github.com/go-kivik/fsdb v0.0.3-0.20190903102823-68890ff2a340 h1:d19VaLxvMPF3GpZCK1UtZDPXLJmR5h0f0ilvuzvsihc= -github.com/go-kivik/fsdb v0.0.3-0.20190903102823-68890ff2a340/go.mod h1:pcUvFIZ0KWuQx2TS/0UEjR+uIPsFfzCGN27NXjhzuek= -github.com/go-kivik/kivik v2.0.0-pre2.0.20190831084228-13d283a000ac+incompatible h1:HseycbHtWDHdcDXGI/2ym0m3LI95ms4U2K+7juI9XBs= -github.com/go-kivik/kivik v2.0.0-pre2.0.20190831084228-13d283a000ac+incompatible/go.mod h1:nIuJ8z4ikBrVUSk3Ua8NoDqYKULPNjuddjqRvlSUyyQ= -github.com/go-kivik/kivikmock v0.0.0-20190709084645-a819252dd98c h1:YzwAASMcGKekvQwCkoFZcYptVipYNL1PxVs5WuRAU7I= -github.com/go-kivik/kivikmock v0.0.0-20190709084645-a819252dd98c/go.mod h1:ZhBCIjnJV+y2zSzMBX1rWkTDoHxVk4z34b8jDABNXjI= -github.com/go-kivik/kiviktest v2.0.0-pre2+incompatible h1:+v4A7gKfZ9nhU/TSmEVFa8vQJRIhtc+kjEB/91g/BT8= -github.com/go-kivik/kiviktest v2.0.0-pre2+incompatible/go.mod h1:JdhVyzixoYhoIDUt6hRf1yAfYyaDa5/u9SDOindDkfQ= +github.com/go-kivik/couchdb/v3 v3.0.0 h1:HBDO5gD2FxXECKqb1HMBK+pitv4E+p88RvlaJQZwFcs= +github.com/go-kivik/couchdb/v3 v3.0.0/go.mod h1:eTGmiw9fnA30gdqQCgH3vNrW+glhl+48RbvZga8/wLk= +github.com/go-kivik/fsdb/v3 v3.0.0 h1:bKaHr7aSwcnttS5iJTbIaTN/AKkJewN2tsYI3o+DR9U= +github.com/go-kivik/fsdb/v3 v3.0.0/go.mod h1:uO9LhO78EQpPa3VYVlvT4dVH29HT6zGrODaY5MzF/c8= +github.com/go-kivik/kivik/v3 v3.0.0/go.mod h1:7tmQDvkta/pcijpUjLMsQ9HJUELiKD5zm6jQ3Gb9cxE= +github.com/go-kivik/kivik/v3 v3.0.2 h1:+tKWFJTAGlUjK1DQhn2rEGQvroYLTUCAO6/Kk8K4uQQ= +github.com/go-kivik/kivik/v3 v3.0.2/go.mod h1:chqVuHKAU9j2C7qL0cAH2FCO26oL+0B4aIBeCRMnLa8= +github.com/go-kivik/kivikmock/v3 v3.0.0 h1:k4L/LPgvyAP4xi+MZ676tsDSqOJfWNymTbZWpQfb630= +github.com/go-kivik/kivikmock/v3 v3.0.0/go.mod h1:P6g9RBT2clg6CCDkVeQ8I0MlIB6wX0mGhL9P2ZgcKAE= +github.com/go-kivik/kiviktest/v3 v3.0.0/go.mod h1:pLjkg/F61+X4Ks1BpbrTgbChjdPcINX2HysR8i7AfBM= +github.com/go-kivik/kiviktest/v3 v3.0.1 h1:cL1XvG0DZ0oEAsrWa3Tgi8sa/0eNyHYJatFfble3x+4= +github.com/go-kivik/kiviktest/v3 v3.0.1/go.mod h1:pLjkg/F61+X4Ks1BpbrTgbChjdPcINX2HysR8i7AfBM= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -54,17 +58,19 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de h1:F7WD09S8QB4LrkEpka0dFPLSotH11HRpCsLIbIcJ7sU= -github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20200209144316-f9cef593def5 h1:On5cS+huOk7mqad9QjklHw+BMGKykSmu6QG32X+C77o= +github.com/gopherjs/gopherjs v0.0.0-20200209144316-f9cef593def5/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/icza/dyno v0.0.0-20180601094105-0c96289f9585 h1:kWQPgPrzV4M6ntaGzqU/tI9/OdntSFA9Y9ft/wlDpy0= -github.com/icza/dyno v0.0.0-20180601094105-0c96289f9585/go.mod h1:FOWDLyFiAsx5UmipjsBYguvps42mgph4nRPwuci95qM= +github.com/icza/dyno v0.0.0-20200205103839-49cb13720835 h1:f1irK5f03uGGj+FjgQfZ5VhdKNVQVJ4skHsedzVohQ4= +github.com/icza/dyno v0.0.0-20200205103839-49cb13720835/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -94,21 +100,32 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/otiai10/copy v1.0.1/go.mod h1:8bMCJrAqOtN/d9oyh5HR7HhLQMvcGMpGdwRDYsfOCHc= github.com/otiai10/copy v1.0.2 h1:DDNipYy6RkIkjMwy+AWzgKiNTyj2RUI9yEMeETEpVyc= github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY= +github.com/otiai10/copy v1.1.1 h1:PH7IFlRQ6Fv9vYmuXbDRLdgTHoP1w483kPNUP2bskpo= +github.com/otiai10/copy v1.1.1/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 h1:o59bHXu8Ejas8Kq6pjoVJQ9/neN66SM8AKh6wI42BBs= github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776/go.mod h1:3HNVkVOU7vZeFXocWuvtcS0XSFLcf2XUSDHkq9t1jU4= +github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI= +github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= +github.com/otiai10/mint v1.2.3/go.mod h1:YnfyPNhBvnY8bW4SGQHCs/aAFhkgySlMZbrF5U0bOVw= github.com/otiai10/mint v1.2.4 h1:DxYL0itZyPaR5Z9HILdxSoHx+gNs6Yx+neOGS3IVUk0= github.com/otiai10/mint v1.2.4/go.mod h1:d+b7n/0R3tdyUYYylALXpWQ/kTN+QobSq/4SRGBkR3M= github.com/otiai10/mint v1.3.0 h1:Ady6MKVezQwHBkGzLFbrsywyp09Ah7rkmfjV3Bcr5uc= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= +github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc= +github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -152,16 +169,21 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -gitlab.com/flimzy/ale v0.0.0-20190725131621-b59d7ca0da24 h1:yYOM+ydaGGN2G/iPaZSrI4hbS2YsMxfiAlsR9wjzt9M= -gitlab.com/flimzy/ale v0.0.0-20190725131621-b59d7ca0da24/go.mod h1:TJ6/ncB/sG+vQWV7XigJ5oe78WrMhjDrOLZSftH/bt8= +gitlab.com/flimzy/ale v0.0.1 h1:erCrm38bk9sXI5ZY6QedpLxp/uKVuvwlV80ZugdvsFI= +gitlab.com/flimzy/ale v0.0.1/go.mod h1:syUOexUwVSRspcYmwah9zxq1X6XBtRHv4CgPADQtPKE= gitlab.com/flimzy/parallel v0.0.5 h1:VNWiCtE43rw1HsM2wX3nNhMyrhWPKfn0ItbO5iRTXoU= gitlab.com/flimzy/parallel v0.0.5/go.mod h1:4BTXrItF3cH8JQWsA17qEeTWFfLVXoB7pkADuaxrnqQ= +gitlab.com/flimzy/testy v0.0.0-20190816103046-aca1ef5ffe7e/go.mod h1:MQwjgAyueIbBZv+qSYAMs6LaZwsJysPs0BK/niv9JiI= +gitlab.com/flimzy/testy v0.0.2/go.mod h1:YObF4cq711ubd/3U0ydRQQVz7Cnq/ChgJpVwNr/AJac= +gitlab.com/flimzy/testy v0.0.3/go.mod h1:YObF4cq711ubd/3U0ydRQQVz7Cnq/ChgJpVwNr/AJac= gitlab.com/flimzy/testy v0.1.1 h1:e4uaZzuQPG3WIEje+HNQOFNFaAbd1cvQrvTbRiMjtIA= gitlab.com/flimzy/testy v0.1.1/go.mod h1:YObF4cq711ubd/3U0ydRQQVz7Cnq/ChgJpVwNr/AJac= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -177,8 +199,8 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -201,6 +223,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -220,4 +243,6 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/replicate.go b/replicate.go index d9cfb7d..cd128bb 100644 --- a/replicate.go +++ b/replicate.go @@ -12,7 +12,7 @@ import ( "gitlab.com/flimzy/parallel" - "github.com/go-kivik/kivik" + "github.com/go-kivik/kivik/v3" ) func mergeOptions(otherOpts ...kivik.Options) kivik.Options { diff --git a/replicate_live_test.go b/replicate_live_test.go index a33234f..1d2d4fe 100644 --- a/replicate_live_test.go +++ b/replicate_live_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - _ "github.com/go-kivik/couchdb" // CouchDB driver - _ "github.com/go-kivik/fsdb" // Filesystem driver - "github.com/go-kivik/kivik" - "github.com/go-kivik/kiviktest/kt" + _ "github.com/go-kivik/couchdb/v3" // CouchDB driver + _ "github.com/go-kivik/fsdb/v3" // Filesystem driver + "github.com/go-kivik/kivik/v3" + "github.com/go-kivik/kiviktest/v3/kt" "gitlab.com/flimzy/testy" ) diff --git a/replicate_test.go b/replicate_test.go index c32d473..79783ea 100644 --- a/replicate_test.go +++ b/replicate_test.go @@ -10,10 +10,10 @@ import ( "gitlab.com/flimzy/testy" - _ "github.com/go-kivik/fsdb" // The filesystem driver - "github.com/go-kivik/kivik" - "github.com/go-kivik/kivik/driver" - "github.com/go-kivik/kivikmock" + _ "github.com/go-kivik/fsdb/v3" // The filesystem driver + "github.com/go-kivik/kivik/v3" + "github.com/go-kivik/kivik/v3/driver" + "github.com/go-kivik/kivikmock/v3" ) func TestReplicateMock(t *testing.T) {