Skip to content

Commit

Permalink
Merge pull request #5 from fastbill/upgrade-go113
Browse files Browse the repository at this point in the history
Upgrade to Go 1.13
  • Loading branch information
perajovic authored Oct 15, 2019
2 parents 7f36bc6 + 1e9fc96 commit cbf0b0b
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 68 deletions.
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ issues:
- dupl
- goconst
- gosec

linters-settings:
gocyclo:
min-complexity: 10
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
language: go

go:
- 1.11.x
- 1.13.x

install:
- go get -u github.com/golang/dep/cmd/dep
- dep ensure
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.17.1
- go mod vendor
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.19.1

script:
- go test -race -cover ./...
- ./bin/golangci-lint run

notifications:
email: false
email: false
33 changes: 0 additions & 33 deletions Gopkg.lock

This file was deleted.

26 changes: 0 additions & 26 deletions Gopkg.toml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Pull requests for additional mail providers are very welcome.
package main

import (
"github.com/fastbill/go-mail"
"github.com/fastbill/go-mail/mandrill"
"github.com/fastbill/go-mail/v2"
"github.com/fastbill/go-mail/v2/mandrill"
)

func main() {
Expand Down
10 changes: 10 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module github.com/fastbill/go-mail/v2

go 1.13

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.0 // indirect
github.com/stretchr/testify v1.2.0
)
8 changes: 8 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
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 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.0 h1:LThGCOvhuJic9Gyd1VBCkhyUXmO8vKaBFvBsJ2k03rg=
github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
2 changes: 1 addition & 1 deletion mandrill/mandrill.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/url"

"github.com/fastbill/go-mail"
"github.com/fastbill/go-mail/v2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion mandrill/mandrill_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"testing"

"github.com/fastbill/go-mail"
"github.com/fastbill/go-mail/v2"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down

0 comments on commit cbf0b0b

Please sign in to comment.