diff --git a/bindform.go b/bindform.go index 4f4fb76..e51ba26 100644 --- a/bindform.go +++ b/bindform.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" ) const tagName = "json" diff --git a/bindform_test.go b/bindform_test.go index 398f9b0..9f142f4 100644 --- a/bindform_test.go +++ b/bindform_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" "github.com/stretchr/testify/assert" ) diff --git a/bindparam.go b/bindparam.go index 231b894..d7e56d3 100644 --- a/bindparam.go +++ b/bindparam.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" ) // BindStyledParameter binds a parameter as described in the Path Parameters diff --git a/bindparam_test.go b/bindparam_test.go index 2334c50..9e48465 100644 --- a/bindparam_test.go +++ b/bindparam_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bindstring.go b/bindstring.go index d1ff1ea..c88fdc2 100644 --- a/bindstring.go +++ b/bindstring.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" ) // BindStringToObject takes a string, and attempts to assign it to the destination diff --git a/bindstring_test.go b/bindstring_test.go index 0ce0914..d1ddf39 100644 --- a/bindstring_test.go +++ b/bindstring_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" "github.com/stretchr/testify/assert" ) diff --git a/deepobject.go b/deepobject.go index 35286b3..1be761e 100644 --- a/deepobject.go +++ b/deepobject.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" ) func marshalDeepObject(in interface{}, path []string) ([]string, error) { diff --git a/go.mod b/go.mod index 941cfe5..e48640c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.20 require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 - github.com/deepmap/oapi-codegen v1.13.4 github.com/gin-gonic/gin v1.9.1 github.com/google/uuid v1.3.1 github.com/labstack/echo/v4 v4.11.1 @@ -41,6 +40,7 @@ require ( golang.org/x/net v0.12.0 // indirect golang.org/x/sys v0.10.0 // indirect golang.org/x/text v0.11.0 // indirect + golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index cddfc25..81bb7bf 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,6 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI 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/deepmap/oapi-codegen v1.13.4 h1:lRRQ8JAXaz5/4oidKFyk3fFZFQsbv0BzRtvDKDnvIfM= -github.com/deepmap/oapi-codegen v1.13.4/go.mod h1:/h5nFQbTAMz4S/WtBz8sBfamlGByYKDr21O2uoNgCYI= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -107,6 +105,7 @@ golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/styleparam.go b/styleparam.go index 9c486de..57ed41b 100644 --- a/styleparam.go +++ b/styleparam.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" "github.com/google/uuid" ) diff --git a/styleparam_test.go b/styleparam_test.go index 1943ae0..18aa745 100644 --- a/styleparam_test.go +++ b/styleparam_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/deepmap/oapi-codegen/pkg/types" + "github.com/oapi-codegen/runtime/types" "github.com/google/uuid" "github.com/stretchr/testify/assert" )