Revert "Update dependencies"

vendor/google.golang.org/api/calendar/v3/calendar-api.json

@@ -3,7 +3,7 @@
     "oauth2": {
       "scopes": {
         "https://www.googleapis.com/auth/calendar": {
-          "description": "See, edit, share, and permanently delete all the calendars you can access using Google Calendar"
+          "description": "Manage your calendars"
         },
         "https://www.googleapis.com/auth/calendar.events": {
           "description": "View and edit events on all your calendars"
@@ -26,7 +26,7 @@
   "description": "Manipulates events and other calendar data.",
   "discoveryVersion": "v1",
   "documentationLink": "https://developers.google.com/google-apps/calendar/firstapp",
-  "etag": "\"J3WqvAcMk4eQjJXvfSI4Yr8VouA/7shFmGJYOQm8lYcU7swGRcnQGuU\"",
+  "etag": "\"J3WqvAcMk4eQjJXvfSI4Yr8VouA/HcEmuhTEJ15i1AnuK6mgjI8kmMs\"",
   "icons": {
     "x16": "http://www.google.com/images/icons/product/calendar-16.png",
     "x32": "http://www.google.com/images/icons/product/calendar-32.png"
@@ -1724,7 +1724,7 @@
       }
     }
   },
-  "revision": "20181023",
+  "revision": "20181002",
   "rootUrl": "https://www.googleapis.com/",
   "schemas": {
     "Acl": {

vendor/google.golang.org/api/calendar/v3/calendar-gen.go

@@ -11,18 +11,18 @@ package calendar // import "google.golang.org/api/calendar/v3"
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
+	context "golang.org/x/net/context"
+	ctxhttp "golang.org/x/net/context/ctxhttp"
+	gensupport "google.golang.org/api/gensupport"
+	googleapi "google.golang.org/api/googleapi"
 	"io"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
-
-	gensupport "google.golang.org/api/gensupport"
-	googleapi "google.golang.org/api/googleapi"
 )
 
 // Always reference these packages, just in case the auto-generated code
@@ -38,6 +38,7 @@ var _ = googleapi.Version
 var _ = errors.New
 var _ = strings.Replace
 var _ = context.Canceled
+var _ = ctxhttp.Do
 
 const apiId = "calendar:v3"
 const apiName = "calendar"
@@ -46,8 +47,7 @@ const basePath = "https://www.googleapis.com/calendar/v3/"
 
 // OAuth2 scopes used by this API.
 const (
-	// See, edit, share, and permanently delete all the calendars you can
-	// access using Google Calendar
+	// Manage your calendars
 	CalendarScope = "https://www.googleapis.com/auth/calendar"
 
 	// View and edit events on all your calendars

vendor/google.golang.org/api/gensupport/resumable.go

@@ -5,13 +5,14 @@
 package gensupport
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"sync"
 	"time"
+
+	"golang.org/x/net/context"
 )
 
 const (

vendor/google.golang.org/api/gensupport/retry.go

@@ -15,11 +15,12 @@
 package gensupport
 
 import (
-	"context"
 	"io"
 	"net"
 	"net/http"
 	"time"
+
+	"golang.org/x/net/context"
 )
 
 // Retry invokes the given function, retrying it multiple times if the connection failed or

vendor/google.golang.org/api/gensupport/send.go

@@ -5,10 +5,12 @@
 package gensupport
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"net/http"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/context/ctxhttp"
 )
 
 // Hook is the type of a function that is called once before each HTTP request
@@ -30,8 +32,7 @@ func RegisterHook(h Hook) {
 
 // SendRequest sends a single HTTP request using the given client.
 // If ctx is non-nil, it calls all hooks, then sends the request with
-// req.WithContext, then calls any functions returned by the hooks in
-// reverse order.
+// ctxhttp.Do, then calls any functions returned by the hooks in reverse order.
 func SendRequest(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
 	// Disallow Accept-Encoding because it interferes with the automatic gzip handling
 	// done by the default http.Transport. See https://github.com/google/google-api-go-client/issues/219.
@@ -49,7 +50,7 @@ func SendRequest(ctx context.Context, client *http.Client, req *http.Request) (*
 	}
 
 	// Send request.
-	resp, err := send(ctx, client, req)
+	resp, err := ctxhttp.Do(ctx, client, req)
 
 	// Call returned funcs in reverse order.
 	for i := len(post) - 1; i >= 0; i-- {
@@ -60,23 +61,6 @@ func SendRequest(ctx context.Context, client *http.Client, req *http.Request) (*
 	return resp, err
 }
 
-func send(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
-	if client == nil {
-		client = http.DefaultClient
-	}
-	resp, err := client.Do(req.WithContext(ctx))
-	// If we got an error, and the context has been canceled,
-	// the context's error is probably more useful.
-	if err != nil {
-		select {
-		case <-ctx.Done():
-			err = ctx.Err()
-		default:
-		}
-	}
-	return resp, err
-}
-
 // DecodeResponse decodes the body of res into target. If there is no body,
 // target is unchanged.
 func DecodeResponse(target interface{}, res *http.Response) error {

vendor/google.golang.org/api/sheets/v4/sheets-gen.go

@@ -11,18 +11,18 @@ package sheets // import "google.golang.org/api/sheets/v4"
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
+	context "golang.org/x/net/context"
+	ctxhttp "golang.org/x/net/context/ctxhttp"
+	gensupport "google.golang.org/api/gensupport"
+	googleapi "google.golang.org/api/googleapi"
 	"io"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
-
-	gensupport "google.golang.org/api/gensupport"
-	googleapi "google.golang.org/api/googleapi"
 )
 
 // Always reference these packages, just in case the auto-generated code
@@ -38,6 +38,7 @@ var _ = googleapi.Version
 var _ = errors.New
 var _ = strings.Replace
 var _ = context.Canceled
+var _ = ctxhttp.Do
 
 const apiId = "sheets:v4"
 const apiName = "sheets"