Merge branch 'master' into baseline-docs

.travis.yml

@@ -1,24 +1,8 @@
 language: go
 go:
-- 1.6
 - 1.7
 - 1.8
 - 1.9
 - tip
-before_script:
-- go get -u github.com/alecthomas/gometalinter
-- gometalinter --install
 script:
-- diff -u <(echo -n) <(gofmt -d -s .)
-- gometalinter --disable=golint ./...
-- go test -cover -bench=. -v -race ./...
-notifications:
- hipchat:
- rooms:
- secure: Tk19TNeLNQKRCGC5NKFEqCQTJsEJNrfZ56iuiA5iavIYVoTsX6Pi9VxvzYOeXNNuuHEF9yC3bnv9+yjNaBps7S+T/EiT1F7Qx4BIVgmETK+qg82XmFz5p8lWn7GmSZVWu2kBVlVMbtEdsYPbR19v1LvzSw2U9SO7j7CssWVyAmY=
- template:
- - '<a href="https://travis-ci.org/%{repository}/builds/%{build_id}">%{repository}
- Build %{build_number}</a> on branch <i>%{branch}</i> by %{author}: <strong>%{message}</strong>
- <a href="https://github.com/%{repository}/commits/%{commit}">View on GitHub</a>'
- format: html
-
+- make test

CHANGELOG.md

@@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.6.0] - 2018-06-04
+[2018-06-04] Version 0.6.0
+--------------------------
 ### Added
 - PR [#24](https://github.com/sendgrid/smtpapi-go/pull/24): Added Code of Conduct. Big thanks to [Shivam Agarwal](https://github.com/gr8shivam) for the PR!
 - PR [#26](https://github.com/sendgrid/smtpapi-go/pull/26): Added TROUBLESHOOTING.md. Big thanks to [Callam Delaney](https://github.com/cal97g) for the PR!

Makefile

@@ -0,0 +1,7 @@
+.PHONY: test install
+
+install:
+ go get -t -v ./...
+
+test: install
+ go test -race -cover -v ./...

smtpapi.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Version represents the current version of the smtpapi-go library
-const Version = "0.4.2"
+const Version = "0.6.2"
 
 // SMTPAPIHeader will be used to set up X-SMTPAPI params
 type SMTPAPIHeader struct {

smtpapi_test.go

@@ -19,13 +19,6 @@ func exampleJson() map[string]interface{} {
  return json
 }
 
-func TestSMTPAPIVersion(t *testing.T) {
- t.Parallel()
- if Version != "0.4.2" {
- t.Error("SMTPAPI version does not match")
- }
-}
-
 func TestNewSMTPIAPIHeader(t *testing.T) {
  t.Parallel()
  header := NewSMTPAPIHeader()