From c8fd9c3ba1bd4814ebef9082ff420e011d56977c Mon Sep 17 00:00:00 2001 From: Kai Yu Date: Fri, 13 Mar 2020 00:46:46 +0800 Subject: [PATCH 1/2] Modulize --- client.go | 2 +- error.go | 2 +- go.mod | 9 +++++++++ go.sum | 10 ++++++++++ pagination.go | 2 +- svc_file.go | 2 +- svc_key.go | 2 +- svc_project.go | 2 +- svc_screenshot.go | 2 +- svc_task.go | 2 +- svc_translation.go | 2 +- vendor/vendor.json | 27 --------------------------- 12 files changed, 28 insertions(+), 36 deletions(-) create mode 100644 go.mod create mode 100644 go.sum delete mode 100644 vendor/vendor.json diff --git a/client.go b/client.go index 45e8850..36d7ebc 100644 --- a/client.go +++ b/client.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) const ( diff --git a/error.go b/error.go index 3dd4e08..eaeae96 100644 --- a/error.go +++ b/error.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) var ( diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..a864a1b --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module github.com/17media/go-lokalise-ap + +go 1.13 + +require ( + github.com/go-resty/resty/v2 v2.1.0 + github.com/google/go-querystring v1.0.0 + golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..36d56f8 --- /dev/null +++ b/go.sum @@ -0,0 +1,10 @@ +github.com/go-resty/resty/v2 v2.1.0 h1:Z6IefCpUMfnvItVJaJXWv/pMiiD11So35QgwEELsldE= +github.com/go-resty/resty/v2 v2.1.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pagination.go b/pagination.go index 6283c47..cf6eaec 100644 --- a/pagination.go +++ b/pagination.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) type PageCounter interface { diff --git a/svc_file.go b/svc_file.go index 96332db..96ffa4a 100644 --- a/svc_file.go +++ b/svc_file.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) const ( diff --git a/svc_key.go b/svc_key.go index c21376f..8820712 100644 --- a/svc_key.go +++ b/svc_key.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) const ( diff --git a/svc_project.go b/svc_project.go index 4f31a60..7e604a2 100644 --- a/svc_project.go +++ b/svc_project.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) const ( diff --git a/svc_screenshot.go b/svc_screenshot.go index 693062c..d308e8e 100644 --- a/svc_screenshot.go +++ b/svc_screenshot.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) const ( diff --git a/svc_task.go b/svc_task.go index b2ac423..7e22c4a 100644 --- a/svc_task.go +++ b/svc_task.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) type TaskService struct { diff --git a/svc_translation.go b/svc_translation.go index 02cfda6..d36b18b 100644 --- a/svc_translation.go +++ b/svc_translation.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/google/go-querystring/query" - "gopkg.in/go-resty/resty.v2" + "github.com/go-resty/resty/v2" ) const ( diff --git a/vendor/vendor.json b/vendor/vendor.json deleted file mode 100644 index 2d2a9f5..0000000 --- a/vendor/vendor.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "comment": "", - "ignore": "test", - "package": [ - { - "checksumSHA1": "p3IB18uJRs4dL2K5yx24MrLYE9A=", - "path": "github.com/google/go-querystring/query", - "revision": "44c6ddd0a2342c386950e880b658017258da92fc", - "revisionTime": "2018-09-16T13:16:37Z", - "version": "v1.0.0", - "versionExact": "v1.0.0" - }, - { - "checksumSHA1": "ThNzc9M7G5S8csWAe/8xdjaERus=", - "path": "golang.org/x/net/publicsuffix", - "revision": "16171245cfb220d5317888b716d69c1fb4e7992b", - "revisionTime": "2020-01-30T10:58:50Z" - }, - { - "checksumSHA1": "KTMgIe1hXInE/XT7+F8y2ij6nMY=", - "path": "gopkg.in/go-resty/resty.v2", - "revision": "de0735f66dae7abf8fb1073b4ace3032c1491424", - "revisionTime": "2019-10-10T08:26:59Z" - } - ], - "rootPath": "github.com/17media/go-lokalise-api" -} From fadd8f90878002952a2ee05d3958fd015cb30f6c Mon Sep 17 00:00:00 2001 From: Kai Yu Date: Tue, 17 Mar 2020 17:10:11 +0800 Subject: [PATCH 2/2] Fix module name --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a864a1b..a665bee 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/17media/go-lokalise-ap +module github.com/17media/go-lokalise-api go 1.13