From 1253a63ae49103c2a4b822903c9ec4b9d2581bf0 Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Wed, 7 Feb 2018 19:10:06 -0500 Subject: [PATCH 1/2] import golang.org/x/net/context --- auth/auth_std.go | 2 +- integration/firestore/firestore_test.go | 3 ++- integration/iid/iid_test.go | 3 ++- storage/storage.go | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/auth/auth_std.go b/auth/auth_std.go index f593a7cc..2055af38 100644 --- a/auth/auth_std.go +++ b/auth/auth_std.go @@ -16,7 +16,7 @@ package auth -import "context" +import "golang.org/x/net/context" func newSigner(ctx context.Context) (signer, error) { return serviceAcctSigner{}, nil diff --git a/integration/firestore/firestore_test.go b/integration/firestore/firestore_test.go index 6c367205..6e7b4e28 100644 --- a/integration/firestore/firestore_test.go +++ b/integration/firestore/firestore_test.go @@ -15,12 +15,13 @@ package firestore import ( - "context" "log" "reflect" "testing" "firebase.google.com/go/integration/internal" + + "golang.org/x/net/context" ) func TestFirestore(t *testing.T) { diff --git a/integration/iid/iid_test.go b/integration/iid/iid_test.go index d3303dc4..02132925 100644 --- a/integration/iid/iid_test.go +++ b/integration/iid/iid_test.go @@ -16,7 +16,6 @@ package iid import ( - "context" "flag" "log" "os" @@ -24,6 +23,8 @@ import ( "firebase.google.com/go/iid" "firebase.google.com/go/integration/internal" + + "golang.org/x/net/context" ) var client *iid.Client diff --git a/storage/storage.go b/storage/storage.go index 878e2175..985b6eb7 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -16,11 +16,12 @@ package storage import ( - "context" "errors" "cloud.google.com/go/storage" "firebase.google.com/go/internal" + + "golang.org/x/net/context" ) // Client is the interface for the Firebase Storage service. From f937f5e389038999db288b87d25d16af87f0b093 Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Thu, 8 Feb 2018 12:29:24 -0500 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ee0af8b..754e2f73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Unreleased -- +- Import context from golang.org/x/net/ for 1.6 compatibility # v2.4.0