From 9470e0ba584bef92e66af1fabae0f07e8a65becd Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Mon, 10 Nov 2014 08:55:57 +1100 Subject: [PATCH] go.mobile: use golang.org/x/... import paths LGTM=bradfitz, rsc R=rsc, bradfitz CC=golang-codereviews https://golang.org/cl/162710043 --- app/android.go | 2 +- app/app.go | 2 +- app/darwin.go | 6 +++--- app/debug/fps.go | 4 ++-- app/doc.go | 2 +- app/loop_android.go | 6 +++--- app/x11.go | 4 ++-- bind/bind.go | 2 +- bind/bind_test.go | 4 ++-- bind/gengo.go | 4 ++-- bind/genjava.go | 2 +- bind/java/javatest.go | 4 ++-- bind/java/seq_android.go | 4 ++-- bind/java/testpkg/go_testpkg/go_testpkg.go | 4 ++-- bind/seq.go | 2 +- cmd/gobind/gen.go | 4 ++-- event/touch.go | 2 +- example/basic/main.go | 14 +++++++------- example/libhello/hi/go_hi/go_hi.go | 4 ++-- example/libhello/main.go | 6 +++--- example/libhellojni/main.go | 2 +- gl/glutil/glimage.go | 6 +++--- gl/glutil/glimage_test.go | 4 ++-- gl/glutil/glutil.go | 2 +- gl/types_common.go | 2 +- sprite/portable/affine.go | 2 +- sprite/portable/affine_test.go | 4 ++-- sprite/portable/portable.go | 8 ++++---- sprite/sprite.go | 4 ++-- 29 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/android.go b/app/android.go index b84607a..3aa3861 100644 --- a/app/android.go +++ b/app/android.go @@ -36,7 +36,7 @@ import ( "runtime" "unsafe" - "code.google.com/p/go.mobile/geom" + "golang.org/x/mobile/geom" ) //export onCreate diff --git a/app/app.go b/app/app.go index b5d0284..db9cc24 100644 --- a/app/app.go +++ b/app/app.go @@ -4,7 +4,7 @@ package app -import "code.google.com/p/go.mobile/event" +import "golang.org/x/mobile/event" // Run starts the app. // diff --git a/app/darwin.go b/app/darwin.go index ac5a2a4..2d15a65 100644 --- a/app/darwin.go +++ b/app/darwin.go @@ -33,9 +33,9 @@ import ( "runtime" "sync" - "code.google.com/p/go.mobile/event" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/gl" + "golang.org/x/mobile/event" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/gl" ) var initThreadID uint64 diff --git a/app/debug/fps.go b/app/debug/fps.go index 8beeb59..1d6a2b3 100644 --- a/app/debug/fps.go +++ b/app/debug/fps.go @@ -17,8 +17,8 @@ import ( "time" "code.google.com/p/freetype-go/freetype" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/gl/glutil" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/gl/glutil" ) var lastDraw = time.Now() diff --git a/app/doc.go b/app/doc.go index 1e828a5..d89ddfb 100644 --- a/app/doc.go +++ b/app/doc.go @@ -57,7 +57,7 @@ function exits, the app exits. import ( "log" - "code.google.com/p/go.mobile/app" + "golang.org/x/mobile/app" ) func main() { diff --git a/app/loop_android.go b/app/loop_android.go index 73a4015..8b5f98a 100644 --- a/app/loop_android.go +++ b/app/loop_android.go @@ -81,9 +81,9 @@ import "C" import ( "log" - "code.google.com/p/go.mobile/event" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/gl" + "golang.org/x/mobile/event" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/gl" ) func windowDrawLoop(cb Callbacks, w *C.ANativeWindow, queue *C.AInputQueue) { diff --git a/app/x11.go b/app/x11.go index 8f8ce78..1934320 100644 --- a/app/x11.go +++ b/app/x11.go @@ -25,8 +25,8 @@ import ( "runtime" "sync" - "code.google.com/p/go.mobile/event" - "code.google.com/p/go.mobile/geom" + "golang.org/x/mobile/event" + "golang.org/x/mobile/geom" ) var cb Callbacks diff --git a/bind/bind.go b/bind/bind.go index 95ede4e..5ee2da0 100644 --- a/bind/bind.go +++ b/bind/bind.go @@ -16,7 +16,7 @@ import ( "go/token" "io" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // GenJava generates a Java API from a Go package. diff --git a/bind/bind_test.go b/bind/bind_test.go index 5d64757..4e687ee 100644 --- a/bind/bind_test.go +++ b/bind/bind_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + "golang.org/x/tools/go/types" ) var updateFlag = flag.Bool("update", false, "Update the golden files.") diff --git a/bind/gengo.go b/bind/gengo.go index 05b2de6..1b8ac3c 100644 --- a/bind/gengo.go +++ b/bind/gengo.go @@ -9,7 +9,7 @@ import ( "go/token" "log" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) type goGen struct { @@ -29,7 +29,7 @@ const goPreamble = `// Package go_%s is an autogenerated binder stub for package package go_%s import ( - "code.google.com/p/go.mobile/bind/seq" + "golang.org/x/mobile/bind/seq" %q ) diff --git a/bind/genjava.go b/bind/genjava.go index f1f232c..23238e9 100644 --- a/bind/genjava.go +++ b/bind/genjava.go @@ -13,7 +13,7 @@ import ( "unicode" "unicode/utf8" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // TODO(crawshaw): disallow basic android java type names in exported symbols. diff --git a/bind/java/javatest.go b/bind/java/javatest.go index ff65e5e..413bfa8 100644 --- a/bind/java/javatest.go +++ b/bind/java/javatest.go @@ -7,9 +7,9 @@ package main import ( - "code.google.com/p/go.mobile/app" + "golang.org/x/mobile/app" - _ "code.google.com/p/go.mobile/bind/java/testpkg/go_testpkg" + _ "golang.org/x/mobile/bind/java/testpkg/go_testpkg" ) func main() { diff --git a/bind/java/seq_android.go b/bind/java/seq_android.go index fca1073..345bbf9 100644 --- a/bind/java/seq_android.go +++ b/bind/java/seq_android.go @@ -15,8 +15,8 @@ import ( "sync" "unsafe" - "code.google.com/p/go.mobile/app" - "code.google.com/p/go.mobile/bind/seq" + "golang.org/x/mobile/app" + "golang.org/x/mobile/bind/seq" ) const maxSliceLen = 1<<31 - 1 diff --git a/bind/java/testpkg/go_testpkg/go_testpkg.go b/bind/java/testpkg/go_testpkg/go_testpkg.go index c470b42..03f7e1d 100644 --- a/bind/java/testpkg/go_testpkg/go_testpkg.go +++ b/bind/java/testpkg/go_testpkg/go_testpkg.go @@ -5,8 +5,8 @@ package go_testpkg import ( - "code.google.com/p/go.mobile/bind/java/testpkg" - "code.google.com/p/go.mobile/bind/seq" + "golang.org/x/mobile/bind/java/testpkg" + "golang.org/x/mobile/bind/seq" ) func proxy_Add(out, in *seq.Buffer) { diff --git a/bind/seq.go b/bind/seq.go index 9de5066..9324d51 100644 --- a/bind/seq.go +++ b/bind/seq.go @@ -3,7 +3,7 @@ package bind import ( "fmt" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // seqType returns a string that can be used for reading and writing a diff --git a/cmd/gobind/gen.go b/cmd/gobind/gen.go index 52de660..a0bfda1 100644 --- a/cmd/gobind/gen.go +++ b/cmd/gobind/gen.go @@ -14,8 +14,8 @@ import ( "go/scanner" "go/token" - "code.google.com/p/go.mobile/bind" - "code.google.com/p/go.tools/go/loader" + "golang.org/x/mobile/bind" + "golang.org/x/tools/go/loader" ) func genPkg(pkg *build.Package) { diff --git a/event/touch.go b/event/touch.go index 8a2c7f3..8ad7156 100644 --- a/event/touch.go +++ b/event/touch.go @@ -15,7 +15,7 @@ https://developer.apple.com/library/ios/documentation/EventHandling/Conceptual/E import ( "fmt" - "code.google.com/p/go.mobile/geom" + "golang.org/x/mobile/geom" ) // Touch is a user touch event. diff --git a/example/basic/main.go b/example/basic/main.go index c03f508..3d3420e 100644 --- a/example/basic/main.go +++ b/example/basic/main.go @@ -9,13 +9,13 @@ import ( "encoding/binary" "log" - "code.google.com/p/go.mobile/app" - "code.google.com/p/go.mobile/app/debug" - "code.google.com/p/go.mobile/event" - "code.google.com/p/go.mobile/f32" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/gl" - "code.google.com/p/go.mobile/gl/glutil" + "golang.org/x/mobile/app" + "golang.org/x/mobile/app/debug" + "golang.org/x/mobile/event" + "golang.org/x/mobile/f32" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/gl" + "golang.org/x/mobile/gl/glutil" ) var ( diff --git a/example/libhello/hi/go_hi/go_hi.go b/example/libhello/hi/go_hi/go_hi.go index 5578c79..295f96a 100644 --- a/example/libhello/hi/go_hi/go_hi.go +++ b/example/libhello/hi/go_hi/go_hi.go @@ -4,8 +4,8 @@ package go_hi import ( - "code.google.com/p/go.mobile/bind/seq" - "code.google.com/p/go.mobile/example/libhello/hi" + "golang.org/x/mobile/bind/seq" + "golang.org/x/mobile/example/libhello/hi" ) func proxy_Hello(out, in *seq.Buffer) { diff --git a/example/libhello/main.go b/example/libhello/main.go index be13851..397e490 100644 --- a/example/libhello/main.go +++ b/example/libhello/main.go @@ -9,10 +9,10 @@ package main import ( - "code.google.com/p/go.mobile/app" + "golang.org/x/mobile/app" - _ "code.google.com/p/go.mobile/bind/java" - _ "code.google.com/p/go.mobile/example/libhello/hi/go_hi" + _ "golang.org/x/mobile/bind/java" + _ "golang.org/x/mobile/example/libhello/hi/go_hi" ) func main() { diff --git a/example/libhellojni/main.go b/example/libhellojni/main.go index c25c8b3..fd6a218 100644 --- a/example/libhellojni/main.go +++ b/example/libhellojni/main.go @@ -23,7 +23,7 @@ The result will be no make.bash, and no need to write C. */ package main -import "code.google.com/p/go.mobile/app" +import "golang.org/x/mobile/app" func main() { app.Run() diff --git a/gl/glutil/glimage.go b/gl/glutil/glimage.go index e0ced74..138ffa2 100644 --- a/gl/glutil/glimage.go +++ b/gl/glutil/glimage.go @@ -9,9 +9,9 @@ import ( "image" "sync" - "code.google.com/p/go.mobile/f32" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/gl" + "golang.org/x/mobile/f32" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/gl" ) var glimage struct { diff --git a/gl/glutil/glimage_test.go b/gl/glutil/glimage_test.go index 10f9f69..fbfd4a0 100644 --- a/gl/glutil/glimage_test.go +++ b/gl/glutil/glimage_test.go @@ -17,8 +17,8 @@ import ( "os" "testing" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/gl" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/gl" ) func TestImage(t *testing.T) { diff --git a/gl/glutil/glutil.go b/gl/glutil/glutil.go index 98bff38..382c85c 100644 --- a/gl/glutil/glutil.go +++ b/gl/glutil/glutil.go @@ -8,7 +8,7 @@ package glutil import ( "fmt" - "code.google.com/p/go.mobile/gl" + "golang.org/x/mobile/gl" ) // CreateProgram creates, compiles, and links a gl.Program. diff --git a/gl/types_common.go b/gl/types_common.go index aa0a003..d02acdd 100644 --- a/gl/types_common.go +++ b/gl/types_common.go @@ -7,7 +7,7 @@ package gl // This file contains GL Types and their methods that are independent of the // "gldebug" build tag. -import "code.google.com/p/go.mobile/f32" +import "golang.org/x/mobile/f32" // WriteAffine writes the contents of an Affine to a 3x3 matrix GL uniform. func (u Uniform) WriteAffine(a *f32.Affine) { diff --git a/sprite/portable/affine.go b/sprite/portable/affine.go index 65c03af..724dae7 100644 --- a/sprite/portable/affine.go +++ b/sprite/portable/affine.go @@ -8,7 +8,7 @@ import ( "image" "image/draw" - "code.google.com/p/go.mobile/f32" + "golang.org/x/mobile/f32" ) // affine draws each pixel of dst using bilinear interpolation of the diff --git a/sprite/portable/affine_test.go b/sprite/portable/affine_test.go index 4e4c788..58b1179 100644 --- a/sprite/portable/affine_test.go +++ b/sprite/portable/affine_test.go @@ -14,8 +14,8 @@ import ( "os" "testing" - "code.google.com/p/go.mobile/f32" - "code.google.com/p/go.mobile/geom" + "golang.org/x/mobile/f32" + "golang.org/x/mobile/geom" ) func TestAffine(t *testing.T) { diff --git a/sprite/portable/portable.go b/sprite/portable/portable.go index 298f34e..6481d59 100644 --- a/sprite/portable/portable.go +++ b/sprite/portable/portable.go @@ -14,10 +14,10 @@ import ( "image" "image/draw" - "code.google.com/p/go.mobile/f32" - "code.google.com/p/go.mobile/geom" - "code.google.com/p/go.mobile/sprite" - "code.google.com/p/go.mobile/sprite/clock" + "golang.org/x/mobile/f32" + "golang.org/x/mobile/geom" + "golang.org/x/mobile/sprite" + "golang.org/x/mobile/sprite/clock" ) // Engine builds a sprite Engine that renders onto dst. diff --git a/sprite/sprite.go b/sprite/sprite.go index a00cce1..5b7c31c 100644 --- a/sprite/sprite.go +++ b/sprite/sprite.go @@ -27,8 +27,8 @@ package sprite import ( "image" - "code.google.com/p/go.mobile/f32" - "code.google.com/p/go.mobile/sprite/clock" + "golang.org/x/mobile/f32" + "golang.org/x/mobile/sprite/clock" ) type Arranger interface {