chore: remove ory/x dependency

.gitignore

@@ -2,3 +2,4 @@
 .idea
 coverage.txt
 vendor
+.bin

Makefile

@@ -1,13 +1,15 @@
 SHELL=/bin/bash -o pipefail
 
+export PATH := .bin:${PATH}
+
 .PHONY: tools
 tools:
-		go install github.com/ory/go-acc github.com/ory/x/tools/listx github.com/sqs/goreturns github.com/jandelgado/gcov2lcov
+		GOBIN=$(shell pwd)/.bin/ go install github.com/ory/go-acc golang.org/x/tools/cmd/goimports github.com/jandelgado/gcov2lcov
 
 # Formats the code
 .PHONY: format
-format:
-		$$(go env GOPATH)/bin/goreturns -w -local github.com/ory $$($$(go env GOPATH)/bin/listx .)
+format: tools
+		goimports -w -local github.com/ory *.go $$(go list -f '{{.Dir}}' ./...)
 
 # Runs tests in short mode, without database adapters
 .PHONY: docker

go.mod

@@ -6,11 +6,29 @@ replace github.com/oleiade/reflections => github.com/oleiade/reflections v1.0.1
 
 require (
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
+	github.com/dgraph-io/ristretto v0.0.3 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/uuid v1.2.0 // indirect
 	github.com/hashicorp/go-retryablehttp v0.6.8
 	github.com/jandelgado/gcov2lcov v1.0.4
+	github.com/kr/text v0.2.0 // indirect
+	github.com/magiconair/properties v1.8.4 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/nyaruka/phonenumbers v1.0.73
 	github.com/ory/go-acc v0.2.6
-	github.com/ory/x v0.0.272
-	github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518
+	github.com/pborman/uuid v1.2.1 // indirect
+	github.com/pelletier/go-toml v1.8.1 // indirect
+	github.com/spf13/afero v1.5.1 // indirect
+	github.com/spf13/cast v1.3.2-0.20200723214538-8d17101741c8 // indirect
+	github.com/spf13/cobra v1.1.3 // indirect
 	github.com/stretchr/testify v1.7.0
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
+	golang.org/x/tools v0.1.0
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/ini.v1 v1.62.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )