twitchtv · gurudesu · Nov 4, 2020 · Nov 4, 2020 · Nov 4, 2020
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ is a good read.
 Use `go get` to install the Go client-and-server generator:
 
 ```
-go get github.com/twitchtv/twirp/protoc-gen-twirp
+go get github.com/twitchtv/twirp/v8/protoc-gen-twirp
 ```
 
 You will also need:

diff --git a/clientcompat/clientcompat.go b/clientcompat/clientcompat.go
@@ -16,7 +16,7 @@ package main
 import (
  "context"
 
- "github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
+ "github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
 )
 
 type clientCompat struct {

diff --git a/clientcompat/gocompat/gocompat.go b/clientcompat/gocompat/gocompat.go
@@ -21,8 +21,8 @@ import (
  "os"
 
  "github.com/golang/protobuf/proto"
- "github.com/twitchtv/twirp"
- "github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
+ "github.com/twitchtv/twirp/v8"
+ "github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
 )
 
 func main() {

diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go
diff --git a/clientcompat/main.go b/clientcompat/main.go
@@ -23,8 +23,8 @@ import (
  "os"
  "reflect"
 
- "github.com/twitchtv/twirp"
- "github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
+ "github.com/twitchtv/twirp/v8"
+ "github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
 )
 
 var (

diff --git a/clientcompat/run.go b/clientcompat/run.go
@@ -20,7 +20,7 @@ import (
 
  "github.com/gogo/protobuf/proto"
  "github.com/pkg/errors"
- "github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
+ "github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
 )
 
 func runClient(clientBin string, msg *clientcompat.ClientCompatMessage) (resp []byte, errCode string, err error) {

diff --git a/context.go b/context.go
@@ -18,7 +18,7 @@ import (
  "errors"
  "net/http"
 
- "github.com/twitchtv/twirp/internal/contextkeys"
+ "github.com/twitchtv/twirp/v8/internal/contextkeys"
 )
 
 // MethodName extracts the name of the method being handled in the given

diff --git a/ctxsetters/ctxsetters.go b/ctxsetters/ctxsetters.go
@@ -23,7 +23,7 @@ import (
  "net/http"
  "strconv"
 
- "github.com/twitchtv/twirp/internal/contextkeys"
+ "github.com/twitchtv/twirp/v8/internal/contextkeys"
 )
 
 func WithMethodName(ctx context.Context, name string) context.Context {

diff --git a/docs/example.md b/docs/example.md
@@ -104,7 +104,7 @@ import (
  "context"
  "math/rand"
 
- "github.com/twitchtv/twirp"
+ "github.com/twitchtv/twirp/v8"
  pb "github.com/twitchtv/twirpexample/rpc/haberdasher"
 )
 

diff --git a/docs/install.md b/docs/install.md
@@ -55,7 +55,7 @@ Download and install `protoc-gen-go` using the normal Go tools:
 
 ```sh
 $ go get -u github.com/golang/protobuf/protoc-gen-go
-$ go get -u github.com/twitchtv/twirp/protoc-gen-twirp
+$ go get -u github.com/twitchtv/twirp/v8/protoc-gen-twirp
 ```
 
 The normal Go tools will install `protoc-gen-go` in `$GOBIN`, defaulting to

diff --git a/errors_1_13_test.go b/errors_1_13_test.go
@@ -20,7 +20,7 @@ import (
  "fmt"
  "testing"
 
- "github.com/twitchtv/twirp"
+ "github.com/twitchtv/twirp/v8"
 )
 
 type myError string

diff --git a/example/cmd/client/main.go b/example/cmd/client/main.go
@@ -19,8 +19,8 @@ import (
  "log"
  "net/http"
 
- "github.com/twitchtv/twirp"
- "github.com/twitchtv/twirp/example"
+ "github.com/twitchtv/twirp/v8"
+ "github.com/twitchtv/twirp/v8/example"
 )
 
 func main() {

diff --git a/example/cmd/server/main.go b/example/cmd/server/main.go
@@ -20,9 +20,9 @@ import (
  "net/http"
  "os"
 
- "github.com/twitchtv/twirp"
- "github.com/twitchtv/twirp/example"
- "github.com/twitchtv/twirp/hooks/statsd"
+ "github.com/twitchtv/twirp/v8"
+ "github.com/twitchtv/twirp/v8/example"
+ "github.com/twitchtv/twirp/v8/hooks/statsd"
 )
 
 type randomHaberdasher struct{}

diff --git a/example/service.twirp.go b/example/service.twirp.go
diff --git a/go.mod b/go.mod
@@ -0,0 +1,12 @@
+module github.com/twitchtv/twirp/v8
+
+go 1.15
+
+require (
+ github.com/davecgh/go-spew v1.1.0 // indirect
+ github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415
+ github.com/golang/protobuf v1.2.1-0.20180919224659-7716a980bcee
+ github.com/pkg/errors v0.8.0
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/stretchr/testify v1.2.0
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,17 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCPyPYZfqHdJmc8MK4wrBjMft6BAM=
+github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/protobuf v1.2.1-0.20180919224659-7716a980bcee h1:+mVzS2zW4kko5TLp0Q543d7oHN8+gmBcR6HehSTbJCA=
+github.com/golang/protobuf v1.2.1-0.20180919224659-7716a980bcee/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pkg/errors v0.8.0/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/stretchr/testify v1.2.0 h1:LThGCOvhuJic9Gyd1VBCkhyUXmO8vKaBFvBsJ2k03rg=
+github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
diff --git a/hooks/statsd/statsd.go b/hooks/statsd/statsd.go
@@ -18,7 +18,7 @@ import (
  "strings"
  "time"
 
- "github.com/twitchtv/twirp"
+ "github.com/twitchtv/twirp/v8"
 )
 
 var reqStartTimestampKey = new(int)

diff --git a/hooks/statsd/statsd_test.go b/hooks/statsd/statsd_test.go
@@ -19,8 +19,8 @@ import (
  "testing"
  "time"
 
- "github.com/twitchtv/twirp"
- "github.com/twitchtv/twirp/internal/twirptest"
+ "github.com/twitchtv/twirp/v8"
+ "github.com/twitchtv/twirp/v8/internal/twirptest"
 )
 
 func TestSanitize(t *testing.T) {

diff --git a/internal/gen/wrappers.go b/internal/gen/wrappers.go
@@ -53,7 +53,7 @@ import (
 
  "github.com/golang/protobuf/protoc-gen-go/descriptor"
  plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
- "github.com/twitchtv/twirp/internal/gen/stringutils"
+ "github.com/twitchtv/twirp/v8/internal/gen/stringutils"
 )
 
 // Each type we import as a protocol buffer (other than FileDescriptorProto) needs

diff --git a/internal/twirptest/client_1_13_test.go b/internal/twirptest/client_1_13_test.go
@@ -22,7 +22,7 @@ import (
  "net/http"
  "testing"
 
- "github.com/twitchtv/twirp"
+ "github.com/twitchtv/twirp/v8"
 )
 
 func TestClientContextCanceled(t *testing.T) {

diff --git a/internal/twirptest/client_test.go b/internal/twirptest/client_test.go
@@ -25,7 +25,7 @@ import (
  "testing"
 
  "github.com/pkg/errors"
- "github.com/twitchtv/twirp"
+ "github.com/twitchtv/twirp/v8"
 )
 
 // reqInspector is a tool to check inspect HTTP Requests as they pass

diff --git a/internal/twirptest/empty_service/empty_service.twirp.go b/internal/twirptest/empty_service/empty_service.twirp.go
diff --git a/internal/twirptest/gogo_compat/gogo_compat_test.go b/internal/twirptest/gogo_compat/gogo_compat_test.go
@@ -16,7 +16,7 @@ package gogo_compat
 import (
  "testing"
 
- "github.com/twitchtv/twirp/internal/descriptors"
+ "github.com/twitchtv/twirp/v8/internal/descriptors"
 )
 
 func TestCompilation(t *testing.T) {

diff --git a/internal/twirptest/gogo_compat/service.twirp.go b/internal/twirptest/gogo_compat/service.twirp.go
diff --git a/internal/twirptest/google_protobuf_imports/service.twirp.go b/internal/twirptest/google_protobuf_imports/service.twirp.go