Skip to content

Commit 00f509b

Browse files
committed
chore: remove ory/x dependency
1 parent d2f6636 commit 00f509b

File tree

6 files changed

+32
-1145
lines changed

6 files changed

+32
-1145
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.idea
33
coverage.txt
44
vendor
5+
.bin

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
SHELL=/bin/bash -o pipefail
22

3+
export PATH := .bin:${PATH}
4+
35
.PHONY: tools
46
tools:
5-
go install github.com/ory/go-acc github.com/ory/x/tools/listx github.com/sqs/goreturns github.com/jandelgado/gcov2lcov
7+
GOBIN=$(shell pwd)/.bin/ go install github.com/ory/go-acc golang.org/x/tools/cmd/goimports github.com/jandelgado/gcov2lcov
68

79
# Formats the code
810
.PHONY: format
9-
format:
10-
$$(go env GOPATH)/bin/goreturns -w -local github.com/ory $$($$(go env GOPATH)/bin/listx .)
11+
format: tools
12+
goimports -w -local github.com/ory *.go $$(go list -f '{{.Dir}}' ./...)
1113

1214
# Runs tests in short mode, without database adapters
1315
.PHONY: docker

go.mod

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,29 @@ replace github.com/oleiade/reflections => github.com/oleiade/reflections v1.0.1
66

77
require (
88
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
9+
github.com/dgraph-io/ristretto v0.0.3 // indirect
10+
github.com/golang/protobuf v1.4.3 // indirect
11+
github.com/google/go-cmp v0.5.5 // indirect
12+
github.com/google/uuid v1.2.0 // indirect
913
github.com/hashicorp/go-retryablehttp v0.6.8
1014
github.com/jandelgado/gcov2lcov v1.0.4
15+
github.com/kr/text v0.2.0 // indirect
16+
github.com/magiconair/properties v1.8.4 // indirect
17+
github.com/mitchellh/mapstructure v1.4.1 // indirect
18+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
1119
github.com/nyaruka/phonenumbers v1.0.73
1220
github.com/ory/go-acc v0.2.6
13-
github.com/ory/x v0.0.272
14-
github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518
21+
github.com/pborman/uuid v1.2.1 // indirect
22+
github.com/pelletier/go-toml v1.8.1 // indirect
23+
github.com/spf13/afero v1.5.1 // indirect
24+
github.com/spf13/cast v1.3.2-0.20200723214538-8d17101741c8 // indirect
25+
github.com/spf13/cobra v1.1.3 // indirect
1526
github.com/stretchr/testify v1.7.0
27+
golang.org/x/mod v0.4.2 // indirect
28+
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
29+
golang.org/x/tools v0.1.0
30+
google.golang.org/protobuf v1.25.0 // indirect
31+
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
32+
gopkg.in/ini.v1 v1.62.0 // indirect
33+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
1634
)

0 commit comments

Comments
 (0)