Repository: google/go-cloud
Pull request #955 (2018-12-13 22:34:00)

all: change import paths
Change the main module's paths to gocloud.dev.

Add import comments to prevent importing by the old import paths.
    
Don't change the two sub-modules yet.


Patch:
diff --git a/.travis.yml b/.travis.yml
index 89bebd51..b745d04a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ os:
   - windows
 
 language: go
-go_import_path: github.com/google/go-cloud
+go_import_path: gocloud.dev
 go: "1.11.x"
 
 before_install:
diff --git a/aws/aws.go b/aws/aws.go
index 379f0315..bace84ce 100644
--- a/aws/aws.go
+++ b/aws/aws.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package aws provides fundamental Wire providers for Amazon Web Services (AWS).
-package aws
+package aws // import "gocloud.dev/aws"
 
 import (
 	"github.com/aws/aws-sdk-go/aws"
diff --git a/aws/awscloud/awscloud.go b/aws/awscloud/awscloud.go
index e4bdc6bd..bd31b5ed 100644
--- a/aws/awscloud/awscloud.go
+++ b/aws/awscloud/awscloud.go
@@ -13,16 +13,16 @@
 // limitations under the License.
 
 // Package awscloud contains Wire providers for AWS services.
-package awscloud
+package awscloud // import "gocloud.dev/aws/awscloud"
 
 import (
 	"net/http"
 
-	"github.com/google/go-cloud/aws"
-	"github.com/google/go-cloud/aws/rds"
-	"github.com/google/go-cloud/runtimevar/paramstore"
-	"github.com/google/go-cloud/server/xrayserver"
 	"github.com/google/wire"
+	"gocloud.dev/aws"
+	"gocloud.dev/aws/rds"
+	"gocloud.dev/runtimevar/paramstore"
+	"gocloud.dev/server/xrayserver"
 )
 
 // AWS is a Wire provider set that includes all Amazon Web Services interface
diff --git a/aws/rds/rds.go b/aws/rds/rds.go
index d8fb3838..ca528e24 100644
--- a/aws/rds/rds.go
+++ b/aws/rds/rds.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package rds contains Wire providers that are common across RDS.
-package rds
+package rds // import "gocloud.dev/aws/rds"
 
 import (
 	"context"
diff --git a/blob/blob.go b/blob/blob.go
index 9b47b61c..ca2aa0f6 100644
--- a/blob/blob.go
+++ b/blob/blob.go
@@ -41,7 +41,7 @@
 // Alternatively, you can construct a *Bucket using blob.Open by providing
 // a URL that's supported by a blob subpackage that you have linked
 // in to your application.
-package blob
+package blob // import "gocloud.dev/blob"
 
 import (
 	"bytes"
@@ -58,7 +58,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/go-cloud/blob/driver"
+	"gocloud.dev/blob/driver"
 )
 
 // Reader reads bytes from a blob.
diff --git a/blob/driver/driver.go b/blob/driver/driver.go
index a28f7126..2e8b8c60 100644
--- a/blob/driver/driver.go
+++ b/blob/driver/driver.go
@@ -14,7 +14,7 @@
 
 // Package driver defines a set of interfaces that the blob package uses to interact
 // with the underlying blob services.
-package driver
+package driver // import "gocloud.dev/blob/driver"
 
 import (
 	"context"
diff --git a/blob/fileblob/fileblob.go b/blob/fileblob/fileblob.go
index 824e5420..76a155cb 100644
--- a/blob/fileblob/fileblob.go
+++ b/blob/fileblob/fileblob.go
@@ -48,7 +48,7 @@
 // As
 //
 // fileblob does not support any types for As.
-package fileblob
+package fileblob // import "gocloud.dev/blob/fileblob"
 
 import (
 	"bytes"
@@ -65,8 +65,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/driver"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/driver"
 )
 
 const defaultPageSize = 1000
diff --git a/blob/gcsblob/gcsblob.go b/blob/gcsblob/gcsblob.go
index cdd55909..7f28cbab 100644
--- a/blob/gcsblob/gcsblob.go
+++ b/blob/gcsblob/gcsblob.go
@@ -42,7 +42,7 @@
 //  - Reader: storage.Reader
 //  - Attributes: storage.ObjectAttrs
 //  - WriterOptions.BeforeWrite: *storage.Writer
-package gcsblob
+package gcsblob // import "gocloud.dev/blob/gcsblob"
 
 import (
 	"context"
@@ -54,9 +54,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/driver"
-	"github.com/google/go-cloud/gcp"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/driver"
+	"gocloud.dev/gcp"
 
 	"cloud.google.com/go/storage"
 	"golang.org/x/oauth2/google"
diff --git a/blob/s3blob/s3blob.go b/blob/s3blob/s3blob.go
index 363a0c05..a964cd6f 100644
--- a/blob/s3blob/s3blob.go
+++ b/blob/s3blob/s3blob.go
@@ -38,7 +38,7 @@
 //  - Reader: s3.GetObjectOutput
 //  - Attributes: s3.HeadObjectOutput
 //  - WriterOptions.BeforeWrite: *s3manager.UploadInput
-package s3blob
+package s3blob // import "gocloud.dev/blob/s3blob"
 
 import (
 	"context"
@@ -52,8 +52,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/driver"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/driver"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
diff --git a/doc.go b/doc.go
index f1c1c446..10f029cf 100644
--- a/doc.go
+++ b/doc.go
@@ -36,4 +36,4 @@ increasing compile times or binary sizes, and avoiding any side effects from
 For sample applications and a tutorial, see the samples directory
 (https://github.com/google/go-cloud/tree/master/samples).
 */
-package cloud // import "github.com/google/go-cloud"
+package cloud // import "gocloud.dev"
diff --git a/gcp/cloudsql/cloudsql.go b/gcp/cloudsql/cloudsql.go
index 06632aec..313e7f5e 100644
--- a/gcp/cloudsql/cloudsql.go
+++ b/gcp/cloudsql/cloudsql.go
@@ -14,13 +14,13 @@
 
 // Package cloudsql contains Wire providers that are common across Google Cloud
 // SQL.
-package cloudsql
+package cloudsql // import "gocloud.dev/gcp/cloudsql"
 
 import (
 	"github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/certs"
 	"github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy"
-	"github.com/google/go-cloud/gcp"
 	"github.com/google/wire"
+	"gocloud.dev/gcp"
 )
 
 // CertSourceSet is a Wire provider set that binds a Cloud SQL proxy
diff --git a/gcp/gcp.go b/gcp/gcp.go
index 2cb86da1..92490006 100644
--- a/gcp/gcp.go
+++ b/gcp/gcp.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package gcp provides fundamental Wire providers and types for Google Cloud Platform (GCP).
-package gcp
+package gcp // import "gocloud.dev/gcp"
 
 import (
 	"context"
diff --git a/gcp/gcpcloud/gcpcloud.go b/gcp/gcpcloud/gcpcloud.go
index c3b5f21c..c816a395 100644
--- a/gcp/gcpcloud/gcpcloud.go
+++ b/gcp/gcpcloud/gcpcloud.go
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 // Package gcpcloud contains Wire providers for GCP services.
-package gcpcloud
+package gcpcloud // import "gocloud.dev/gcp/gcpcloud"
 
 import (
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/cloudsql"
-	"github.com/google/go-cloud/runtimevar/runtimeconfigurator"
-	"github.com/google/go-cloud/server/sdserver"
 	"github.com/google/wire"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/cloudsql"
+	"gocloud.dev/runtimevar/runtimeconfigurator"
+	"gocloud.dev/server/sdserver"
 )
 
 // GCP is a Wire provider set that includes all Google Cloud Platform services
diff --git a/go.mod b/go.mod
index 3cbcde86..654869af 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-module github.com/google/go-cloud
+module gocloud.dev
 
 require (
 	cloud.google.com/go v0.30.0
diff --git a/health/health.go b/health/health.go
index 625b92c3..2eafe276 100644
--- a/health/health.go
+++ b/health/health.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package health provides health check handlers.
-package health
+package health // import "gocloud.dev/health"
 
 import (
 	"io"
diff --git a/health/sqlhealth/sqlhealth.go b/health/sqlhealth/sqlhealth.go
index 8cf37715..3e0e9084 100644
--- a/health/sqlhealth/sqlhealth.go
+++ b/health/sqlhealth/sqlhealth.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package sqlhealth provides a health check for a SQL database connection.
-package sqlhealth
+package sqlhealth // import "gocloud.dev/health/sqlhealth"
 
 import (
 	"context"
diff --git a/internal/batcher/batcher.go b/internal/batcher/batcher.go
index f3226f61..295de1ef 100644
--- a/internal/batcher/batcher.go
+++ b/internal/batcher/batcher.go
@@ -16,7 +16,7 @@
 // add items to it. Items are accumulated while handler calls are in progress; when
 // the handler returns, it will be called again with items accumulated since the last
 // call. Multiple concurrent calls to the handler are supported.
-package batcher
+package batcher // import "gocloud.dev/internal/batcher"
 
 import (
 	"context"
diff --git a/internal/pubsub/driver/driver.go b/internal/pubsub/driver/driver.go
index 726161f3..16f5d576 100644
--- a/internal/pubsub/driver/driver.go
+++ b/internal/pubsub/driver/driver.go
@@ -14,7 +14,7 @@
 
 // Package driver defines a set of interfaces that the pubsub package uses to
 // interact with the underlying pubsub services.
-package driver
+package driver // import "gocloud.dev/internal/pubsub/driver"
 
 import (
 	"context"
diff --git a/internal/pubsub/gcppubsub/gcppubsub.go b/internal/pubsub/gcppubsub/gcppubsub.go
index 3678e8f7..c359aa13 100644
--- a/internal/pubsub/gcppubsub/gcppubsub.go
+++ b/internal/pubsub/gcppubsub/gcppubsub.go
@@ -18,16 +18,16 @@
 // It exposes the following types for As:
 // Topic: *raw.PublisherClient
 // Subscription: *raw.SubscriberClient
-package gcppubsub
+package gcppubsub // import "gocloud.dev/internal/pubsub/gcppubsub"
 
 import (
 	"context"
 	"fmt"
 
 	raw "cloud.google.com/go/pubsub/apiv1"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/gcp"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 	pb "google.golang.org/genproto/googleapis/pubsub/v1"
 )
 
diff --git a/internal/pubsub/mempubsub/mem.go b/internal/pubsub/mempubsub/mem.go
index 1f684c67..40ed9660 100644
--- a/internal/pubsub/mempubsub/mem.go
+++ b/internal/pubsub/mempubsub/mem.go
@@ -17,7 +17,7 @@
 // development and testing.
 //
 // mempubsub does not support any types for As.
-package mempubsub
+package mempubsub // import "gocloud.dev/internal/pubsub/mempubsub"
 
 import (
 	"context"
@@ -25,8 +25,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 )
 
 var errNotExist = errors.New("mempubsub: topic does not exist")
diff --git a/internal/pubsub/pubsub.go b/internal/pubsub/pubsub.go
index 781cf2e4..6ed5799e 100644
--- a/internal/pubsub/pubsub.go
+++ b/internal/pubsub/pubsub.go
@@ -14,7 +14,7 @@
 
 // Package pubsub provides an easy and portable way to interact with publish/
 // subscribe systems.
-package pubsub
+package pubsub // import "gocloud.dev/internal/pubsub"
 
 import (
 	"context"
@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/google/go-cloud/internal/batcher"
-	"github.com/google/go-cloud/internal/pubsub/driver"
-	"github.com/google/go-cloud/internal/retry"
 	gax "github.com/googleapis/gax-go"
+	"gocloud.dev/internal/batcher"
+	"gocloud.dev/internal/pubsub/driver"
+	"gocloud.dev/internal/retry"
 )
 
 // Message contains data to be published.
diff --git a/internal/pubsub/rabbitpubsub/doc.go b/internal/pubsub/rabbitpubsub/doc.go
index e0c266ed..5188ef38 100644
--- a/internal/pubsub/rabbitpubsub/doc.go
+++ b/internal/pubsub/rabbitpubsub/doc.go
@@ -22,4 +22,4 @@
 //
 // A Pub/Sub subscription is an AMQP queue. The queue should be bound to the exchange
 // that is the topic of the subscription. See the package example for details.
-package rabbitpubsub
+package rabbitpubsub // import "gocloud.dev/internal/pubsub/rabbitpubsub"
diff --git a/internal/pubsub/rabbitpubsub/rabbit.go b/internal/pubsub/rabbitpubsub/rabbit.go
index 30002ba9..990bf5fd 100644
--- a/internal/pubsub/rabbitpubsub/rabbit.go
+++ b/internal/pubsub/rabbitpubsub/rabbit.go
@@ -11,8 +11,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 	"github.com/streadway/amqp"
 )
 
diff --git a/internal/retry/retry.go b/internal/retry/retry.go
index 0fa1de7f..f13e390a 100644
--- a/internal/retry/retry.go
+++ b/internal/retry/retry.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package retry provides retry logic.
-package retry
+package retry // import "gocloud.dev/internal/retry"
 
 import (
 	"context"
diff --git a/internal/secrets/driver/driver.go b/internal/secrets/driver/driver.go
index 32381f98..520b26eb 100644
--- a/internal/secrets/driver/driver.go
+++ b/internal/secrets/driver/driver.go
@@ -14,7 +14,7 @@
 
 // Package driver defines interfaces to be implemented for providers of the
 // secrets package.
-package driver
+package driver // import "gocloud.dev/internal/secrets/driver"
 
 import "context"
 
diff --git a/internal/secrets/localsecrets/localsecrets.go b/internal/secrets/localsecrets/localsecrets.go
index 1f25edc8..b5523af7 100644
--- a/internal/secrets/localsecrets/localsecrets.go
+++ b/internal/secrets/localsecrets/localsecrets.go
@@ -14,7 +14,7 @@
 
 // Package localsecrets provides a way to encrypt and decrypt small messages
 // without making network calls to a third party service.
-package localsecrets
+package localsecrets // import "gocloud.dev/internal/secrets/localsecrets"
 
 import (
 	"context"
diff --git a/mysql/cloudmysql/cloudmysql.go b/mysql/cloudmysql/cloudmysql.go
index 97b03aa2..80832a30 100644
--- a/mysql/cloudmysql/cloudmysql.go
+++ b/mysql/cloudmysql/cloudmysql.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package cloudmysql provides connections to managed MySQL Cloud SQL instances.
-package cloudmysql
+package cloudmysql // import "gocloud.dev/mysql/cloudmysql"
 
 import (
 	"context"
@@ -26,8 +26,8 @@ import (
 	"github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/certs"
 	"github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy"
 	"github.com/go-sql-driver/mysql"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/cloudsql"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/cloudsql"
 
 	// mysql enables use of the MySQL dialer for the Cloud SQL Proxy.
 	_ "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/dialers/mysql"
@@ -85,7 +85,7 @@ func Open(ctx context.Context, certSource proxy.CertSource, params *Params) (*sq
 		Port:  3307,
 		Certs: certSource,
 	}
-	dialerName := fmt.Sprintf("github.com/google/go-cloud/mysql/gcpmysql/%d", dialerNum)
+	dialerName := fmt.Sprintf("gocloud.dev/mysql/gcpmysql/%d", dialerNum)
 	mysql.RegisterDial(dialerName, client.Dial)
 
 	cfg := &mysql.Config{
diff --git a/mysql/rdsmysql/rdsmysql.go b/mysql/rdsmysql/rdsmysql.go
index df3d298d..0c260c18 100644
--- a/mysql/rdsmysql/rdsmysql.go
+++ b/mysql/rdsmysql/rdsmysql.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package rdsmysql provides connections to AWS RDS MySQL instances.
-package rdsmysql
+package rdsmysql // import "gocloud.dev/mysql/rdsmysql"
 
 import (
 	"context"
@@ -25,8 +25,8 @@ import (
 
 	"contrib.go.opencensus.io/integrations/ocsql"
 	"github.com/go-sql-driver/mysql"
-	"github.com/google/go-cloud/aws/rds"
 	"github.com/google/wire"
+	"gocloud.dev/aws/rds"
 )
 
 // Set is a Wire provider set that provides a *sql.DB given
@@ -98,7 +98,7 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
 		tlsConfigNum := tlsConfigCounter.n
 		tlsConfigCounter.n++
 		tlsConfigCounter.mu.Unlock()
-		tlsConfigName := fmt.Sprintf("github.com/google/go-cloud/mysql/rdsmysql/%d", tlsConfigNum)
+		tlsConfigName := fmt.Sprintf("gocloud.dev/mysql/rdsmysql/%d", tlsConfigNum)
 		err = mysql.RegisterTLSConfig(tlsConfigName, &tls.Config{
 			RootCAs: certPool,
 		})
diff --git a/postgres/cloudpostgres/cloudpostgres.go b/postgres/cloudpostgres/cloudpostgres.go
index 6941ad20..6e54f4a2 100644
--- a/postgres/cloudpostgres/cloudpostgres.go
+++ b/postgres/cloudpostgres/cloudpostgres.go
@@ -14,7 +14,7 @@
 
 // Package cloudpostgres provides connections to managed PostgreSQL Cloud SQL instances.
 // See https://cloud.google.com/sql/docs/postgres/ for more information.
-package cloudpostgres
+package cloudpostgres // import "gocloud.dev/postgres/cloudpostgres"
 
 import (
 	"context"
diff --git a/postgres/rdspostgres/rdspostgres.go b/postgres/rdspostgres/rdspostgres.go
index 8bbfd1e7..82888248 100644
--- a/postgres/rdspostgres/rdspostgres.go
+++ b/postgres/rdspostgres/rdspostgres.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package rdspostgres provides connections to AWS RDS PostgreSQL instances.
-package rdspostgres
+package rdspostgres // import "gocloud.dev/postgres/rdspostgres"
 
 import (
 	"context"
@@ -27,8 +27,8 @@ import (
 	"time"
 
 	"contrib.go.opencensus.io/integrations/ocsql"
-	"github.com/google/go-cloud/aws/rds"
 	"github.com/lib/pq"
+	"gocloud.dev/aws/rds"
 )
 
 // Params specifies how to connect to an RDS database.
diff --git a/requestlog/requestlog.go b/requestlog/requestlog.go
index e1b2c751..7677b8fa 100644
--- a/requestlog/requestlog.go
+++ b/requestlog/requestlog.go
@@ -14,7 +14,7 @@
 
 // Package requestlog provides an http.Handler that logs information
 // about requests.
-package requestlog
+package requestlog // import "gocloud.dev/requestlog"
 
 import (
 	"errors"
diff --git a/runtimevar/constantvar/constantvar.go b/runtimevar/constantvar/constantvar.go
index 208645fd..0fbcc406 100644
--- a/runtimevar/constantvar/constantvar.go
+++ b/runtimevar/constantvar/constantvar.go
@@ -14,14 +14,14 @@
 
 // Package constantvar provides a runtimevar.Driver implementation for variables
 // that never change.
-package constantvar
+package constantvar // import "gocloud.dev/runtimevar/constantvar"
 
 import (
 	"context"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
 )
 
 // New constructs a runtimevar.Variable that returns value from Watch.
diff --git a/runtimevar/driver/driver.go b/runtimevar/driver/driver.go
index 500e7fa5..88271aa8 100644
--- a/runtimevar/driver/driver.go
+++ b/runtimevar/driver/driver.go
@@ -14,7 +14,7 @@
 
 // Package driver provides the interface for providers of runtimevar.  This serves as a contract
 // of how the runtimevar API uses a provider implementation.
-package driver
+package driver // import "gocloud.dev/runtimevar/driver"
 
 import (
 	"context"
diff --git a/runtimevar/etcdvar/etcdvar.go b/runtimevar/etcdvar/etcdvar.go
index da315e92..88056089 100644
--- a/runtimevar/etcdvar/etcdvar.go
+++ b/runtimevar/etcdvar/etcdvar.go
@@ -14,7 +14,7 @@
 
 // Package etcdvar provides a runtimevar.Driver implementation to read
 // variables from etcd.
-package etcdvar
+package etcdvar // import "gocloud.dev/runtimevar/etcdvar"
 
 import (
 	"context"
@@ -23,8 +23,8 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
 	"google.golang.org/grpc/codes"
 )
 
diff --git a/runtimevar/filevar/_demo/demo.go b/runtimevar/filevar/_demo/demo.go
index 65512cd9..4a0ba72f 100644
--- a/runtimevar/filevar/_demo/demo.go
+++ b/runtimevar/filevar/_demo/demo.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar"
+	"gocloud.dev/runtimevar"
 )
 
 func main() {
diff --git a/runtimevar/filevar/filevar.go b/runtimevar/filevar/filevar.go
index e0b02c6f..c70d5cda 100644
--- a/runtimevar/filevar/filevar.go
+++ b/runtimevar/filevar/filevar.go
@@ -28,7 +28,7 @@
 // * Saving a configuration file in vim using :w will incur events Rename and Create. When the
 // Rename event occurs, the file is temporarily removed and hence Watch will return error.  A
 // follow-up Watch call will then detect the Create event.
-package filevar
+package filevar // import "gocloud.dev/runtimevar/filevar"
 
 import (
 	"bytes"
@@ -39,8 +39,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
 
 	"github.com/fsnotify/fsnotify"
 )
diff --git a/runtimevar/paramstore/paramstore.go b/runtimevar/paramstore/paramstore.go
index 29b73e20..6db751fd 100644
--- a/runtimevar/paramstore/paramstore.go
+++ b/runtimevar/paramstore/paramstore.go
@@ -17,15 +17,15 @@
 //
 // Construct a Client, then use NewVariable to construct any number of
 // runtimevar.Variable objects.
-package paramstore
+package paramstore // import "gocloud.dev/runtimevar/paramstore"
 
 import (
 	"context"
 	"fmt"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
diff --git a/runtimevar/runtimeconfigurator/runtimeconfigurator.go b/runtimevar/runtimeconfigurator/runtimeconfigurator.go
index fcd360aa..0c3bc8f1 100644
--- a/runtimevar/runtimeconfigurator/runtimeconfigurator.go
+++ b/runtimevar/runtimeconfigurator/runtimeconfigurator.go
@@ -17,7 +17,7 @@
 //
 // Construct a Client, then use NewVariable to construct any number of
 // runtimevar.Variable objects.
-package runtimeconfigurator
+package runtimeconfigurator // import "gocloud.dev/runtimevar/runtimeconfigurator"
 
 import (
 	"bytes"
@@ -26,10 +26,10 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/ptypes"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
 	"github.com/google/wire"
+	"gocloud.dev/gcp"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
 	pb "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/runtimevar/runtimevar.go b/runtimevar/runtimevar.go
index 2bd159af..2946a87b 100644
--- a/runtimevar/runtimevar.go
+++ b/runtimevar/runtimevar.go
@@ -14,7 +14,7 @@
 
 // Package runtimevar provides an interface for reading runtime variables and
 // ability to detect changes and get updates on those variables.
-package runtimevar
+package runtimevar // import "gocloud.dev/runtimevar"
 
 import (
 	"bytes"
@@ -24,7 +24,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar/driver"
+	"gocloud.dev/runtimevar/driver"
 )
 
 // Snapshot contains a variable and metadata about it.
diff --git a/samples/guestbook/inject_aws.go b/samples/guestbook/inject_aws.go
index 58c8ba59..5444953c 100644
--- a/samples/guestbook/inject_aws.go
+++ b/samples/guestbook/inject_aws.go
@@ -20,12 +20,12 @@ import (
 	"context"
 
 	awsclient "github.com/aws/aws-sdk-go/aws/client"
-	"github.com/google/go-cloud/aws/awscloud"
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/s3blob"
-	"github.com/google/go-cloud/mysql/rdsmysql"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/paramstore"
+	"gocloud.dev/aws/awscloud"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/s3blob"
+	"gocloud.dev/mysql/rdsmysql"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/paramstore"
 	"github.com/google/wire"
 )
 
diff --git a/samples/guestbook/inject_gcp.go b/samples/guestbook/inject_gcp.go
index 36300404..425e87b7 100644
--- a/samples/guestbook/inject_gcp.go
+++ b/samples/guestbook/inject_gcp.go
@@ -19,13 +19,13 @@ package main
 import (
 	"context"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/gcsblob"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/gcpcloud"
-	"github.com/google/go-cloud/mysql/cloudmysql"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/runtimeconfigurator"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/gcsblob"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/gcpcloud"
+	"gocloud.dev/mysql/cloudmysql"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/runtimeconfigurator"
 	"github.com/google/wire"
 )
 
diff --git a/samples/guestbook/inject_local.go b/samples/guestbook/inject_local.go
index 701755d9..2b8e0916 100644
--- a/samples/guestbook/inject_local.go
+++ b/samples/guestbook/inject_local.go
@@ -21,12 +21,12 @@ import (
 	"database/sql"
 
 	"github.com/go-sql-driver/mysql"
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/fileblob"
-	"github.com/google/go-cloud/requestlog"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/filevar"
-	"github.com/google/go-cloud/server"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/fileblob"
+	"gocloud.dev/requestlog"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/filevar"
+	"gocloud.dev/server"
 	"github.com/google/wire"
 	"go.opencensus.io/trace"
 )
diff --git a/samples/guestbook/main.go b/samples/guestbook/main.go
index 50971e7a..b3991c38 100644
--- a/samples/guestbook/main.go
+++ b/samples/guestbook/main.go
@@ -30,11 +30,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/health"
-	"github.com/google/go-cloud/health/sqlhealth"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/server"
+	"gocloud.dev/blob"
+	"gocloud.dev/health"
+	"gocloud.dev/health/sqlhealth"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/server"
 	"github.com/google/wire"
 	"github.com/gorilla/mux"
 	"go.opencensus.io/trace"
diff --git a/samples/guestbook/wire_gen.go b/samples/guestbook/wire_gen.go
index 3fbc0af6..7c967ff7 100644
--- a/samples/guestbook/wire_gen.go
+++ b/samples/guestbook/wire_gen.go
@@ -12,23 +12,23 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/go-sql-driver/mysql"
-	"github.com/google/go-cloud/aws/rds"
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/fileblob"
-	"github.com/google/go-cloud/blob/gcsblob"
-	"github.com/google/go-cloud/blob/s3blob"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/cloudsql"
-	"github.com/google/go-cloud/mysql/cloudmysql"
-	"github.com/google/go-cloud/mysql/rdsmysql"
-	"github.com/google/go-cloud/requestlog"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/filevar"
-	"github.com/google/go-cloud/runtimevar/paramstore"
-	"github.com/google/go-cloud/runtimevar/runtimeconfigurator"
-	"github.com/google/go-cloud/server"
-	"github.com/google/go-cloud/server/sdserver"
-	"github.com/google/go-cloud/server/xrayserver"
+	"gocloud.dev/aws/rds"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/fileblob"
+	"gocloud.dev/blob/gcsblob"
+	"gocloud.dev/blob/s3blob"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/cloudsql"
+	"gocloud.dev/mysql/cloudmysql"
+	"gocloud.dev/mysql/rdsmysql"
+	"gocloud.dev/requestlog"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/filevar"
+	"gocloud.dev/runtimevar/paramstore"
+	"gocloud.dev/runtimevar/runtimeconfigurator"
+	"gocloud.dev/server"
+	"gocloud.dev/server/sdserver"
+	"gocloud.dev/server/xrayserver"
 	"go.opencensus.io/trace"
 	"net/http"
 )
diff --git a/samples/tutorial/setup.go b/samples/tutorial/setup.go
index 037a342c..c9b30c03 100644
--- a/samples/tutorial/setup.go
+++ b/samples/tutorial/setup.go
@@ -21,10 +21,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/gcsblob"
-	"github.com/google/go-cloud/blob/s3blob"
-	"github.com/google/go-cloud/gcp"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/gcsblob"
+	"gocloud.dev/blob/s3blob"
+	"gocloud.dev/gcp"
 )
 
 // setupBucket creates a connection to a particular cloud provider's blob storage.
diff --git a/server/driver/driver.go b/server/driver/driver.go
index 4506a3f3..5e78e448 100644
--- a/server/driver/driver.go
+++ b/server/driver/driver.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package driver defines an interface for custom HTTP listeners.
-package driver
+package driver // import "gocloud.dev/server/driver"
 
 import (
 	"context"
diff --git a/server/sdserver/server.go b/server/sdserver/server.go
index 5c5f77bc..60ba4231 100644
--- a/server/sdserver/server.go
+++ b/server/sdserver/server.go
@@ -14,16 +14,16 @@
 
 // Package sdserver provides the diagnostic hooks for a server using
 // Stackdriver.
-package sdserver
+package sdserver // import "gocloud.dev/server/sdserver"
 
 import (
 	"fmt"
 	"os"
 
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/requestlog"
-	"github.com/google/go-cloud/server"
 	"github.com/google/wire"
+	"gocloud.dev/gcp"
+	"gocloud.dev/requestlog"
+	"gocloud.dev/server"
 
 	"contrib.go.opencensus.io/exporter/stackdriver"
 	"contrib.go.opencensus.io/exporter/stackdriver/monitoredresource"
diff --git a/server/server.go b/server/server.go
index 1fd03f58..14145a68 100644
--- a/server/server.go
+++ b/server/server.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package server provides a preconfigured HTTP server with diagnostic hooks.
-package server
+package server // import "gocloud.dev/server"
 
 import (
 	"context"
@@ -22,10 +22,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/go-cloud/health"
-	"github.com/google/go-cloud/requestlog"
-	"github.com/google/go-cloud/server/driver"
 	"github.com/google/wire"
+	"gocloud.dev/health"
+	"gocloud.dev/requestlog"
+	"gocloud.dev/server/driver"
 
 	"go.opencensus.io/trace"
 )
diff --git a/server/xrayserver/server.go b/server/xrayserver/server.go
index ad1da97a..a061607d 100644
--- a/server/xrayserver/server.go
+++ b/server/xrayserver/server.go
@@ -14,7 +14,7 @@
 
 // Package xrayserver provides the diagnostic hooks for a server using
 // AWS X-Ray.
-package xrayserver
+package xrayserver // import "gocloud.dev/server/xrayserver"
 
 import (
 	"fmt"
@@ -24,10 +24,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/service/xray"
 	"github.com/aws/aws-sdk-go/service/xray/xrayiface"
-	"github.com/google/go-cloud/requestlog"
-	"github.com/google/go-cloud/server"
 	"github.com/google/wire"
 	"go.opencensus.io/trace"
+	"gocloud.dev/requestlog"
+	"gocloud.dev/server"
 )
 
 // Set is a Wire provider set that provides the diagnostic hooks for
diff --git a/wire/README.md b/wire/README.md
deleted file mode 100644
index 0e67f1fd..00000000
--- a/wire/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Wire has moved!
-
-Wire has moved to its own repository: [github.com/google/wire](https://github.com/google/wire)
-
-Read the [announcement][] for more details.
-
-[announcement]: https://groups.google.com/d/msg/go-cloud/4HuWfjDAkOY/Y2tUQdB_BQAJ
diff --git a/wire/wire.go b/wire/wire.go
deleted file mode 100644
index 19e432a4..00000000
--- a/wire/wire.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2018 The Go Cloud Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package wire is the deprecated package for Wire code generation directives.
-// It exists only for backward compatibility. Please update your import paths to
-// "github.com/google/wire".
-//
-// For an overview of working with Wire, see the user guide at
-// https://github.com/google/wire/blob/master/README.md
-//
-// Deprecated: Please import "github.com/google/wire" instead of this package.
-package wire
-
-import "github.com/google/wire"
-
-// ProviderSet is a marker type that collects a group of providers.
-type ProviderSet = wire.ProviderSet
-
-// NewSet creates a new provider set that includes the providers in its
-// arguments. Each argument is a function value, a struct (zero) value, a
-// provider set, a call to Bind, a call to Value, or a call to InterfaceValue.
-//
-// Passing a function value to NewSet declares that the function's first
-// return value type will be provided by calling the function. The arguments
-// to the function will come from the providers for their types. As such, all
-// the parameters must be of non-identical types. The function may optionally
-// return an error as its last return value and a cleanup function as the
-// second return value. A cleanup function must be of type func() and is
-// guaranteed to be called before the cleanup function of any of the
-// provider's inputs. If any provider returns an error, the injector function
-// will call all the appropriate cleanup functions and return the error from
-// the injector function.
-//
-// Passing a struct value of type S to NewSet declares that both S and *S will
-// be provided by creating a new value of the appropriate type by filling in
-// each field of S using the provider of the field's type.
-//
-// Passing a ProviderSet to NewSet is the same as if the set's contents
-// were passed as arguments to NewSet directly.
-//
-// The behavior of passing the result of a call to other functions in this
-// package are described in their respective doc comments.
-func NewSet(args ...interface{}) wire.ProviderSet {
-	return wire.NewSet(args...)
-}
-
-// Build is placed in the body of an injector function template to declare the
-// providers to use. The Wire code generation tool will fill in an
-// implementation of the function. The arguments to Build are interpreted the
-// same as NewSet: they determine the provider set presented to Wire's
-// dependency graph. Build returns an error message that can be sent to a call
-// to panic().
-//
-// The parameters of the injector function are used as inputs in the dependency
-// graph.
-//
-// Similar to provider functions passed into NewSet, the first return value is
-// the output of the injector function, the optional second return value is a
-// cleanup function, and the optional last return value is an error. If any of
-// the provider functions in the injector function's provider set return errors
-// or cleanup functions, the corresponding return value must be present in the
-// injector function template.
-//
-// Examples:
-//
-//	func injector(ctx context.Context) (*sql.DB, error) {
-//		wire.Build(otherpkg.FooSet, myProviderFunc)
-//		return nil, nil
-//	}
-//
-//	func injector(ctx context.Context) (*sql.DB, error) {
-//		panic(wire.Build(otherpkg.FooSet, myProviderFunc))
-//	}
-func Build(args ...interface{}) string {
-	return wire.Build(args...)
-}
-
-// A Binding maps an interface to a concrete type.
-type Binding = wire.Binding
-
-// Bind declares that a concrete type should be used to satisfy a
-// dependency on the type of iface, which must be a pointer to an
-// interface type.
-//
-// Example:
-//
-//	type Fooer interface {
-//		Foo()
-//	}
-//
-//	type MyFoo struct{}
-//
-//	func (MyFoo) Foo() {}
-//
-//	var MySet = wire.NewSet(
-//		MyFoo{},
-//		wire.Bind(new(Fooer), new(MyFoo)))
-func Bind(iface, to interface{}) wire.Binding {
-	return wire.Bind(iface, to)
-}
-
-// A ProvidedValue is an expression that is copied to the generated injector.
-type ProvidedValue = wire.ProvidedValue
-
-// Value binds an expression to provide the type of the expression.
-// The expression may not be an interface value; use InterfaceValue for that.
-//
-// Example:
-//
-//	var MySet = wire.NewSet(wire.Value([]string(nil)))
-func Value(v interface{}) wire.ProvidedValue {
-	return wire.Value(v)
-}
-
-// InterfaceValue binds an expression to provide a specific interface type.
-//
-// Example:
-//
-//	var MySet = wire.NewSet(wire.InterfaceValue(new(io.Reader), os.Stdin))
-func InterfaceValue(typ interface{}, x interface{}) wire.ProvidedValue {
-	return wire.InterfaceValue(typ, x)
-}


Test patch:
diff --git a/aws/awscloud/example_test.go b/aws/awscloud/example_test.go
index 1c136fbe..e901f177 100644
--- a/aws/awscloud/example_test.go
+++ b/aws/awscloud/example_test.go
@@ -20,9 +20,9 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/google/go-cloud/aws/awscloud"
-	"github.com/google/go-cloud/health"
-	"github.com/google/go-cloud/server"
+	"gocloud.dev/aws/awscloud"
+	"gocloud.dev/health"
+	"gocloud.dev/server"
 	"github.com/google/wire"
 	"go.opencensus.io/trace"
 )
diff --git a/blob/blob_test.go b/blob/blob_test.go
index 5404f103..d1287e7f 100644
--- a/blob/blob_test.go
+++ b/blob/blob_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-cloud/blob/driver"
+	"gocloud.dev/blob/driver"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/blob/drivertest/drivertest.go b/blob/drivertest/drivertest.go
index f5a9993b..dbba2292 100644
--- a/blob/drivertest/drivertest.go
+++ b/blob/drivertest/drivertest.go
@@ -14,7 +14,7 @@
 
 // Package drivertest provides a conformance test for implementations of
 // driver.
-package drivertest
+package drivertest // import "gocloud.dev/blob/drivertest"
 
 import (
 	"bytes"
@@ -31,9 +31,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/driver"
 	"github.com/google/go-cmp/cmp"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/driver"
 )
 
 // Harness descibes the functionality test harnesses must provide to run
@@ -561,62 +561,62 @@ func testListDelimiters(t *testing.T, newHarness HarnessMaker) {
 		},
 		// TODO(#905): Backslashes cause problems for Azure; disable for now.
 		/*
-		{
-			name:  "backslash",
-			delim: "\\",
-			wantFlat: []listResult{
-				listResult{Key: keyPrefix + "\\dir1\\a.txt"},
-				listResult{Key: keyPrefix + "\\dir1\\b.txt"},
-				listResult{Key: keyPrefix + "\\dir1\\subdir\\c.txt"},
-				listResult{Key: keyPrefix + "\\dir1\\subdir\\d.txt"},
-				listResult{Key: keyPrefix + "\\dir2\\e.txt"},
-				listResult{Key: keyPrefix + "\\f.txt"},
-			},
-			wantRecursive: []listResult{
-				listResult{
-					Key:   keyPrefix + "\\dir1\\",
-					IsDir: true,
-					Sub: []listResult{
-						listResult{Key: keyPrefix + "\\dir1\\a.txt"},
-						listResult{Key: keyPrefix + "\\dir1\\b.txt"},
-						listResult{
-							Key:   keyPrefix + "\\dir1\\subdir\\",
-							IsDir: true,
-							Sub: []listResult{
-								listResult{Key: keyPrefix + "\\dir1\\subdir\\c.txt"},
-								listResult{Key: keyPrefix + "\\dir1\\subdir\\d.txt"},
+			{
+				name:  "backslash",
+				delim: "\\",
+				wantFlat: []listResult{
+					listResult{Key: keyPrefix + "\\dir1\\a.txt"},
+					listResult{Key: keyPrefix + "\\dir1\\b.txt"},
+					listResult{Key: keyPrefix + "\\dir1\\subdir\\c.txt"},
+					listResult{Key: keyPrefix + "\\dir1\\subdir\\d.txt"},
+					listResult{Key: keyPrefix + "\\dir2\\e.txt"},
+					listResult{Key: keyPrefix + "\\f.txt"},
+				},
+				wantRecursive: []listResult{
+					listResult{
+						Key:   keyPrefix + "\\dir1\\",
+						IsDir: true,
+						Sub: []listResult{
+							listResult{Key: keyPrefix + "\\dir1\\a.txt"},
+							listResult{Key: keyPrefix + "\\dir1\\b.txt"},
+							listResult{
+								Key:   keyPrefix + "\\dir1\\subdir\\",
+								IsDir: true,
+								Sub: []listResult{
+									listResult{Key: keyPrefix + "\\dir1\\subdir\\c.txt"},
+									listResult{Key: keyPrefix + "\\dir1\\subdir\\d.txt"},
+								},
 							},
 						},
 					},
-				},
-				listResult{
-					Key:   keyPrefix + "\\dir2\\",
-					IsDir: true,
-					Sub: []listResult{
-						listResult{Key: keyPrefix + "\\dir2\\e.txt"},
+					listResult{
+						Key:   keyPrefix + "\\dir2\\",
+						IsDir: true,
+						Sub: []listResult{
+							listResult{Key: keyPrefix + "\\dir2\\e.txt"},
+						},
 					},
+					listResult{Key: keyPrefix + "\\f.txt"},
 				},
-				listResult{Key: keyPrefix + "\\f.txt"},
-			},
-			wantPaged: []listResult{
-				listResult{
-					Key:   keyPrefix + "\\dir1\\",
-					IsDir: true,
-				},
-				listResult{
-					Key:   keyPrefix + "\\dir2\\",
-					IsDir: true,
+				wantPaged: []listResult{
+					listResult{
+						Key:   keyPrefix + "\\dir1\\",
+						IsDir: true,
+					},
+					listResult{
+						Key:   keyPrefix + "\\dir2\\",
+						IsDir: true,
+					},
+					listResult{Key: keyPrefix + "\\f.txt"},
 				},
-				listResult{Key: keyPrefix + "\\f.txt"},
-			},
-			wantAfterDel: []listResult{
-				listResult{
-					Key:   keyPrefix + "\\dir1\\",
-					IsDir: true,
+				wantAfterDel: []listResult{
+					listResult{
+						Key:   keyPrefix + "\\dir1\\",
+						IsDir: true,
+					},
+					listResult{Key: keyPrefix + "\\f.txt"},
 				},
-				listResult{Key: keyPrefix + "\\f.txt"},
 			},
-		},
 		*/
 		{
 			name:  "abc",
@@ -1438,7 +1438,7 @@ func testKeys(t *testing.T, newHarness HarnessMaker) {
 			description: "punctuation",
 			// TODO(#905): Backslashes cause problems for Azure; disable for now.
 			// key:         "~!@#$%^&*()_+`-=[]{}\\|;':\",/.<>?",
-			key:         "~!@#$%^&*()_+`-=[]{}|;':\",/.<>?",
+			key: "~!@#$%^&*()_+`-=[]{}|;':\",/.<>?",
 		},
 		{
 			description: "unicode",
diff --git a/blob/example_test.go b/blob/example_test.go
index 46d779ff..14ae446a 100644
--- a/blob/example_test.go
+++ b/blob/example_test.go
@@ -25,8 +25,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/fileblob"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/fileblob"
 )
 
 func ExampleBucket_NewReader() {
diff --git a/blob/fileblob/fileblob_test.go b/blob/fileblob/fileblob_test.go
index 0f81fcc1..6204f27b 100644
--- a/blob/fileblob/fileblob_test.go
+++ b/blob/fileblob/fileblob_test.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/google/go-cloud/blob/driver"
-	"github.com/google/go-cloud/blob/drivertest"
+	"gocloud.dev/blob/driver"
+	"gocloud.dev/blob/drivertest"
 )
 
 type harness struct {
diff --git a/blob/gcsblob/example_test.go b/blob/gcsblob/example_test.go
index e731706b..bcf38ef4 100644
--- a/blob/gcsblob/example_test.go
+++ b/blob/gcsblob/example_test.go
@@ -17,8 +17,8 @@ package gcsblob_test
 import (
 	"context"
 
-	"github.com/google/go-cloud/blob/gcsblob"
-	"github.com/google/go-cloud/gcp"
+	"gocloud.dev/blob/gcsblob"
+	"gocloud.dev/gcp"
 )
 
 func Example() {
diff --git a/blob/gcsblob/gcsblob_test.go b/blob/gcsblob/gcsblob_test.go
index 4c2a2491..8c3d6ce1 100644
--- a/blob/gcsblob/gcsblob_test.go
+++ b/blob/gcsblob/gcsblob_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 
 	"cloud.google.com/go/storage"
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/driver"
-	"github.com/google/go-cloud/blob/drivertest"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/internal/testing/setup"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/driver"
+	"gocloud.dev/blob/drivertest"
+	"gocloud.dev/gcp"
+	"gocloud.dev/internal/testing/setup"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/option"
diff --git a/blob/s3blob/example_test.go b/blob/s3blob/example_test.go
index 44d168f0..81ce883b 100644
--- a/blob/s3blob/example_test.go
+++ b/blob/s3blob/example_test.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/google/go-cloud/blob/s3blob"
+	"gocloud.dev/blob/s3blob"
 )
 
 func Example() {
diff --git a/blob/s3blob/s3blob_test.go b/blob/s3blob/s3blob_test.go
index 36e77e8d..d9bc64b3 100644
--- a/blob/s3blob/s3blob_test.go
+++ b/blob/s3blob/s3blob_test.go
@@ -28,10 +28,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	"github.com/google/go-cloud/blob"
-	"github.com/google/go-cloud/blob/driver"
-	"github.com/google/go-cloud/blob/drivertest"
-	"github.com/google/go-cloud/internal/testing/setup"
+	"gocloud.dev/blob"
+	"gocloud.dev/blob/driver"
+	"gocloud.dev/blob/drivertest"
+	"gocloud.dev/internal/testing/setup"
 )
 
 // These constants record the region & bucket used for the last --record.
diff --git a/gcp/gcpcloud/example_test.go b/gcp/gcpcloud/example_test.go
index 7a1acf72..83b7cbdb 100644
--- a/gcp/gcpcloud/example_test.go
+++ b/gcp/gcpcloud/example_test.go
@@ -20,9 +20,9 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/google/go-cloud/gcp/gcpcloud"
-	"github.com/google/go-cloud/health"
-	"github.com/google/go-cloud/server"
+	"gocloud.dev/gcp/gcpcloud"
+	"gocloud.dev/health"
+	"gocloud.dev/server"
 	"github.com/google/wire"
 	"go.opencensus.io/trace"
 )
diff --git a/health/sqlhealth/sqlhealth_test.go b/health/sqlhealth/sqlhealth_test.go
index 5e65b8d4..eb32fd23 100644
--- a/health/sqlhealth/sqlhealth_test.go
+++ b/health/sqlhealth/sqlhealth_test.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/google/go-cloud/health"
+	"gocloud.dev/health"
 )
 
 var _ = health.Checker((*Checker)(nil))
diff --git a/internal/batcher/batcher_test.go b/internal/batcher/batcher_test.go
index e575583d..3931ca1b 100644
--- a/internal/batcher/batcher_test.go
+++ b/internal/batcher/batcher_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/internal/batcher"
+	"gocloud.dev/internal/batcher"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/internal/pubsub/acks_test.go b/internal/pubsub/acks_test.go
index 38ea1b07..379c410b 100644
--- a/internal/pubsub/acks_test.go
+++ b/internal/pubsub/acks_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 )
 
 type ackingDriverSub struct {
diff --git a/internal/pubsub/drivertest/drivertest.go b/internal/pubsub/drivertest/drivertest.go
index f59bb387..b0c3db49 100644
--- a/internal/pubsub/drivertest/drivertest.go
+++ b/internal/pubsub/drivertest/drivertest.go
@@ -14,7 +14,7 @@
 
 // Package drivertest provides a conformance test for implementations of
 // driver.
-package drivertest
+package drivertest // import "gocloud.dev/internal/pubsub/drivertest"
 
 import (
 	"bytes"
@@ -23,10 +23,10 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 )
 
 // Harness descibes the functionality test harnesses must provide to run
diff --git a/internal/pubsub/example_test.go b/internal/pubsub/example_test.go
index ef76b8bd..1a62681d 100644
--- a/internal/pubsub/example_test.go
+++ b/internal/pubsub/example_test.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/mempubsub"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/mempubsub"
 )
 
 func Example_sendReceive() {
diff --git a/internal/pubsub/gcppubsub/gcppubsub_test.go b/internal/pubsub/gcppubsub/gcppubsub_test.go
index 9613fc67..b8fd7bad 100644
--- a/internal/pubsub/gcppubsub/gcppubsub_test.go
+++ b/internal/pubsub/gcppubsub/gcppubsub_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	raw "cloud.google.com/go/pubsub/apiv1"
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
-	"github.com/google/go-cloud/internal/pubsub/drivertest"
-	"github.com/google/go-cloud/internal/testing/setup"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub/drivertest"
+	"gocloud.dev/internal/testing/setup"
 	"google.golang.org/api/option"
 )
 
diff --git a/internal/pubsub/mempubsub/conformance_test.go b/internal/pubsub/mempubsub/conformance_test.go
index f9bde969..14ea474c 100644
--- a/internal/pubsub/mempubsub/conformance_test.go
+++ b/internal/pubsub/mempubsub/conformance_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub/driver"
-	"github.com/google/go-cloud/internal/pubsub/drivertest"
+	"gocloud.dev/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub/drivertest"
 )
 
 type harness struct {
diff --git a/internal/pubsub/mempubsub/mem_test.go b/internal/pubsub/mempubsub/mem_test.go
index c1e50033..9256a080 100644
--- a/internal/pubsub/mempubsub/mem_test.go
+++ b/internal/pubsub/mempubsub/mem_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 )
 
 func TestReceive(t *testing.T) {
diff --git a/internal/pubsub/pubsub_test.go b/internal/pubsub/pubsub_test.go
index ad0032c8..a9ca619b 100644
--- a/internal/pubsub/pubsub_test.go
+++ b/internal/pubsub/pubsub_test.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 )
 
 type driverTopic struct {
diff --git a/internal/pubsub/rabbitpubsub/examples_test.go b/internal/pubsub/rabbitpubsub/examples_test.go
index 9b7a8bfa..e3732563 100644
--- a/internal/pubsub/rabbitpubsub/examples_test.go
+++ b/internal/pubsub/rabbitpubsub/examples_test.go
@@ -20,8 +20,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/rabbitpubsub"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/rabbitpubsub"
 	"github.com/streadway/amqp"
 )
 
diff --git a/internal/pubsub/rabbitpubsub/rabbit_test.go b/internal/pubsub/rabbitpubsub/rabbit_test.go
index 790a2396..b3a40713 100644
--- a/internal/pubsub/rabbitpubsub/rabbit_test.go
+++ b/internal/pubsub/rabbitpubsub/rabbit_test.go
@@ -28,9 +28,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
-	"github.com/google/go-cloud/internal/pubsub/drivertest"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub/drivertest"
 	"github.com/streadway/amqp"
 )
 
diff --git a/internal/pubsub/sub_test.go b/internal/pubsub/sub_test.go
index 527a6561..8072d424 100644
--- a/internal/pubsub/sub_test.go
+++ b/internal/pubsub/sub_test.go
@@ -17,8 +17,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/google/go-cloud/internal/pubsub"
-	"github.com/google/go-cloud/internal/pubsub/driver"
+	"gocloud.dev/internal/pubsub"
+	"gocloud.dev/internal/pubsub/driver"
 )
 
 // scriptedSub returns batches of messages in a predefined order from
diff --git a/internal/secrets/drivertest/drivertest.go b/internal/secrets/drivertest/drivertest.go
index ba352def..8cf59a3f 100644
--- a/internal/secrets/drivertest/drivertest.go
+++ b/internal/secrets/drivertest/drivertest.go
@@ -14,7 +14,7 @@
 
 // Package drivertest provides a conformance test for implementations of
 // the secrets driver.
-package drivertest
+package drivertest // import "gocloud.dev/internal/secrets/drivertest"
 
 import (
 	"context"
diff --git a/internal/testing/replay/replay.go b/internal/testing/replay/replay.go
index 43cd0643..ec14822a 100644
--- a/internal/testing/replay/replay.go
+++ b/internal/testing/replay/replay.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package replay provides the ability to record and replay HTTP requests.
-package replay
+package replay // import "gocloud.dev/internal/testing/replay"
 
 import (
 	"bytes"
diff --git a/internal/testing/setup/setup.go b/internal/testing/setup/setup.go
index ec37732c..4fe188c4 100644
--- a/internal/testing/setup/setup.go
+++ b/internal/testing/setup/setup.go
@@ -1,4 +1,4 @@
-package setup
+package setup // import "gocloud.dev/internal/testing/setup"
 
 import (
 	"context"
@@ -12,8 +12,8 @@ import (
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/dnaeon/go-vcr/recorder"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/internal/testing/replay"
+	"gocloud.dev/gcp"
+	"gocloud.dev/internal/testing/replay"
 
 	"google.golang.org/grpc"
 	grpccreds "google.golang.org/grpc/credentials"
diff --git a/internal/testing/terraform/terraform.go b/internal/testing/terraform/terraform.go
index d46576cb..e5e01e58 100644
--- a/internal/testing/terraform/terraform.go
+++ b/internal/testing/terraform/terraform.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package terraform provides a function to read Terraform output.
-package terraform
+package terraform // import "gocloud.dev/internal/testing/terraform"
 
 import (
 	"encoding/json"
diff --git a/mysql/cloudmysql/cloudmysql_test.go b/mysql/cloudmysql/cloudmysql_test.go
index 0d2154fe..44f75c55 100644
--- a/mysql/cloudmysql/cloudmysql_test.go
+++ b/mysql/cloudmysql/cloudmysql_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	"contrib.go.opencensus.io/integrations/ocsql"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/internal/testing/terraform"
+	"gocloud.dev/gcp"
+	"gocloud.dev/internal/testing/terraform"
 )
 
 func TestOpenWithDefaultParamsGivesNoError(t *testing.T) {
diff --git a/mysql/cloudmysql/example_test.go b/mysql/cloudmysql/example_test.go
index 90845734..f62c8fff 100644
--- a/mysql/cloudmysql/example_test.go
+++ b/mysql/cloudmysql/example_test.go
@@ -17,9 +17,9 @@ package cloudmysql_test
 import (
 	"context"
 
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/cloudsql"
-	"github.com/google/go-cloud/mysql/cloudmysql"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/cloudsql"
+	"gocloud.dev/mysql/cloudmysql"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 )
diff --git a/mysql/rdsmysql/example_test.go b/mysql/rdsmysql/example_test.go
index 4dd6048c..b7295ef1 100644
--- a/mysql/rdsmysql/example_test.go
+++ b/mysql/rdsmysql/example_test.go
@@ -17,7 +17,7 @@ package rdsmysql_test
 import (
 	"context"
 
-	"github.com/google/go-cloud/mysql/rdsmysql"
+	"gocloud.dev/mysql/rdsmysql"
 )
 
 func Example() {
diff --git a/mysql/rdsmysql/rdsmysql_test.go b/mysql/rdsmysql/rdsmysql_test.go
index c21f7253..d04c0639 100644
--- a/mysql/rdsmysql/rdsmysql_test.go
+++ b/mysql/rdsmysql/rdsmysql_test.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/google/go-cloud/internal/testing/terraform"
+	"gocloud.dev/internal/testing/terraform"
 )
 
 func TestOpen(t *testing.T) {
diff --git a/postgres/cloudpostgres/cloudpostgres_test.go b/postgres/cloudpostgres/cloudpostgres_test.go
index 2610a506..bfb78b9a 100644
--- a/postgres/cloudpostgres/cloudpostgres_test.go
+++ b/postgres/cloudpostgres/cloudpostgres_test.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/cloudsql"
-	"github.com/google/go-cloud/internal/testing/terraform"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/cloudsql"
+	"gocloud.dev/internal/testing/terraform"
 )
 
 func TestOpen(t *testing.T) {
diff --git a/postgres/cloudpostgres/example_test.go b/postgres/cloudpostgres/example_test.go
index 9bed43a7..8de6ed70 100644
--- a/postgres/cloudpostgres/example_test.go
+++ b/postgres/cloudpostgres/example_test.go
@@ -17,9 +17,9 @@ package cloudpostgres_test
 import (
 	"context"
 
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/cloudsql"
-	"github.com/google/go-cloud/postgres/cloudpostgres"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/cloudsql"
+	"gocloud.dev/postgres/cloudpostgres"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 )
diff --git a/postgres/rdspostgres/rdspostgres_test.go b/postgres/rdspostgres/rdspostgres_test.go
index 0bcda49b..da300e8f 100644
--- a/postgres/rdspostgres/rdspostgres_test.go
+++ b/postgres/rdspostgres/rdspostgres_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-cloud/aws/rds"
-	"github.com/google/go-cloud/internal/testing/terraform"
+	"gocloud.dev/aws/rds"
+	"gocloud.dev/internal/testing/terraform"
 )
 
 func TestOpen(t *testing.T) {
diff --git a/runtimevar/constantvar/constantvar_test.go b/runtimevar/constantvar/constantvar_test.go
index c666854e..33e73fc3 100644
--- a/runtimevar/constantvar/constantvar_test.go
+++ b/runtimevar/constantvar/constantvar_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
-	"github.com/google/go-cloud/runtimevar/drivertest"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
+	"gocloud.dev/runtimevar/drivertest"
 )
 
 type harness struct {
diff --git a/runtimevar/drivertest/drivertest.go b/runtimevar/drivertest/drivertest.go
index cc5ebf4e..c9ed3421 100644
--- a/runtimevar/drivertest/drivertest.go
+++ b/runtimevar/drivertest/drivertest.go
@@ -14,7 +14,7 @@
 
 // Package drivertest provides a conformance test for implementations of
 // runtimevar.
-package drivertest
+package drivertest // import "gocloud.dev/runtimevar/drivertest"
 
 import (
 	"context"
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/internal/testing/setup"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
 	"github.com/google/go-cmp/cmp"
+	"gocloud.dev/internal/testing/setup"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
 )
 
 // Harness descibes the functionality test harnesses must provide to run conformance tests.
diff --git a/runtimevar/etcdvar/etcdvar_test.go b/runtimevar/etcdvar/etcdvar_test.go
index 4f4736f9..30b2c395 100644
--- a/runtimevar/etcdvar/etcdvar_test.go
+++ b/runtimevar/etcdvar/etcdvar_test.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/embed"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
-	"github.com/google/go-cloud/runtimevar/drivertest"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
+	"gocloud.dev/runtimevar/drivertest"
 )
 
 var (
diff --git a/runtimevar/example_test.go b/runtimevar/example_test.go
index 0ef1d3e5..895a9c70 100644
--- a/runtimevar/example_test.go
+++ b/runtimevar/example_test.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"log"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/filevar"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/filevar"
 )
 
 type DBConfig struct {
diff --git a/runtimevar/filevar/example_test.go b/runtimevar/filevar/example_test.go
index e9fab392..4c40c4df 100644
--- a/runtimevar/filevar/example_test.go
+++ b/runtimevar/filevar/example_test.go
@@ -17,8 +17,8 @@ package filevar_test
 import (
 	"log"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/filevar"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/filevar"
 )
 
 // MyAppConfig is the unmarshaled type for myapp.conf file.
diff --git a/runtimevar/filevar/filevar_test.go b/runtimevar/filevar/filevar_test.go
index f6049b99..3b11fcff 100644
--- a/runtimevar/filevar/filevar_test.go
+++ b/runtimevar/filevar/filevar_test.go
@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
-	"github.com/google/go-cloud/runtimevar/drivertest"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
+	"gocloud.dev/runtimevar/drivertest"
 )
 
 type harness struct {
diff --git a/runtimevar/paramstore/paramstore_test.go b/runtimevar/paramstore/paramstore_test.go
index 9eaaecad..fa1a7164 100644
--- a/runtimevar/paramstore/paramstore_test.go
+++ b/runtimevar/paramstore/paramstore_test.go
@@ -21,10 +21,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/service/ssm"
-	"github.com/google/go-cloud/internal/testing/setup"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
-	"github.com/google/go-cloud/runtimevar/drivertest"
+	"gocloud.dev/internal/testing/setup"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
+	"gocloud.dev/runtimevar/drivertest"
 )
 
 // This constant records the region used for the last --record.
diff --git a/runtimevar/runtimeconfigurator/example_test.go b/runtimevar/runtimeconfigurator/example_test.go
index 8306ff9b..667d2e14 100644
--- a/runtimevar/runtimeconfigurator/example_test.go
+++ b/runtimevar/runtimeconfigurator/example_test.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/runtimeconfigurator"
+	"gocloud.dev/gcp"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/runtimeconfigurator"
 )
 
 func ExampleNewClient() {
diff --git a/runtimevar/runtimeconfigurator/runtimeconfigurator_test.go b/runtimevar/runtimeconfigurator/runtimeconfigurator_test.go
index ce66d148..efca1ed2 100644
--- a/runtimevar/runtimeconfigurator/runtimeconfigurator_test.go
+++ b/runtimevar/runtimeconfigurator/runtimeconfigurator_test.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/google/go-cloud/internal/testing/setup"
-	"github.com/google/go-cloud/runtimevar"
-	"github.com/google/go-cloud/runtimevar/driver"
-	"github.com/google/go-cloud/runtimevar/drivertest"
+	"gocloud.dev/internal/testing/setup"
+	"gocloud.dev/runtimevar"
+	"gocloud.dev/runtimevar/driver"
+	"gocloud.dev/runtimevar/drivertest"
 	pb "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
 )
 
diff --git a/runtimevar/runtimevar_test.go b/runtimevar/runtimevar_test.go
index f9be8e88..0f42ba97 100644
--- a/runtimevar/runtimevar_test.go
+++ b/runtimevar/runtimevar_test.go
@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cloud/runtimevar/driver"
+	"gocloud.dev/runtimevar/driver"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/tests/aws/app/app.go b/tests/aws/app/app.go
index af35d2e4..996da7df 100644
--- a/tests/aws/app/app.go
+++ b/tests/aws/app/app.go
@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/google/go-cloud/health"
+	"gocloud.dev/health"
 	"github.com/google/wire"
 
 	"go.opencensus.io/trace"
diff --git a/tests/aws/app/app_test.go b/tests/aws/app/app_test.go
index 45254601..478c660a 100644
--- a/tests/aws/app/app_test.go
+++ b/tests/aws/app/app_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/xray"
-	"github.com/google/go-cloud/tests/internal/testutil"
+	"gocloud.dev/tests/internal/testutil"
 	"golang.org/x/crypto/ssh"
 	"google.golang.org/api/iterator"
 )
diff --git a/tests/aws/app/inject.go b/tests/aws/app/inject.go
index 2708904d..40c3baa8 100644
--- a/tests/aws/app/inject.go
+++ b/tests/aws/app/inject.go
@@ -19,8 +19,8 @@ package main
 import (
 	"context"
 
-	"github.com/google/go-cloud/aws/awscloud"
-	"github.com/google/go-cloud/server"
+	"gocloud.dev/aws/awscloud"
+	"gocloud.dev/server"
 	"github.com/google/wire"
 
 	"github.com/aws/aws-sdk-go/aws"
diff --git a/tests/aws/app/wire_gen.go b/tests/aws/app/wire_gen.go
index c4048bfe..cebb80b8 100644
--- a/tests/aws/app/wire_gen.go
+++ b/tests/aws/app/wire_gen.go
@@ -11,9 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/google/go-cloud/health"
-	"github.com/google/go-cloud/server"
-	"github.com/google/go-cloud/server/xrayserver"
+	"gocloud.dev/health"
+	"gocloud.dev/server"
+	"gocloud.dev/server/xrayserver"
 	"github.com/google/wire"
 	"go.opencensus.io/trace"
 )
diff --git a/tests/gcp/app/app.go b/tests/gcp/app/app.go
index 55069184..bac79a10 100644
--- a/tests/gcp/app/app.go
+++ b/tests/gcp/app/app.go
@@ -24,7 +24,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/google/go-cloud/health"
+	"gocloud.dev/health"
 	"github.com/google/wire"
 
 	"go.opencensus.io/trace"
diff --git a/tests/gcp/app/app_test.go b/tests/gcp/app/app_test.go
index 8b2ac614..2c8f4dd6 100644
--- a/tests/gcp/app/app_test.go
+++ b/tests/gcp/app/app_test.go
@@ -23,7 +23,7 @@ import (
 
 	"cloud.google.com/go/logging/logadmin"
 	tracepb "cloud.google.com/go/trace/apiv1"
-	"github.com/google/go-cloud/tests/internal/testutil"
+	"gocloud.dev/tests/internal/testutil"
 	"google.golang.org/api/iterator"
 	cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
 )
diff --git a/tests/gcp/app/inject.go b/tests/gcp/app/inject.go
index fd6b6780..cf42ed70 100644
--- a/tests/gcp/app/inject.go
+++ b/tests/gcp/app/inject.go
@@ -19,9 +19,9 @@ package main
 import (
 	"context"
 
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/gcp/gcpcloud"
-	"github.com/google/go-cloud/server"
+	"gocloud.dev/gcp"
+	"gocloud.dev/gcp/gcpcloud"
+	"gocloud.dev/server"
 	"github.com/google/wire"
 )
 
diff --git a/tests/gcp/app/wire_gen.go b/tests/gcp/app/wire_gen.go
index 7d55b48a..5aa645bf 100644
--- a/tests/gcp/app/wire_gen.go
+++ b/tests/gcp/app/wire_gen.go
@@ -8,10 +8,10 @@ package main
 import (
 	"context"
 	"contrib.go.opencensus.io/exporter/stackdriver/monitoredresource"
-	"github.com/google/go-cloud/gcp"
-	"github.com/google/go-cloud/health"
-	"github.com/google/go-cloud/server"
-	"github.com/google/go-cloud/server/sdserver"
+	"gocloud.dev/gcp"
+	"gocloud.dev/health"
+	"gocloud.dev/server"
+	"gocloud.dev/server/sdserver"
 	"go.opencensus.io/trace"
 )
 
diff --git a/tests/internal/testutil/testutil.go b/tests/internal/testutil/testutil.go
index 7349b186..c33e558d 100644
--- a/tests/internal/testutil/testutil.go
+++ b/tests/internal/testutil/testutil.go
@@ -14,7 +14,7 @@
 
 // Package testutil contains utility functions used by server tests against
 // different platforms.
-package testutil
+package testutil // import "gocloud.dev/tests/internal/testutil"
 
 import (
 	"crypto/rand"