oauth2: add vanity URL import comments, use the vanity URL on builds
Change-Id: Ia20e40d98aa709e3d598388e0a15501584152ab5
diff --git a/.travis.yml b/.travis.yml
index 9ab73b2..43d4e3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
language: go
-go: 1.3
+go:
+ - 1.3
+ - tip
install:
- - go get -v -tags='appengine appenginevm' ./...
+ - go get -v -tags='appengine appenginevm' golang.org/x/oauth2/...
script:
- - go test -v -tags='appengine appenginevm' ./...
+ - go test -v -tags='appengine appenginevm' golang.org/x/oauth2/...
diff --git a/README.md b/README.md
index 2798f19..03e9dbd 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,13 @@
## Installation
~~~~
-go get github.com/golang/oauth2
+go get golang.org/x/oauth2
~~~~
See godoc for further documentation and examples.
-* [godoc.org/github.com/golang/oauth2](http://godoc.org/github.com/golang/oauth2)
-* [godoc.org/github.com/golang/oauth2/google](http://godoc.org/github.com/golang/oauth2/google)
+* [godoc.org/golang.org/x/oauth2](http://godoc.org/golang.org/x/oauth2)
+* [godoc.org/golang.org/x/oauth2/google](http://godoc.org/golang.org/x/oauth2/google)
## Contributing
diff --git a/example_test.go b/example_test.go
index 63ba707..fb8dd8e 100644
--- a/example_test.go
+++ b/example_test.go
@@ -10,7 +10,7 @@
"net/http"
"testing"
- "github.com/golang/oauth2"
+ "golang.org/x/oauth2"
)
// TODO(jbd): Remove after Go 1.4.
diff --git a/google/appengine.go b/google/appengine.go
index 1c47a07..0502693 100644
--- a/google/appengine.go
+++ b/google/appengine.go
@@ -12,7 +12,7 @@
"sync"
"time"
- "github.com/golang/oauth2"
+ "golang.org/x/oauth2"
"appengine"
"appengine/memcache"
diff --git a/google/appengine_test.go b/google/appengine_test.go
index 5cd67f2..2c07ce4 100644
--- a/google/appengine_test.go
+++ b/google/appengine_test.go
@@ -14,7 +14,7 @@
"testing"
"time"
- "github.com/golang/oauth2"
+ "golang.org/x/oauth2"
"appengine"
"appengine/memcache"
diff --git a/google/appenginevm.go b/google/appenginevm.go
index d71c333..ce2b1bd 100644
--- a/google/appenginevm.go
+++ b/google/appenginevm.go
@@ -11,7 +11,7 @@
"sync"
"time"
- "github.com/golang/oauth2"
+ "golang.org/x/oauth2"
"google.golang.org/appengine"
"google.golang.org/appengine/memcache"
)
diff --git a/google/appenginevm_test.go b/google/appenginevm_test.go
index 4af7651..3ca4b0d 100644
--- a/google/appenginevm_test.go
+++ b/google/appenginevm_test.go
@@ -14,7 +14,7 @@
"testing"
"time"
- "github.com/golang/oauth2"
+ "golang.org/x/oauth2"
"google.golang.org/appengine"
"google.golang.org/appengine/memcache"
)
diff --git a/google/example_test.go b/google/example_test.go
index 9213c66..9fec175 100644
--- a/google/example_test.go
+++ b/google/example_test.go
@@ -12,8 +12,8 @@
"net/http"
"testing"
- "github.com/golang/oauth2"
- "github.com/golang/oauth2/google"
+ "golang.org/x/oauth2"
+ "golang.org/x/oauth2/google"
"google.golang.org/appengine"
)
diff --git a/google/google.go b/google/google.go
index 69c9d22..8256e2c 100644
--- a/google/google.go
+++ b/google/google.go
@@ -11,7 +11,7 @@
//
// For more information, please read
// https://developers.google.com/accounts/docs/OAuth2.
-package google
+package google // import "golang.org/x/oauth2/google"
import (
"encoding/json"
@@ -22,8 +22,8 @@
"net/url"
"time"
- "github.com/golang/oauth2"
- "github.com/golang/oauth2/internal"
+ "golang.org/x/oauth2"
+ "golang.org/x/oauth2/internal"
)
var (
diff --git a/jws/jws.go b/jws/jws.go
index b81e4f0..d12d033 100644
--- a/jws/jws.go
+++ b/jws/jws.go
@@ -4,7 +4,7 @@
// Package jws provides encoding and decoding utilities for
// signed JWS messages.
-package jws
+package jws // import "golang.org/x/oauth2/jws"
import (
"bytes"
diff --git a/jwt.go b/jwt.go
index 4c49975..39cc0b1 100644
--- a/jwt.go
+++ b/jwt.go
@@ -13,8 +13,8 @@
"strings"
"time"
- "github.com/golang/oauth2/internal"
- "github.com/golang/oauth2/jws"
+ "golang.org/x/oauth2/internal"
+ "golang.org/x/oauth2/jws"
)
var (
diff --git a/oauth2.go b/oauth2.go
index c4f9353..5b82acb 100644
--- a/oauth2.go
+++ b/oauth2.go
@@ -5,7 +5,7 @@
// Package oauth2 provides support for making
// OAuth2 authorized and authenticated HTTP requests.
// It can additionally grant authorization with Bearer JWT.
-package oauth2
+package oauth2 // import "golang.org/x/oauth2"
import (
"crypto/rsa"
