From 4eb7d7d8dd7c8ebb9ac9b041327a15c4ad46bf0d Mon Sep 17 00:00:00 2001 From: Red Daly Date: Sun, 18 Jul 2021 15:20:32 -0700 Subject: [PATCH] Change import style used by gazelle, which fixes tests. See https://github.com/bazelbuild/bazel-gazelle/issues/5#issuecomment-636056748 --- BUILD.bazel | 1 + bazel/defs.bzl | 8 +++---- cmd/xtoproto/BUILD.bazel | 10 ++++---- cmd/xtoproto_web/BUILD.bazel | 6 ++--- csvcoder/BUILD.bazel | 12 +++++----- csvinfer/BUILD.bazel | 15 ++++++------ csvtoproto/BUILD.bazel | 9 ++++---- csvtoprotoparse/BUILD.bazel | 6 ++--- examples/example01/BUILD.bazel | 2 +- examples/example01/converter/BUILD.bazel | 21 +++++++++++++---- examples/example02/BUILD.bazel | 2 +- examples/example02/converter02/BUILD.bazel | 26 ++++++++++++++++----- internal/protoreflectcmp/BUILD.bazel | 24 +++++++++---------- internal/protoutil/BUILD.bazel | 2 +- playground/BUILD.bazel | 12 +++++----- proto/recordtoproto/BUILD.bazel | 2 +- proto/service/BUILD.bazel | 4 ++-- proto/wirepath/BUILD.bazel | 2 +- proto/wirepath/testproto/BUILD.bazel | 13 +++-------- protocp/BUILD.bazel | 4 ++-- rdf/iri/BUILD.bazel | 6 ++--- rdf/ntriples/BUILD.bazel | 10 ++++---- rdf/rdfxml/BUILD.bazel | 16 ++++++------- rdf/rdfxml/generate_test_cases/BUILD.bazel | 4 ++-- rdf/rdfxml/rdftestcases/BUILD.bazel | 2 +- recordinfer/BUILD.bazel | 14 ++++++----- releasing/generate_pb_go_files/BUILD.bazel | 8 +++---- releasing/make_release/BUILD.bazel | 8 +++---- service/BUILD.bazel | 27 +++++++++++----------- sexpr/BUILD.bazel | 14 +++++------ sexpr/form/BUILD.bazel | 4 ++-- textcoder/BUILD.bazel | 8 +++---- textpos/BUILD.bazel | 6 ++--- wirepath/BUILD.bazel | 26 ++++++++++----------- xmlinfer/BUILD.bazel | 8 +++---- 35 files changed, 183 insertions(+), 159 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 88a67a1..0ad9e2d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -2,4 +2,5 @@ load("@bazel_gazelle//:def.bzl", "gazelle") # gazelle:prefix github.com/google/xtoproto # gazelle:proto_import_prefix github.com/google/xtoproto +# gazelle:go_naming_convention import gazelle(name = "gazelle") diff --git a/bazel/defs.bzl b/bazel/defs.bzl index 9a866d9..e083ed6 100644 --- a/bazel/defs.bzl +++ b/bazel/defs.bzl @@ -78,10 +78,10 @@ def go_xtoproto_converter_library(name, request, importpath, deps=None, visibili deps = [] final_deps = deps + [ - "@xtoproto//csvtoprotoparse:go_default_library", - "@xtoproto//protocp:go_default_library", - "@xtoproto//csvcoder:go_default_library", - "@xtoproto//textcoder:go_default_library", + "@xtoproto//csvtoprotoparse", + "@xtoproto//protocp", + "@xtoproto//csvcoder", + "@xtoproto//textcoder", "@org_golang_google_protobuf//proto:go_default_library", ] go_library( diff --git a/cmd/xtoproto/BUILD.bazel b/cmd/xtoproto/BUILD.bazel index 4454dd5..bef50b0 100644 --- a/cmd/xtoproto/BUILD.bazel +++ b/cmd/xtoproto/BUILD.bazel @@ -1,19 +1,19 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( - name = "go_default_library", + name = "xtoproto_lib", srcs = ["xtoproto.go"], importpath = "github.com/google/xtoproto/cmd/xtoproto", visibility = ["//visibility:private"], deps = [ - "//proto/service:go_default_library", - "//service:go_default_library", - "@org_golang_google_protobuf//encoding/prototext:go_default_library", + "//proto/service", + "//service", + "@org_golang_google_protobuf//encoding/prototext", ], ) go_binary( name = "xtoproto", - embed = [":go_default_library"], + embed = [":xtoproto_lib"], visibility = ["//visibility:public"], ) diff --git a/cmd/xtoproto_web/BUILD.bazel b/cmd/xtoproto_web/BUILD.bazel index ffefdd9..710eb6e 100644 --- a/cmd/xtoproto_web/BUILD.bazel +++ b/cmd/xtoproto_web/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( - name = "go_default_library", + name = "xtoproto_web_lib", srcs = ["xtoproto_web.go"], data = [ "//playground:playground_files", @@ -9,13 +9,13 @@ go_library( importpath = "github.com/google/xtoproto/cmd/xtoproto_web", visibility = ["//visibility:private"], deps = [ - "@com_github_golang_glog//:go_default_library", + "@com_github_golang_glog//:glog", "@io_bazel_rules_go//go/tools/bazel:go_default_library", ], ) go_binary( name = "xtoproto_web", - embed = [":go_default_library"], + embed = [":xtoproto_web_lib"], visibility = ["//visibility:public"], ) diff --git a/csvcoder/BUILD.bazel b/csvcoder/BUILD.bazel index 7903352..780450c 100644 --- a/csvcoder/BUILD.bazel +++ b/csvcoder/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "csvcoder", srcs = [ "csvcoder_cell.go", "csvcoder_file.go", @@ -10,18 +10,18 @@ go_library( ], importpath = "github.com/google/xtoproto/csvcoder", visibility = ["//visibility:public"], - deps = ["//textcoder:go_default_library"], + deps = ["//textcoder"], ) go_test( - name = "go_default_test", + name = "csvcoder_test", srcs = [ "csvcoder_examples_test.go", "csvcoder_test.go", ], - embed = [":go_default_library"], + embed = [":csvcoder"], deps = [ - "//textcoder:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", + "//textcoder", + "@com_github_google_go_cmp//cmp", ], ) diff --git a/csvinfer/BUILD.bazel b/csvinfer/BUILD.bazel index 2494c7b..0157a8b 100644 --- a/csvinfer/BUILD.bazel +++ b/csvinfer/BUILD.bazel @@ -1,20 +1,21 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "csvinfer", srcs = ["csvinfer.go"], importpath = "github.com/google/xtoproto/csvinfer", visibility = ["//visibility:public"], - deps = ["//recordinfer:go_default_library"], + deps = ["//recordinfer"], ) go_test( - name = "go_default_test", + name = "csvinfer_test", srcs = ["csvinfer_test.go"], - embed = [":go_default_library"], + embed = [":csvinfer"], deps = [ - "//recordinfer:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@org_golang_google_protobuf//testing/protocmp:go_default_library", + "//proto/recordtoproto", + "//recordinfer", + "@com_github_google_go_cmp//cmp", + "@org_golang_google_protobuf//testing/protocmp", ], ) diff --git a/csvtoproto/BUILD.bazel b/csvtoproto/BUILD.bazel index d3a0add..f65b1a4 100644 --- a/csvtoproto/BUILD.bazel +++ b/csvtoproto/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "csvtoproto", srcs = [ "csvtoproto.go", "csvtoproto_go_codegen.go", @@ -9,8 +9,9 @@ go_library( importpath = "github.com/google/xtoproto/csvtoproto", visibility = ["//visibility:public"], deps = [ - "@com_github_golang_glog//:go_default_library", - "@com_github_mitchellh_go_wordwrap//:go_default_library", - "@com_github_stoewer_go_strcase//:go_default_library", + "//proto/recordtoproto", + "@com_github_golang_glog//:glog", + "@com_github_mitchellh_go_wordwrap//:go-wordwrap", + "@com_github_stoewer_go_strcase//:go-strcase", ], ) diff --git a/csvtoprotoparse/BUILD.bazel b/csvtoprotoparse/BUILD.bazel index 18db2fe..ea771b0 100644 --- a/csvtoprotoparse/BUILD.bazel +++ b/csvtoprotoparse/BUILD.bazel @@ -1,13 +1,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "csvtoprotoparse", srcs = ["csvtoprotoparse.go"], importpath = "github.com/google/xtoproto/csvtoprotoparse", visibility = ["//visibility:public"], deps = [ "@com_github_golang_protobuf//ptypes:go_default_library_gen", - "@org_golang_google_protobuf//types/known/durationpb:go_default_library", - "@org_golang_google_protobuf//types/known/timestamppb:go_default_library", + "@org_golang_google_protobuf//types/known/durationpb", + "@org_golang_google_protobuf//types/known/timestamppb", ], ) diff --git a/examples/example01/BUILD.bazel b/examples/example01/BUILD.bazel index 8d08a06..0e42838 100644 --- a/examples/example01/BUILD.bazel +++ b/examples/example01/BUILD.bazel @@ -4,7 +4,7 @@ load("@xtoproto//bazel:defs.bzl", "go_xtoproto_converter_library") load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "example01", embed = [":mypackage_go_proto"], importpath = "github.com/google/xtoproto/examples/example01", visibility = ["//visibility:public"], diff --git a/examples/example01/converter/BUILD.bazel b/examples/example01/converter/BUILD.bazel index 3498b5f..cf42f81 100644 --- a/examples/example01/converter/BUILD.bazel +++ b/examples/example01/converter/BUILD.bazel @@ -1,13 +1,13 @@ load("@xtoproto//bazel:defs.bzl", "go_xtoproto_converter_library") load("@io_bazel_rules_go//go:def.bzl", "go_test") -# gazelle:resolve go github.com/google/xtoproto/examples/example01/converter :go_default_library +# gazelle:resolve go github.com/google/xtoproto/examples/example01/converter :converter go_xtoproto_converter_library( - name = "go_default_library", + name = "converter", importpath = "github.com/google/xtoproto/examples/example01/converter", request = "codegen_request.pbtxt", deps = [ - "//examples/example01:go_default_library", + "//examples/example01", ], ) @@ -15,9 +15,20 @@ go_test( name = "go_default_test", srcs = ["converter_test.go"], deps = [ - "//examples/example01:go_default_library", - "//examples/example01/converter:go_default_library", + "//examples/example01", + "//examples/example01/converter", "@com_github_google_go_cmp//cmp:go_default_library", "@org_golang_google_protobuf//testing/protocmp:go_default_library", ], ) + +go_test( + name = "converter_test", + srcs = ["converter_test.go"], + deps = [ + "//examples/example01", + "//examples/example01/converter", + "@com_github_google_go_cmp//cmp", + "@org_golang_google_protobuf//testing/protocmp", + ], +) diff --git a/examples/example02/BUILD.bazel b/examples/example02/BUILD.bazel index be9ece9..3b54224 100644 --- a/examples/example02/BUILD.bazel +++ b/examples/example02/BUILD.bazel @@ -18,7 +18,7 @@ go_proto_library( ) go_library( - name = "go_default_library", + name = "example02", embed = [":mycompany_mypackage_go_proto"], importpath = "github.com/google/xtoproto/examples/example02", visibility = ["//visibility:public"], diff --git a/examples/example02/converter02/BUILD.bazel b/examples/example02/converter02/BUILD.bazel index 6478a96..9ad60aa 100644 --- a/examples/example02/converter02/BUILD.bazel +++ b/examples/example02/converter02/BUILD.bazel @@ -1,13 +1,13 @@ load("@xtoproto//bazel:defs.bzl", "go_xtoproto_converter_library") load("@io_bazel_rules_go//go:def.bzl", "go_test") -# gazelle:resolve go github.com/google/xtoproto/examples/example02/converter02 :go_default_library +# gazelle:resolve go github.com/google/xtoproto/examples/example02/converter02 :converter02 go_xtoproto_converter_library( - name = "go_default_library", + name = "converter02", importpath = "github.com/google/xtoproto/examples/example02/converter02", request = "codegen_request.pbtxt", deps = [ - "//examples/example02:go_default_library", + "//examples/example02", ], ) @@ -15,12 +15,26 @@ go_test( name = "go_default_test", srcs = ["converter02_test.go"], deps = [ - "//csvtoprotoparse:go_default_library", - "//examples/example02:go_default_library", - "//examples/example02/converter02:go_default_library", + "//csvtoprotoparse", + "//examples/example02", + "//examples/example02/converter02", "@com_github_golang_protobuf//ptypes:go_default_library_gen", "@com_github_google_go_cmp//cmp:go_default_library", "@org_golang_google_protobuf//testing/protocmp:go_default_library", "@org_golang_google_protobuf//types/known/timestamppb:go_default_library", ], ) + +go_test( + name = "converter02_test", + srcs = ["converter02_test.go"], + deps = [ + "//csvtoprotoparse", + "//examples/example02", + "//examples/example02/converter02", + "@com_github_golang_protobuf//ptypes:go_default_library_gen", + "@com_github_google_go_cmp//cmp", + "@org_golang_google_protobuf//testing/protocmp", + "@org_golang_google_protobuf//types/known/timestamppb", + ], +) diff --git a/internal/protoreflectcmp/BUILD.bazel b/internal/protoreflectcmp/BUILD.bazel index aa522be..6e057e0 100644 --- a/internal/protoreflectcmp/BUILD.bazel +++ b/internal/protoreflectcmp/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "protoreflectcmp", srcs = [ "protoreflectcmp.go", "protoreflectcmp_list_impl.go", @@ -9,22 +9,22 @@ go_library( importpath = "github.com/google/xtoproto/internal/protoreflectcmp", visibility = ["//:__subpackages__"], deps = [ - "@com_github_google_go_cmp//cmp:go_default_library", - "@com_github_google_go_cmp//cmp/cmpopts:go_default_library", - "@org_golang_google_protobuf//proto:go_default_library", - "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//reflect/protoreflect", ], ) go_test( - name = "go_default_test", + name = "protoreflectcmp_test", srcs = ["protoreflectcmp_test.go"], - embed = [":go_default_library"], + embed = [":protoreflectcmp"], deps = [ - "//proto/wirepath/testproto:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@org_golang_google_protobuf//proto:go_default_library", - "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", - "@org_golang_google_protobuf//testing/protocmp:go_default_library", + "//proto/wirepath/testproto", + "@com_github_google_go_cmp//cmp", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//reflect/protoreflect", + "@org_golang_google_protobuf//testing/protocmp", ], ) diff --git a/internal/protoutil/BUILD.bazel b/internal/protoutil/BUILD.bazel index a56cacc..23b3824 100644 --- a/internal/protoutil/BUILD.bazel +++ b/internal/protoutil/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "protoutil", srcs = ["protoutil.go"], importpath = "github.com/google/xtoproto/internal/protoutil", visibility = ["//:__subpackages__"], diff --git a/playground/BUILD.bazel b/playground/BUILD.bazel index 445200e..6500176 100644 --- a/playground/BUILD.bazel +++ b/playground/BUILD.bazel @@ -2,16 +2,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") #load("defs.bzl", "") go_library( - name = "go_default_library", + name = "playground_lib", srcs = ["playground.go"], importpath = "github.com/google/xtoproto/playground", visibility = ["//visibility:private"], deps = select({ "@io_bazel_rules_go//go/platform:js_wasm": [ - "//proto/service:go_default_library", - "//service:go_default_library", - "@org_golang_google_protobuf//encoding/prototext:go_default_library", - "@org_golang_google_protobuf//proto:go_default_library", + "//proto/service", + "//service", + "@org_golang_google_protobuf//encoding/prototext", + "@org_golang_google_protobuf//proto", ], "//conditions:default": [], }), @@ -20,7 +20,7 @@ go_library( go_binary( name = "playground", out = "playground.wasm", - embed = [":go_default_library"], + embed = [":playground_lib"], goarch = "wasm", goos = "js", pure = "on", diff --git a/proto/recordtoproto/BUILD.bazel b/proto/recordtoproto/BUILD.bazel index e920890..d8ce1b0 100644 --- a/proto/recordtoproto/BUILD.bazel +++ b/proto/recordtoproto/BUILD.bazel @@ -17,7 +17,7 @@ go_proto_library( ) go_library( - name = "go_default_library", + name = "recordtoproto", embed = [":recordtoproto_go_proto"], importpath = "github.com/google/xtoproto/proto/recordtoproto", visibility = ["//visibility:public"], diff --git a/proto/service/BUILD.bazel b/proto/service/BUILD.bazel index a1bed6b..465690b 100644 --- a/proto/service/BUILD.bazel +++ b/proto/service/BUILD.bazel @@ -18,11 +18,11 @@ go_proto_library( importpath = "github.com/google/xtoproto/proto/service", proto = ":service_proto", visibility = ["//visibility:public"], - deps = ["//proto/recordtoproto:go_default_library"], + deps = ["//proto/recordtoproto"], ) go_library( - name = "go_default_library", + name = "service", embed = [":service_go_proto"], importpath = "github.com/google/xtoproto/proto/service", visibility = ["//visibility:public"], diff --git a/proto/wirepath/BUILD.bazel b/proto/wirepath/BUILD.bazel index c971f8f..8cd5d55 100644 --- a/proto/wirepath/BUILD.bazel +++ b/proto/wirepath/BUILD.bazel @@ -17,7 +17,7 @@ go_proto_library( ) go_library( - name = "go_default_library", + name = "wirepath", embed = [":wirepath_go_proto"], importpath = "github.com/google/xtoproto/proto/wirepath", visibility = ["//visibility:public"], diff --git a/proto/wirepath/testproto/BUILD.bazel b/proto/wirepath/testproto/BUILD.bazel index 5845e08..2890ef2 100644 --- a/proto/wirepath/testproto/BUILD.bazel +++ b/proto/wirepath/testproto/BUILD.bazel @@ -3,21 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") proto_library( - name = "recordtoproto_proto", + name = "testproto_proto", srcs = ["testproto.proto"], import_prefix = "github.com/google/xtoproto", visibility = ["//visibility:public"], ) -go_proto_library( - name = "recordtoproto_go_proto", - importpath = "github.com/google/xtoproto/proto/recordtoproto", - proto = ":recordtoproto_proto", - visibility = ["//visibility:public"], -) - go_library( - name = "go_default_library", + name = "testproto", embed = [":testproto_go_proto"], importpath = "github.com/google/xtoproto/proto/wirepath/testproto", visibility = ["//visibility:public"], @@ -26,6 +19,6 @@ go_library( go_proto_library( name = "testproto_go_proto", importpath = "github.com/google/xtoproto/proto/wirepath/testproto", - proto = ":recordtoproto_proto", + proto = ":testproto_proto", visibility = ["//visibility:public"], ) diff --git a/protocp/BUILD.bazel b/protocp/BUILD.bazel index 4e6ccc0..8829789 100644 --- a/protocp/BUILD.bazel +++ b/protocp/BUILD.bazel @@ -1,12 +1,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "protocp", srcs = [ "protocp.go", "protocp_writers.go", ], importpath = "github.com/google/xtoproto/protocp", visibility = ["//visibility:public"], - deps = ["@org_golang_google_protobuf//proto:go_default_library"], + deps = ["@org_golang_google_protobuf//proto"], ) diff --git a/rdf/iri/BUILD.bazel b/rdf/iri/BUILD.bazel index 01c38a8..eed82a0 100644 --- a/rdf/iri/BUILD.bazel +++ b/rdf/iri/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "iri", srcs = [ "iri.go", "iri_resolve.go", @@ -11,7 +11,7 @@ go_library( ) go_test( - name = "go_default_test", + name = "iri_test", srcs = ["iri_test.go"], - embed = [":go_default_library"], + embed = [":iri"], ) diff --git a/rdf/ntriples/BUILD.bazel b/rdf/ntriples/BUILD.bazel index bd03766..bb9cecb 100644 --- a/rdf/ntriples/BUILD.bazel +++ b/rdf/ntriples/BUILD.bazel @@ -1,16 +1,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "ntriples", srcs = ["ntriples.go"], importpath = "github.com/google/xtoproto/rdf/ntriples", visibility = ["//visibility:public"], - deps = ["//rdf/iri:go_default_library"], + deps = ["//rdf/iri"], ) go_test( - name = "go_default_test", + name = "ntriples_test", srcs = ["ntriples_test.go"], - embed = [":go_default_library"], - deps = ["@com_github_google_go_cmp//cmp:go_default_library"], + embed = [":ntriples"], + deps = ["@com_github_google_go_cmp//cmp"], ) diff --git a/rdf/rdfxml/BUILD.bazel b/rdf/rdfxml/BUILD.bazel index aeca663..2dd7ff3 100644 --- a/rdf/rdfxml/BUILD.bazel +++ b/rdf/rdfxml/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "rdfxml", srcs = [ "rdfxml.go", "rdfxml_xmlname.go", @@ -9,18 +9,18 @@ go_library( importpath = "github.com/google/xtoproto/rdf/rdfxml", visibility = ["//visibility:public"], deps = [ - "//rdf/iri:go_default_library", - "//rdf/ntriples:go_default_library", + "//rdf/iri", + "//rdf/ntriples", ], ) go_test( - name = "go_default_test", + name = "rdfxml_test", srcs = ["rdfxml_test.go"], - embed = [":go_default_library"], + embed = [":rdfxml"], deps = [ - "//rdf/ntriples:go_default_library", - "//rdf/rdfxml/rdftestcases:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", + "//rdf/ntriples", + "//rdf/rdfxml/rdftestcases", + "@com_github_google_go_cmp//cmp", ], ) diff --git a/rdf/rdfxml/generate_test_cases/BUILD.bazel b/rdf/rdfxml/generate_test_cases/BUILD.bazel index 2f31523..5700bee 100644 --- a/rdf/rdfxml/generate_test_cases/BUILD.bazel +++ b/rdf/rdfxml/generate_test_cases/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( - name = "go_default_library", + name = "generate_test_cases_lib", srcs = ["generate_test_cases.go"], importpath = "github.com/google/xtoproto/rdf/rdfxml/generate_test_cases", visibility = ["//visibility:private"], @@ -9,6 +9,6 @@ go_library( go_binary( name = "generate_test_cases", - embed = [":go_default_library"], + embed = [":generate_test_cases_lib"], visibility = ["//visibility:public"], ) diff --git a/rdf/rdfxml/rdftestcases/BUILD.bazel b/rdf/rdfxml/rdftestcases/BUILD.bazel index 9b1d2dc..1f8323d 100644 --- a/rdf/rdfxml/rdftestcases/BUILD.bazel +++ b/rdf/rdfxml/rdftestcases/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "rdftestcases", srcs = ["rdftestcases.go"], importpath = "github.com/google/xtoproto/rdf/rdfxml/rdftestcases", visibility = ["//visibility:public"], diff --git a/recordinfer/BUILD.bazel b/recordinfer/BUILD.bazel index f1424de..afb60c5 100644 --- a/recordinfer/BUILD.bazel +++ b/recordinfer/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "recordinfer", srcs = [ "recordinfer.go", "recordinfer_numbers.go", @@ -11,17 +11,19 @@ go_library( importpath = "github.com/google/xtoproto/recordinfer", visibility = ["//visibility:public"], deps = [ + "//proto/recordtoproto", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_stoewer_go_strcase//:go_default_library", + "@com_github_stoewer_go_strcase//:go-strcase", ], ) go_test( - name = "go_default_test", + name = "recordinfer_test", srcs = ["recordinfer_test.go"], - embed = [":go_default_library"], + embed = [":recordinfer"], deps = [ - "@com_github_google_go_cmp//cmp:go_default_library", - "@org_golang_google_protobuf//testing/protocmp:go_default_library", + "//proto/recordtoproto", + "@com_github_google_go_cmp//cmp", + "@org_golang_google_protobuf//testing/protocmp", ], ) diff --git a/releasing/generate_pb_go_files/BUILD.bazel b/releasing/generate_pb_go_files/BUILD.bazel index f388f00..6cc4226 100644 --- a/releasing/generate_pb_go_files/BUILD.bazel +++ b/releasing/generate_pb_go_files/BUILD.bazel @@ -1,14 +1,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( - name = "go_default_library", + name = "generate_pb_go_files_lib", srcs = ["generate_pb_go_files.go"], importpath = "github.com/google/xtoproto/releasing/generate_pb_go_files", visibility = ["//visibility:private"], deps = [ - "@com_github_golang_glog//:go_default_library", + "@com_github_golang_glog//:glog", "@io_bazel_rules_go//go/tools/bazel:go_default_library", - "@org_golang_x_sync//errgroup:go_default_library", + "@org_golang_x_sync//errgroup", ], ) @@ -17,7 +17,7 @@ go_binary( data = [ ":generated_sources", ], - embed = [":go_default_library"], + embed = [":generate_pb_go_files_lib"], visibility = ["//visibility:public"], ) diff --git a/releasing/make_release/BUILD.bazel b/releasing/make_release/BUILD.bazel index f55cc0a..2cbec85 100644 --- a/releasing/make_release/BUILD.bazel +++ b/releasing/make_release/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( - name = "go_default_library", + name = "make_release_lib", srcs = ["make_release.go"], data = [ "//cmd/xtoproto_web", @@ -9,13 +9,13 @@ go_library( importpath = "github.com/google/xtoproto/releasing/make_release", visibility = ["//visibility:private"], deps = [ - "@com_github_bmatcuk_doublestar//:go_default_library", - "@com_github_golang_glog//:go_default_library", + "@com_github_bmatcuk_doublestar//:doublestar", + "@com_github_golang_glog//:glog", ], ) go_binary( name = "make_release", - embed = [":go_default_library"], + embed = [":make_release_lib"], visibility = ["//visibility:public"], ) diff --git a/service/BUILD.bazel b/service/BUILD.bazel index 997f118..7656817 100644 --- a/service/BUILD.bazel +++ b/service/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "service", srcs = [ "service.go", "service_generate_code.go", @@ -10,25 +10,26 @@ go_library( importpath = "github.com/google/xtoproto/service", visibility = ["//visibility:public"], deps = [ - "//csvinfer:go_default_library", - "//csvtoproto:go_default_library", - "//proto/service:go_default_library", - "//recordinfer:go_default_library", - "@com_github_stoewer_go_strcase//:go_default_library", + "//csvinfer", + "//csvtoproto", + "//proto/service", + "//recordinfer", + "@com_github_stoewer_go_strcase//:go-strcase", "@org_golang_google_grpc//:go_default_library", - "@org_golang_google_grpc//codes:go_default_library", + "@org_golang_google_grpc//codes", ], ) go_test( - name = "go_default_test", + name = "service_test", srcs = ["service_test.go"], - embed = [":go_default_library"], + embed = [":service"], deps = [ - "//proto/service:go_default_library", + "//proto/recordtoproto", + "//proto/service", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@com_github_google_go_cmp//cmp/cmpopts:go_default_library", - "@org_golang_google_protobuf//testing/protocmp:go_default_library", + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", + "@org_golang_google_protobuf//testing/protocmp", ], ) diff --git a/sexpr/BUILD.bazel b/sexpr/BUILD.bazel index 55f2b7a..3ec4bca 100644 --- a/sexpr/BUILD.bazel +++ b/sexpr/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "sexpr", srcs = [ "sexpr.go", "sexpr_factory.go", @@ -11,20 +11,20 @@ go_library( importpath = "github.com/google/xtoproto/sexpr", visibility = ["//visibility:public"], deps = [ - "//sexpr/form:go_default_library", - "//textpos:go_default_library", + "//sexpr/form", + "//textpos", ], ) go_test( - name = "go_default_test", + name = "sexpr_test", srcs = [ "sexpr_examples_test.go", "sexpr_test.go", ], - embed = [":go_default_library"], + embed = [":sexpr"], deps = [ - "@com_github_google_go_cmp//cmp:go_default_library", - "@com_github_google_go_cmp//cmp/cmpopts:go_default_library", + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", ], ) diff --git a/sexpr/form/BUILD.bazel b/sexpr/form/BUILD.bazel index 487ac89..73d8698 100644 --- a/sexpr/form/BUILD.bazel +++ b/sexpr/form/BUILD.bazel @@ -1,12 +1,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "form", srcs = [ "form.go", "form_sourcefile.go", ], importpath = "github.com/google/xtoproto/sexpr/form", visibility = ["//visibility:public"], - deps = ["//textpos:go_default_library"], + deps = ["//textpos"], ) diff --git a/textcoder/BUILD.bazel b/textcoder/BUILD.bazel index dbdf618..f3bb40e 100644 --- a/textcoder/BUILD.bazel +++ b/textcoder/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "textcoder", srcs = [ "textcoder.go", "textcoder_builtins.go", @@ -11,13 +11,13 @@ go_library( ) go_test( - name = "go_default_test", + name = "textcoder_test", srcs = [ "textcoder_example_context_test.go", "textcoder_example_explicit_test.go", "textcoder_example_interface_test.go", "textcoder_test.go", ], - embed = [":go_default_library"], - deps = ["@com_github_google_go_cmp//cmp:go_default_library"], + embed = [":textcoder"], + deps = ["@com_github_google_go_cmp//cmp"], ) diff --git a/textpos/BUILD.bazel b/textpos/BUILD.bazel index fd2a3f0..1aab642 100644 --- a/textpos/BUILD.bazel +++ b/textpos/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "textpos", srcs = [ "textpos.go", "textpos_from_go_token.go", @@ -11,7 +11,7 @@ go_library( ) go_test( - name = "go_default_test", + name = "textpos_test", srcs = ["textpos_from_go_token_test.go"], - embed = [":go_default_library"], + embed = [":textpos"], ) diff --git a/wirepath/BUILD.bazel b/wirepath/BUILD.bazel index c38640a..3df0ee3 100644 --- a/wirepath/BUILD.bazel +++ b/wirepath/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "go_default_library", + name = "wirepath", srcs = [ "wirepath.go", "wirepath_from_string.go", @@ -11,24 +11,24 @@ go_library( importpath = "github.com/google/xtoproto/wirepath", visibility = ["//visibility:public"], deps = [ - "//proto/wirepath:go_default_library", - "@org_golang_google_protobuf//proto:go_default_library", - "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", + "//proto/wirepath", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//reflect/protoreflect", ], ) go_test( - name = "go_default_test", + name = "wirepath_test", size = "small", srcs = ["wirepath_test.go"], - embed = [":go_default_library"], + embed = [":wirepath"], deps = [ - "//internal/protoreflectcmp:go_default_library", - "//proto/wirepath:go_default_library", - "//proto/wirepath/testproto:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@org_golang_google_protobuf//proto:go_default_library", - "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", - "@org_golang_google_protobuf//testing/protocmp:go_default_library", + "//internal/protoreflectcmp", + "//proto/wirepath", + "//proto/wirepath/testproto", + "@com_github_google_go_cmp//cmp", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//reflect/protoreflect", + "@org_golang_google_protobuf//testing/protocmp", ], ) diff --git a/xmlinfer/BUILD.bazel b/xmlinfer/BUILD.bazel index b8841aa..777b4e7 100644 --- a/xmlinfer/BUILD.bazel +++ b/xmlinfer/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name = "go_default_library", + name = "xmlinfer", srcs = [ "xmlinfer.go", "xmlinfer_string_fields.go", @@ -9,8 +9,8 @@ go_library( importpath = "github.com/google/xtoproto/xmlinfer", visibility = ["//visibility:public"], deps = [ - "@com_github_jhump_protoreflect//desc/builder:go_default_library", - "@com_github_jhump_protoreflect//desc/protoprint:go_default_library", - "@com_github_stoewer_go_strcase//:go_default_library", + "@com_github_jhump_protoreflect//desc/builder", + "@com_github_jhump_protoreflect//desc/protoprint", + "@com_github_stoewer_go_strcase//:go-strcase", ], )