feat(deps)!: switch to Uber's maintained fork of gomock (#4)

jimeh · web-flow · commit 0b9ddc09c577 · 2023-10-13T12:00:58.000+01:00
diff --git a/any.go b/any.go
@@ -3,7 +3,7 @@ package gomockctx
 import (
 	"context"
 
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 )
 
 // Any returns a gomock.Matcher which matches any context.Context object.
diff --git a/any_test.go b/any_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 )
 
 func TestAny(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/romdo/gomockctx
 go 1.18
 
 require (
-	github.com/golang/mock v1.6.0
 	github.com/stretchr/testify v1.7.0
+	go.uber.org/mock v0.3.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -1,36 +1,13 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 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/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
+go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/gomockctx.go b/gomockctx.go
@@ -5,7 +5,7 @@ package gomockctx
 import (
 	"context"
 
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 )
 
 type (
diff --git a/gomockctx_test.go b/gomockctx_test.go
@@ -5,9 +5,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 )
 
 func TestNew(t *testing.T) {
diff --git a/with_value.go b/with_value.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 )
 
 // WithValue returns a gomock.Matcher which matches any context that has the
diff --git a/with_value_test.go b/with_value_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
 )
 
 func TestWithValue(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package gomockctx`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/golang/mock/gomock"`
	`6`	`+ "go.uber.org/mock/gomock"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// Any returns a gomock.Matcher which matches any context.Context object.`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/golang/mock/gomock"`
`8`	`7`	`"github.com/stretchr/testify/assert"`
`9`	`8`	`"github.com/stretchr/testify/require"`
	`9`	`+ "go.uber.org/mock/gomock"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestAny(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ module github.com/romdo/gomockctx`
`3`	`3`	`go 1.18`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/golang/mock v1.6.0`
`7`	`6`	`github.com/stretchr/testify v1.7.0`
	`7`	`+ go.uber.org/mock v0.3.0`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ package gomockctx`
`5`	`5`	`import (`
`6`	`6`	`"context"`
`7`	`7`
`8`		`- "github.com/golang/mock/gomock"`
	`8`	`+ "go.uber.org/mock/gomock"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type (`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"regexp"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/golang/mock/gomock"`
`9`	`8`	`"github.com/stretchr/testify/assert"`
`10`	`9`	`"github.com/stretchr/testify/require"`
	`10`	`+ "go.uber.org/mock/gomock"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestNew(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"reflect"`
`7`	`7`
`8`		`- "github.com/golang/mock/gomock"`
	`8`	`+ "go.uber.org/mock/gomock"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// WithValue returns a gomock.Matcher which matches any context that has the`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/golang/mock/gomock"`
`8`	`7`	`"github.com/stretchr/testify/assert"`
	`8`	`+ "go.uber.org/mock/gomock"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestWithValue(t *testing.T) {`