Skip to content

Import context from golang.org/x/net/ for 1.6 compatibility #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 8, 2018
Merged

Import context from golang.org/x/net/ for 1.6 compatibility #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1253a63
import golang.org/x/net/context
avishalom Feb 8, 2018
f937f5e
changelog
avishalom Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Unreleased
-
- Import context from golang.org/x/net/ for 1.6 compatibility

# v2.4.0

Expand Down
2 changes: 1 addition & 1 deletion auth/auth_std.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package auth

import "context"
import "golang.org/x/net/context"

func newSigner(ctx context.Context) (signer, error) {
return serviceAcctSigner{}, nil
Expand Down
3 changes: 2 additions & 1 deletion integration/firestore/firestore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion integration/iid/iid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
package iid

import (
"context"
"flag"
"log"
"os"
"testing"

"firebase.google.com/go/iid"
"firebase.google.com/go/integration/internal"

"golang.org/x/net/context"
)

var client *iid.Client
Expand Down
3 changes: 2 additions & 1 deletion storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down