Skip to content

Commit 2d0394b

Browse files
pcjpcj
authored
Update golang dep labels for go_naming_convention "import" (#412)
* bug: fix exports in proto_java_library when deps are nil
1 parent 5004822 commit 2d0394b

36 files changed

Lines changed: 159 additions & 135 deletions

File tree

‎BUILD.bazel‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@bazel_gazelle//:def.bzl", "gazelle_binary")
1+
load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
22
load("@build_stack_rules_proto//rules:proto_gazelle.bzl", "proto_gazelle")
33
load("@npm_ts_proto//:defs.bzl", "npm_link_all_packages")
44

@@ -13,6 +13,13 @@ exports_files([
1313
# gazelle:prefix github.com/stackb/rules_proto
1414
# gazelle:exclude vendor
1515
# gazelle:exclude node_modules
16+
# gazelle:go_generate_proto false
17+
18+
# ProTip: `bazel run //:gazelle` for go-only deps
19+
gazelle(
20+
name = "gazelle",
21+
external = "static",
22+
)
1623

1724
gazelle_binary(
1825
name = "gazelle-protobuf",
@@ -27,8 +34,9 @@ gazelle_binary(
2734
visibility = ["//visibility:public"],
2835
)
2936

37+
# ProTip: `bazel run //:proto_gazelle` for this extension
3038
proto_gazelle(
31-
name = "gazelle",
39+
name = "proto_gazelle",
3240
cfgs = ["//:rules_proto_config.yaml"],
3341
external = "static",
3442
gazelle = "//:gazelle-protobuf",

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tidy:
33
bazel run @go_sdk//:bin/go -- mod tidy
44
bazel run @go_sdk//:bin/go -- mod vendor
55
find vendor -name 'BUILD.bazel' | xargs rm
6-
bazel run //:gazelle
6+
bazel run //:proto_gazelle
77
bazel mod tidy
88

99
.PHONY: build

‎cmd/gazelle/BUILD.bazel‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ go_library(
2929
"//cmd/gazelle/internal/wspace",
3030
"//language/proto_go_modules",
3131
"//language/protobuf",
32-
"@bazel_gazelle//config:go_default_library",
33-
"@bazel_gazelle//flag:go_default_library",
34-
"@bazel_gazelle//label:go_default_library",
35-
"@bazel_gazelle//language:go_default_library",
36-
"@bazel_gazelle//language/go:go_default_library",
37-
"@bazel_gazelle//language/proto:go_default_library",
38-
"@bazel_gazelle//merger:go_default_library",
39-
"@bazel_gazelle//repo:go_default_library",
40-
"@bazel_gazelle//resolve:go_default_library",
41-
"@bazel_gazelle//rule:go_default_library",
42-
"@bazel_gazelle//walk:go_default_library",
43-
"@com_github_bazelbuild_buildtools//build:go_default_library",
44-
"@com_github_pmezard_go_difflib//difflib:go_default_library",
32+
"@bazel_gazelle//config",
33+
"@bazel_gazelle//flag",
34+
"@bazel_gazelle//label",
35+
"@bazel_gazelle//language",
36+
"@bazel_gazelle//language/go",
37+
"@bazel_gazelle//language/proto",
38+
"@bazel_gazelle//merger",
39+
"@bazel_gazelle//repo",
40+
"@bazel_gazelle//resolve",
41+
"@bazel_gazelle//rule",
42+
"@bazel_gazelle//walk",
43+
"@com_github_bazelbuild_buildtools//build",
44+
"@com_github_pmezard_go_difflib//difflib",
4545
],
4646
)
4747

@@ -61,10 +61,10 @@ go_test(
6161
x_defs = {"goRootFile": "$(rlocationpath @go_sdk//:ROOT)"},
6262
deps = [
6363
"//cmd/gazelle/internal/wspace",
64-
"@bazel_gazelle//config:go_default_library",
65-
"@bazel_gazelle//testtools:go_default_library",
66-
"@com_github_google_go_cmp//cmp:go_default_library",
67-
"@io_bazel_rules_go//go/runfiles:go_default_library",
64+
"@bazel_gazelle//config",
65+
"@bazel_gazelle//testtools",
66+
"@com_github_google_go_cmp//cmp",
67+
"@io_bazel_rules_go//go/runfiles",
6868
],
6969
)
7070

‎cmd/gencopy/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go_library(
77
srcs = ["gencopy.go"],
88
importpath = "github.com/stackb/rules_proto/cmd/gencopy",
99
visibility = ["//visibility:private"],
10-
deps = ["@com_github_google_go_cmp//cmp:go_default_library"],
10+
deps = ["@com_github_google_go_cmp//cmp"],
1111
)
1212

1313
go_binary(
@@ -21,8 +21,8 @@ go_test(
2121
srcs = ["gencopy_test.go"],
2222
embed = [":gencopy_lib"],
2323
deps = [
24-
"@bazel_gazelle//testtools:go_default_library",
25-
"@com_github_google_go_cmp//cmp:go_default_library",
24+
"@bazel_gazelle//testtools",
25+
"@com_github_google_go_cmp//cmp",
2626
],
2727
)
2828

‎language/example/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ go_library(
77
visibility = ["//visibility:public"],
88
deps = [
99
"//pkg/language/noop",
10-
"@bazel_gazelle//language:go_default_library",
10+
"@bazel_gazelle//language",
1111
],
1212
)

‎language/proto_go_modules/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ go_library(
99
importpath = "github.com/stackb/rules_proto/language/proto_go_modules",
1010
visibility = ["//visibility:public"],
1111
deps = [
12-
"@bazel_gazelle//config:go_default_library",
13-
"@bazel_gazelle//label:go_default_library",
14-
"@bazel_gazelle//language:go_default_library",
15-
"@bazel_gazelle//repo:go_default_library",
16-
"@bazel_gazelle//resolve:go_default_library",
17-
"@bazel_gazelle//rule:go_default_library",
12+
"@bazel_gazelle//config",
13+
"@bazel_gazelle//label",
14+
"@bazel_gazelle//language",
15+
"@bazel_gazelle//repo",
16+
"@bazel_gazelle//resolve",
17+
"@bazel_gazelle//rule",
1818
],
1919
)
2020

‎language/protobuf/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ go_library(
2828
"//pkg/rule/rules_nodejs",
2929
"//pkg/rule/rules_python",
3030
"//pkg/rule/rules_scala",
31-
"@bazel_gazelle//language:go_default_library",
31+
"@bazel_gazelle//language",
3232
],
3333
)
3434

‎pkg/goldentest/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go_library(
77
importpath = "github.com/stackb/rules_proto/pkg/goldentest",
88
visibility = ["//visibility:public"],
99
deps = [
10-
"@bazel_gazelle//testtools:go_default_library",
11-
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
10+
"@bazel_gazelle//testtools",
11+
"@io_bazel_rules_go//go/tools/bazel",
1212
],
1313
)

‎pkg/language/noop/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ go_library(
66
importpath = "github.com/stackb/rules_proto/pkg/language/noop",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"@bazel_gazelle//config:go_default_library",
10-
"@bazel_gazelle//label:go_default_library",
11-
"@bazel_gazelle//language:go_default_library",
12-
"@bazel_gazelle//repo:go_default_library",
13-
"@bazel_gazelle//resolve:go_default_library",
14-
"@bazel_gazelle//rule:go_default_library",
9+
"@bazel_gazelle//config",
10+
"@bazel_gazelle//label",
11+
"@bazel_gazelle//language",
12+
"@bazel_gazelle//repo",
13+
"@bazel_gazelle//resolve",
14+
"@bazel_gazelle//rule",
1515
],
1616
)

‎pkg/language/protobuf/BUILD.bazel‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ go_library(
1616
visibility = ["//visibility:public"],
1717
deps = [
1818
"//pkg/protoc",
19-
"@bazel_gazelle//config:go_default_library",
20-
"@bazel_gazelle//label:go_default_library",
21-
"@bazel_gazelle//language:go_default_library",
22-
"@bazel_gazelle//repo:go_default_library",
23-
"@bazel_gazelle//resolve:go_default_library",
24-
"@bazel_gazelle//rule:go_default_library",
19+
"@bazel_gazelle//config",
20+
"@bazel_gazelle//label",
21+
"@bazel_gazelle//language",
22+
"@bazel_gazelle//repo",
23+
"@bazel_gazelle//resolve",
24+
"@bazel_gazelle//rule",
2525
],
2626
)
2727

@@ -34,13 +34,13 @@ go_test(
3434
embed = [":protobuf"],
3535
deps = [
3636
"//pkg/protoc",
37-
"@bazel_gazelle//config:go_default_library",
38-
"@bazel_gazelle//label:go_default_library",
39-
"@bazel_gazelle//language:go_default_library",
40-
"@bazel_gazelle//resolve:go_default_library",
41-
"@bazel_gazelle//rule:go_default_library",
42-
"@bazel_gazelle//testtools:go_default_library",
43-
"@com_github_google_go_cmp//cmp:go_default_library",
37+
"@bazel_gazelle//config",
38+
"@bazel_gazelle//label",
39+
"@bazel_gazelle//language",
40+
"@bazel_gazelle//resolve",
41+
"@bazel_gazelle//rule",
42+
"@bazel_gazelle//testtools",
43+
"@com_github_google_go_cmp//cmp",
4444
],
4545
)
4646

0 commit comments

Comments
 (0)