Add Go 1.8 to build matrix

Also switch all uses of golang.org/x/net/context to use the context in the
standard library.

.travis.yml

@@ -3,6 +3,7 @@ go_import_path: github.com/saintpete/twilio-go
 
 go:
   - 1.7
+  - 1.8
   - tip
 
 before_script:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 0.57
+
+Switch all imports to use the `"context"` library.
+
 ## 0.56
 
 Use the new github.com/kevinburke/rest.DefaultTransport RoundTripper for

accounts.go

@@ -1,9 +1,8 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 // This resource is a little special because the endpoint is GET

accounts_test.go

@@ -1,12 +1,11 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
 	"strconv"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestAccountGet(t *testing.T) {

alerts.go

@@ -1,6 +1,7 @@
 package twilio
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/url"
@@ -9,8 +10,6 @@ import (
 	"time"
 
 	types "github.com/kevinburke/go-types"
-
-	"golang.org/x/net/context"
 )
 
 const alertPathPart = "Alerts"

alerts_example_test.go

@@ -1,12 +1,12 @@
 package twilio_test
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/url"
 
 	twilio "github.com/saintpete/twilio-go"
-	"golang.org/x/net/context"
 )
 
 func ExampleAlertService_GetPage() {

alerts_test.go

@@ -1,13 +1,12 @@
 package twilio
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/url"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestGetAlert(t *testing.T) {

applications.go

@@ -1,9 +1,8 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 const applicationPathPart = "Applications"

applications_test.go

@@ -1,9 +1,8 @@
 package twilio
 
 import (
+	"context"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestApplicationGet(t *testing.T) {

calls.go

@@ -1,13 +1,13 @@
 package twilio
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/url"
 	"time"
 
 	types "github.com/kevinburke/go-types"
-	"golang.org/x/net/context"
 )
 
 const callsPathPart = "Calls"

calls_test.go

@@ -1,11 +1,10 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestGetCall(t *testing.T) {

conferences.go

@@ -1,13 +1,12 @@
 package twilio
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"time"
 
 	types "github.com/kevinburke/go-types"
-
-	"golang.org/x/net/context"
 )
 
 const conferencePathPart = "Conferences"

conferences_test.go

@@ -1,11 +1,10 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestGetConferencePage(t *testing.T) {

example_messages_test.go

@@ -1,13 +1,13 @@
 package twilio_test
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/url"
 	"time"
 
 	twilio "github.com/saintpete/twilio-go"
-	"golang.org/x/net/context"
 )
 
 func ExampleMessageService_GetMessagesInRange() {

example_test.go

@@ -1,14 +1,14 @@
 package twilio_test
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/url"
 	"time"
 
 	"github.com/kevinburke/rest"
 	twilio "github.com/saintpete/twilio-go"
-	"golang.org/x/net/context"
 )
 
 var callURL, _ = url.Parse("https://kev.inburke.com/zombo/zombocom.mp3")

http.go

@@ -1,6 +1,7 @@
 package twilio
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -11,7 +12,6 @@ import (
 	"time"
 
 	"github.com/kevinburke/rest"
-	"golang.org/x/net/context"
 )
 
 // The twilio-go version. Run "make release" to bump this number.

http_ctx.go

@@ -3,9 +3,8 @@
 package twilio
 
 import (
+	"context"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 func withContext(r *http.Request, ctx context.Context) *http.Request {

http_noctx.go

@@ -1,3 +1,6 @@
+// Versions older than Go 1.7 are no longer supported, though this _may_ work
+// for you.
+
 // +build !go1.7
 
 package twilio

http_test.go

@@ -1,14 +1,14 @@
 package twilio
 
 import (
+	"context"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/kevinburke/rest"
-	"golang.org/x/net/context"
 )
 
 // invalid status here on purpose to check we use a different one.

keys.go

@@ -1,9 +1,8 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 const keyPathPart = "Keys"

media.go

@@ -2,6 +2,7 @@ package twilio
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"image"
@@ -15,8 +16,6 @@ import (
 	"net/url"
 	"os"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 // A MediaService lets you retrieve a message's associated Media.

media_test.go

@@ -1,13 +1,12 @@
 package twilio
 
 import (
+	"context"
 	"errors"
 	"os"
 	"strings"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestGetURL(t *testing.T) {

messages.go

@@ -1,12 +1,12 @@
 package twilio
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"time"
 
 	types "github.com/kevinburke/go-types"
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 )
 

messages_test.go

@@ -1,15 +1,14 @@
 package twilio
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/url"
 	"os"
 	"strings"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func TestGet(t *testing.T) {

outgoingcallerids.go

@@ -1,9 +1,8 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 const callerIDPathPart = "OutgoingCallerIds"

outgoingcallerids_test.go

@@ -1,10 +1,9 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestGetCallerID(t *testing.T) {

page.go

@@ -1,13 +1,13 @@
 package twilio
 
 import (
+	"context"
 	"errors"
 	"net/url"
 	"strings"
 	"time"
 
 	types "github.com/kevinburke/go-types"
-	"golang.org/x/net/context"
 )
 
 type Page struct {

phonenumbers.go

@@ -1,10 +1,10 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
 
 	types "github.com/kevinburke/go-types"
-	"golang.org/x/net/context"
 )
 
 const numbersPathPart = "IncomingPhoneNumbers"

phonenumbers_test.go

@@ -1,12 +1,12 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
 	"testing"
 	"time"
 
 	"github.com/kevinburke/rest"
-	"golang.org/x/net/context"
 )
 
 func TestGetNumberPage(t *testing.T) {

prices_messaging.go

@@ -1,9 +1,8 @@
 package twilio
 
 import (
+	"context"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 const messagingPathPart = "Messaging"