remove support go 1.6

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+- [dropped] Dropped support for Go 1.8 and earlier.
 - [fixed] Fixing error handling in FCM. The SDK now checks the key 
   `type.googleapis.com/google.firebase.fcm.v1.FcmError` to set error code.
 - [added] `messaging.ApsAlert` type now supports subtitle in its payload.

auth/auth.go

@@ -23,7 +23,7 @@ import (
 
 	"google.golang.org/api/option"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/identitytoolkit/v3"

auth/auth_appengine.go

@@ -17,8 +17,9 @@
 package auth
 
 import (
+	"context"
+
 	"firebase.google.com/go/internal"
-	"golang.org/x/net/context"
 
 	"google.golang.org/appengine"
 )

auth/auth_std.go

@@ -17,8 +17,9 @@
 package auth // import "firebase.google.com/go/auth"
 
 import (
+	"context"
+
 	"firebase.google.com/go/internal"
-	"golang.org/x/net/context"
 )
 
 func newCryptoSigner(ctx context.Context, conf *internal.AuthConfig) (cryptoSigner, error) {

auth/auth_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"golang.org/x/oauth2/google"
 
@@ -205,10 +205,12 @@ func TestCustomTokenError(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		token, err := client.CustomTokenWithClaims(ctx, tc.uid, tc.claims)
-		if token != "" || err == nil {
-			t.Errorf("CustomTokenWithClaims(%q) = (%q, %v); want = (\"\", error)", tc.name, token, err)
-		}
+		t.Run(tc.name, func(t *testing.T) {
+			token, err := client.CustomTokenWithClaims(ctx, tc.uid, tc.claims)
+			if token != "" || err == nil {
+				t.Errorf("CustomTokenWithClaims(%q) = (%q, %v); want = (\"\", error)", tc.name, token, err)
+			}
+		})
 	}
 }
 
@@ -321,9 +323,11 @@ func TestVerifyIDTokenError(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		if _, err := client.VerifyIDToken(ctx, tc.token); err == nil {
-			t.Errorf("VerifyIDToken(%q) = nil; want error", tc.name)
-		}
+		t.Run(tc.name, func(t *testing.T) {
+			if _, err := client.VerifyIDToken(ctx, tc.token); err == nil {
+				t.Errorf("VerifyIDToken(%q) = nil; want error", tc.name)
+			}
+		})
 	}
 }
 

auth/token_generator.go

@@ -32,7 +32,7 @@ import (
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/transport"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 type jwtHeader struct {

auth/token_generator_test.go

@@ -28,7 +28,7 @@ import (
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/option"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 func TestEncodeToken(t *testing.T) {

auth/token_verifier.go

@@ -32,8 +32,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
-	"golang.org/x/net/context/ctxhttp"
+	"context"
 )
 
 // keySource is used to obtain a set of public keys, which can be used to verify cryptographic
@@ -89,7 +88,7 @@ func (k *httpKeySource) refreshKeys(ctx context.Context) error {
 		return err
 	}
 
-	resp, err := ctxhttp.Do(ctx, k.HTTPClient, req)
+	resp, err := k.HTTPClient.Do(req.WithContext(ctx))
 	if err != nil {
 		return err
 	}

auth/user_mgt.go

@@ -24,8 +24,9 @@ import (
 	"strings"
 	"time"
 
+	"context"
+
 	"firebase.google.com/go/internal"
-	"golang.org/x/net/context"
 
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/identitytoolkit/v3"

auth/user_mgt_test.go

@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"firebase.google.com/go/internal"
 

db/auth_override_test.go

@@ -17,7 +17,7 @@ package db
 import (
 	"testing"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 func TestAuthOverrideGet(t *testing.T) {

db/db.go

@@ -25,7 +25,8 @@ import (
 
 	"net/url"
 
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/api/option"
 	"google.golang.org/api/transport"
 )

db/db_test.go

@@ -23,7 +23,8 @@ import (
 	"runtime"
 	"testing"
 
-	"golang.org/x/net/context"
+	"context"
+
 	"golang.org/x/oauth2"
 
 	"encoding/json"

db/query.go

@@ -24,7 +24,7 @@ import (
 
 	"firebase.google.com/go/internal"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // QueryNode represents a data node retrieved from an ordered query.

db/query_test.go

@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 var sortableKeysResp = map[string]interface{}{
@@ -297,13 +297,15 @@ func TestInvalidLimitQuery(t *testing.T) {
 		{"NegativeLast", q.LimitToLast(-10)},
 	}
 	for _, tc := range cases {
-		var got map[string]interface{}
-		if err := tc.q.Get(context.Background(), &got); got != nil || err == nil {
-			t.Errorf("OrderByChild(%q) = (%v, %v); want = (nil, error)", tc.name, got, err)
-		}
-		if len(mock.Reqs) != 0 {
-			t.Errorf("OrderByChild(%q): %v; want: empty", tc.name, mock.Reqs)
-		}
+		t.Run(tc.name, func(t *testing.T) {
+			var got map[string]interface{}
+			if err := tc.q.Get(context.Background(), &got); got != nil || err == nil {
+				t.Errorf("OrderByChild(%q) = (%v, %v); want = (nil, error)", tc.name, got, err)
+			}
+			if len(mock.Reqs) != 0 {
+				t.Errorf("OrderByChild(%q): %v; want: empty", tc.name, mock.Reqs)
+			}
+		})
 	}
 }
 
@@ -383,13 +385,15 @@ func TestInvalidFilterQuery(t *testing.T) {
 		{"InvalidEqualTo", q.EqualTo(func() {})},
 	}
 	for _, tc := range cases {
-		var got map[string]interface{}
-		if err := tc.q.Get(context.Background(), &got); got != nil || err == nil {
-			t.Errorf("OrderByChild(%q) = (%v, %v); want = (nil, error)", tc.name, got, err)
-		}
-		if len(mock.Reqs) != 0 {
-			t.Errorf("OrdderByChild(%q) = %v; want = empty", tc.name, mock.Reqs)
-		}
+		t.Run(tc.name, func(t *testing.T) {
+			var got map[string]interface{}
+			if err := tc.q.Get(context.Background(), &got); got != nil || err == nil {
+				t.Errorf("OrderByChild(%q) = (%v, %v); want = (nil, error)", tc.name, got, err)
+			}
+			if len(mock.Reqs) != 0 {
+				t.Errorf("OrdderByChild(%q) = %v; want = empty", tc.name, mock.Reqs)
+			}
+		})
 	}
 }
 

db/ref.go

@@ -22,7 +22,7 @@ import (
 
 	"firebase.google.com/go/internal"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // txnRetires is the maximum number of times a transaction is retried before giving up. Transaction

db/ref_test.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 type refOp func(r *Ref) error
@@ -285,10 +285,12 @@ func TestWelformedHttpError(t *testing.T) {
 
 	want := "http error status: 500; reason: test error"
 	for _, tc := range testOps {
-		err := tc.op(testref)
-		if err == nil || err.Error() != want {
-			t.Errorf("%s = %v; want = %v", tc.name, err, want)
-		}
+		t.Run(tc.name, func(t *testing.T) {
+			err := tc.op(testref)
+			if err == nil || err.Error() != want {
+				t.Errorf("%s = %v; want = %v", tc.name, err, want)
+			}
+		})
 	}
 
 	if len(mock.Reqs) != len(testOps) {
@@ -303,10 +305,12 @@ func TestUnexpectedHttpError(t *testing.T) {
 
 	want := "http error status: 500; reason: \"unexpected error\""
 	for _, tc := range testOps {
-		err := tc.op(testref)
-		if err == nil || err.Error() != want {
-			t.Errorf("%s = %v; want = %v", tc.name, err, want)
-		}
+		t.Run(tc.name, func(t *testing.T) {
+			err := tc.op(testref)
+			if err == nil || err.Error() != want {
+				t.Errorf("%s = %v; want = %v", tc.name, err, want)
+			}
+		})
 	}
 
 	if len(mock.Reqs) != len(testOps) {

firebase.go

@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"cloud.google.com/go/firestore"
 

firebase_test.go

@@ -15,6 +15,7 @@
 package firebase
 
 import (
+	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -26,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"golang.org/x/oauth2/google"
 
@@ -561,13 +562,15 @@ func TestAutoInit(t *testing.T) {
 	defer reinstateEnv(credEnvVar, credOld)
 
 	for _, test := range tests {
-		overwriteEnv(firebaseEnvName, test.optionsConfig)
-		app, err := NewApp(context.Background(), test.initOptions)
-		if err != nil {
-			t.Errorf("NewApp(%s): %v", test.name, err)
-		} else {
-			compareConfig(app, test.wantOptions, t)
-		}
+		t.Run(fmt.Sprintf("NewApp(%s)", test.name), func(t *testing.T) {
+			overwriteEnv(firebaseEnvName, test.optionsConfig)
+			app, err := NewApp(context.Background(), test.initOptions)
+			if err != nil {
+				t.Error(err)
+			} else {
+				compareConfig(app, test.wantOptions, t)
+			}
+		})
 	}
 }
 
@@ -597,11 +600,13 @@ func TestAutoInitInvalidFiles(t *testing.T) {
 	defer reinstateEnv(credEnvVar, credOld)
 
 	for _, test := range tests {
-		overwriteEnv(firebaseEnvName, test.filename)
-		_, err := NewApp(context.Background(), nil)
-		if err == nil || err.Error() != test.wantError {
-			t.Errorf("%s got error = %s; want = %s", test.name, err, test.wantError)
-		}
+		t.Run(test.name, func(t *testing.T) {
+			overwriteEnv(firebaseEnvName, test.filename)
+			_, err := NewApp(context.Background(), nil)
+			if err == nil || err.Error() != test.wantError {
+				t.Errorf("%s got error = %s; want = %s", test.name, err, test.wantError)
+			}
+		})
 	}
 }
 

iid/iid.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"google.golang.org/api/transport"
 

iid/iid_test.go

@@ -20,7 +20,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"google.golang.org/api/option"
 

integration/auth/auth_test.go

@@ -31,7 +31,7 @@ import (
 
 	"golang.org/x/oauth2/google"
 
-	"golang.org/x/net/context"
+	"context"
 
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/auth"