Skip to content
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

Feat: use go modules #959

Closed
wants to merge 3 commits into from
Closed

Feat: use go modules #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a888ba
feat: use go module
Loyalsoldier Feb 11, 2021
1b1376e
feat: change bazel importpath
Loyalsoldier Feb 11, 2021
1257d58
feat: change go import path
Loyalsoldier Feb 11, 2021
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 BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test_suite(

gazelle(
name = "gazelle",
prefix = "github.com/bazelbuild/buildtools",
prefix = "github.com/bazelbuild/buildtools/v4",
)

buildifier(
Expand Down
4 changes: 2 additions & 2 deletions api_proto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ proto_library(

go_proto_library(
name = "api_proto_go_proto",
importpath = "github.com/bazelbuild/buildtools/api_proto",
importpath = "github.com/bazelbuild/buildtools/v4/api_proto",
proto = ":api_proto_proto",
visibility = ["//visibility:public"],
)

go_library(
name = "go_default_library",
embed = [":api_proto_go_proto"],
importpath = "github.com/bazelbuild/buildtools/api_proto",
importpath = "github.com/bazelbuild/buildtools/v4/api_proto",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion build/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ go_library(
"utils.go",
"walk.go",
],
importpath = "github.com/bazelbuild/buildtools/build",
importpath = "github.com/bazelbuild/buildtools/v4/build",
visibility = ["//visibility:public"],
deps = ["//tables:go_default_library"],
)
Expand Down
2 changes: 1 addition & 1 deletion build/checkfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"path"
"testing"

"github.com/bazelbuild/buildtools/testutils"
"github.com/bazelbuild/buildtools/v4/testutils"
)

func TestFilesMatch(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion build/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"testing"

"github.com/bazelbuild/buildtools/testutils"
"github.com/bazelbuild/buildtools/v4/testutils"
)

func TestParse(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions build/print_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"strings"
"testing"

"github.com/bazelbuild/buildtools/tables"
"github.com/bazelbuild/buildtools/testutils"
"github.com/bazelbuild/buildtools/v4/tables"
"github.com/bazelbuild/buildtools/v4/testutils"
)

// exists reports whether the named file exists.
Expand Down
2 changes: 1 addition & 1 deletion build/rewrite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"sort"
"strings"

"github.com/bazelbuild/buildtools/tables"
"github.com/bazelbuild/buildtools/v4/tables"
)

// For debugging: flag to disable certain rewrites.
Expand Down
2 changes: 1 addition & 1 deletion build_proto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ proto_library(

go_proto_library(
name = "go_default_library",
importpath = "github.com/bazelbuild/buildtools/build_proto",
importpath = "github.com/bazelbuild/buildtools/v4/build_proto",
proto = ":blaze_query_proto",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion buildifier/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ sh_test(
go_library(
name = "go_default_library",
srcs = ["buildifier.go"],
importpath = "github.com/bazelbuild/buildtools/buildifier",
importpath = "github.com/bazelbuild/buildtools/v4/buildifier",
visibility = ["//visibility:private"],
x_defs = {
"main.buildVersion": "{STABLE_buildVersion}",
Expand Down
12 changes: 6 additions & 6 deletions buildifier/buildifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
"runtime"
"strings"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/buildifier/utils"
"github.com/bazelbuild/buildtools/differ"
"github.com/bazelbuild/buildtools/tables"
"github.com/bazelbuild/buildtools/warn"
"github.com/bazelbuild/buildtools/wspace"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/buildifier/utils"
"github.com/bazelbuild/buildtools/v4/differ"
"github.com/bazelbuild/buildtools/v4/tables"
"github.com/bazelbuild/buildtools/v4/warn"
"github.com/bazelbuild/buildtools/v4/wspace"
)

var buildVersion = "redacted"
Expand Down
2 changes: 1 addition & 1 deletion buildifier/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ go_library(
"tempfile.go",
"utils.go",
],
importpath = "github.com/bazelbuild/buildtools/buildifier/utils",
importpath = "github.com/bazelbuild/buildtools/v4/buildifier/utils",
visibility = ["//buildifier:__pkg__"],
deps = [
"//build:go_default_library",
Expand Down
5 changes: 3 additions & 2 deletions buildifier/utils/diagnostics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package utils
import (
"encoding/json"
"fmt"
"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/warn"
"strings"

"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/warn"
)

// Diagnostics contains diagnostic information returned by formatter and linter
Expand Down
4 changes: 2 additions & 2 deletions buildifier/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"path/filepath"
"strings"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/warn"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/warn"
)

func isStarlarkFile(name string) bool {
Expand Down
2 changes: 1 addition & 1 deletion buildifier2/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "go_default_library",
srcs = ["buildifier2.go"],
importpath = "github.com/bazelbuild/buildtools/buildifier2",
importpath = "github.com/bazelbuild/buildtools/v4/buildifier2",
visibility = ["//visibility:private"],
deps = [
"//build:go_default_library",
Expand Down
4 changes: 2 additions & 2 deletions buildifier2/buildifier2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"fmt"
"log"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/convertast"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/convertast"
"go.starlark.net/syntax"
)

Expand Down
2 changes: 1 addition & 1 deletion buildozer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "go_default_library",
srcs = ["main.go"],
importpath = "github.com/bazelbuild/buildtools/buildozer",
importpath = "github.com/bazelbuild/buildtools/v4/buildozer",
visibility = ["//visibility:private"],
x_defs = {
"main.buildVersion": "{STABLE_buildVersion}",
Expand Down
6 changes: 3 additions & 3 deletions buildozer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"os"
"strings"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/edit"
"github.com/bazelbuild/buildtools/tables"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/edit"
"github.com/bazelbuild/buildtools/v4/tables"
)

type flagArray []string
Expand Down
2 changes: 1 addition & 1 deletion bzlenv/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = ["bzlenv.go"],
importpath = "github.com/bazelbuild/buildtools/bzlenv",
importpath = "github.com/bazelbuild/buildtools/v4/bzlenv",
visibility = ["//visibility:public"],
deps = ["//build:go_default_library"],
)
Expand Down
2 changes: 1 addition & 1 deletion bzlenv/bzlenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
package bzlenv

import (
"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/v4/build"
)

// ValueKind describes how a binding was declared.
Expand Down
2 changes: 1 addition & 1 deletion bzlenv/bzlenv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"
"testing"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/v4/build"
)

func TestWalkEnvironment(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["config.go"],
importpath = "github.com/bazelbuild/buildtools/config",
importpath = "github.com/bazelbuild/buildtools/v4/config",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion convertast/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["convert_ast.go"],
importpath = "github.com/bazelbuild/buildtools/convertast",
importpath = "github.com/bazelbuild/buildtools/v4/convertast",
visibility = ["//visibility:public"],
deps = [
"//build:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion convertast/convert_ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strconv"
"strings"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/v4/build"
"go.starlark.net/syntax"
)

Expand Down
2 changes: 1 addition & 1 deletion deps_proto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ proto_library(

go_proto_library(
name = "go_default_library",
importpath = "github.com/bazelbuild/buildtools/deps_proto",
importpath = "github.com/bazelbuild/buildtools/v4/deps_proto",
proto = ":blaze_deps_proto",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion differ/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ go_library(
"isatty_other.go",
"isatty_windows.go",
],
importpath = "github.com/bazelbuild/buildtools/differ",
importpath = "github.com/bazelbuild/buildtools/v4/differ",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion edit/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ go_library(
"fix.go",
"types.go",
],
importpath = "github.com/bazelbuild/buildtools/edit",
importpath = "github.com/bazelbuild/buildtools/v4/edit",
visibility = ["//visibility:public"],
deps = [
"//api_proto:go_default_library",
Expand Down
10 changes: 5 additions & 5 deletions edit/buildozer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import (
"strconv"
"strings"

apipb "github.com/bazelbuild/buildtools/api_proto"
"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/file"
"github.com/bazelbuild/buildtools/labels"
"github.com/bazelbuild/buildtools/wspace"
apipb "github.com/bazelbuild/buildtools/v4/api_proto"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/file"
"github.com/bazelbuild/buildtools/v4/labels"
"github.com/bazelbuild/buildtools/v4/wspace"
"github.com/golang/protobuf/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion edit/buildozer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"testing"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/v4/build"
)

var removeCommentTests = []struct {
Expand Down
6 changes: 3 additions & 3 deletions edit/edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"strconv"
"strings"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/labels"
"github.com/bazelbuild/buildtools/wspace"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/labels"
"github.com/bazelbuild/buildtools/v4/wspace"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion edit/edit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"testing"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/v4/build"
)

var parseLabelTests = []struct {
Expand Down
4 changes: 2 additions & 2 deletions edit/fix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"sort"
"strings"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/labels"
"github.com/bazelbuild/buildtools/v4/build"
"github.com/bazelbuild/buildtools/v4/labels"
)

// splitOptionsWithSpaces is a cleanup function.
Expand Down
2 changes: 1 addition & 1 deletion edit/fix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"testing"

"github.com/bazelbuild/buildtools/build"
"github.com/bazelbuild/buildtools/v4/build"
)

func TestMovePackageDeclarationToTheTop(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions edit/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ limitations under the License.
package edit

import (
buildpb "github.com/bazelbuild/buildtools/build_proto"
"github.com/bazelbuild/buildtools/lang"
"github.com/bazelbuild/buildtools/tables"
buildpb "github.com/bazelbuild/buildtools/v4/build_proto"
"github.com/bazelbuild/buildtools/v4/lang"
"github.com/bazelbuild/buildtools/v4/tables"
)

var typeOf = lang.TypeOf
Expand Down
2 changes: 1 addition & 1 deletion extra_actions_base_proto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ proto_library(

go_proto_library(
name = "go_default_library",
importpath = "github.com/bazelbuild/buildtools/extra_actions_base_proto",
importpath = "github.com/bazelbuild/buildtools/v4/extra_actions_base_proto",
proto = ":blaze_proto",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion file/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["file.go"],
importpath = "github.com/bazelbuild/buildtools/file",
importpath = "github.com/bazelbuild/buildtools/v4/file",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion generatetables/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "go_default_library",
srcs = ["generate_tables.go"],
importpath = "github.com/bazelbuild/buildtools/generatetables",
importpath = "github.com/bazelbuild/buildtools/v4/generatetables",
visibility = ["//visibility:private"],
deps = [
"//build_proto:go_default_library",
Expand Down
4 changes: 2 additions & 2 deletions generatetables/generate_tables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"os"
"sort"

buildpb "github.com/bazelbuild/buildtools/build_proto"
buildpb "github.com/bazelbuild/buildtools/v4/build_proto"
"github.com/golang/protobuf/proto"
)

Expand Down Expand Up @@ -110,7 +110,7 @@ func main() {
fmt.Fprintf(f, `// Generated file, do not edit.
package lang

import buildpb "github.com/bazelbuild/buildtools/build_proto"
import buildpb "github.com/bazelbuild/buildtools/v4/build_proto"

var TypeOf = map[string]buildpb.Attribute_Discriminator{
`)
Expand Down
9 changes: 9 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module github.com/bazelbuild/buildtools/v4

go 1.15

require (
github.com/golang/protobuf v1.4.3
go.starlark.net v0.0.0-20210208172022-0a10e4fe7402
google.golang.org/protobuf v1.25.0
)
Loading