Merge remote-tracking branch 'origin/master' into stardoc

Author: pcj

BUILD.bazel

@@ -1,4 +1,4 @@
-load("@bazel_gazelle//:def.bzl", "gazelle_binary")
+load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
 load("@build_stack_rules_proto//rules:proto_gazelle.bzl", "proto_gazelle")
 load("@npm_ts_proto//:defs.bzl", "npm_link_all_packages")
 
@@ -10,9 +10,16 @@ exports_files([
 # ----------------------------------------------------
 # Gazelle
 # ----------------------------------------------------
-# gazelle:prefix github.com/stackb/rules_proto
+# gazelle:prefix github.com/stackb/rules_proto/v4
 # gazelle:exclude vendor
 # gazelle:exclude node_modules
+# gazelle:go_generate_proto false
+
+# ProTip: `bazel run //:gazelle` for go-only deps
+gazelle(
+    name = "gazelle",
+    external = "static",
+)
 
 gazelle_binary(
     name = "gazelle-protobuf",
@@ -27,8 +34,9 @@ gazelle_binary(
     visibility = ["//visibility:public"],
 )
 
+# ProTip: `bazel run //:proto_gazelle` for this extension
 proto_gazelle(
-    name = "gazelle",
+    name = "proto_gazelle",
     cfgs = ["//:rules_proto_config.yaml"],
     external = "static",
     gazelle = "//:gazelle-protobuf",

MODULE.bazel

@@ -19,14 +19,14 @@ bazel_dep(name = "rules_pkg", version = "1.1.0")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_jvm_external", version = "6.8")
 bazel_dep(name = "rules_java", version = "8.15.1")
-bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_foreign_cc", version = "0.15.0")  # specified to ensure more recent version than @grpc/@opencensus-cpp/@google_benchmark
 bazel_dep(name = "rules_cc", version = "0.2.0")
 bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "package_metadata", version = "0.0.5")
 bazel_dep(name = "grpc", version = "1.74.1", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "grpc-java", version = "1.71.0", repo_name = "io_grpc_grpc_java")
-bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
 bazel_dep(name = "bazel_skylib", version = "1.8.1")
 bazel_dep(name = "bazel_features", version = "1.35.0")
 bazel_dep(name = "aspect_rules_ts", version = "3.7.0")

Makefile

@@ -3,7 +3,7 @@ tidy:
 	bazel run @go_sdk//:bin/go -- mod tidy
 	bazel run @go_sdk//:bin/go -- mod vendor
 	find vendor -name 'BUILD.bazel' | xargs rm
-	bazel run //:gazelle
+	bazel run //:proto_gazelle
 	bazel mod tidy
 
 .PHONY: build

README.md

@@ -1,6 +1,6 @@
 # `rules_proto (v4)`
 
-![build-status](https://github.com/stackb/rules_proto/actions/workflows/ci.yaml/badge.svg)
+![build-status](https://github.com/stackb/rules_proto/v4/actions/workflows/ci.yaml/badge.svg)
 [![Go Reference](https://pkg.go.dev/badge/github.com/stackb/rules_proto.svg)](https://pkg.go.dev/github.com/stackb/rules_proto)
 
 Bazel starlark rules for building protocol buffers +/- gRPC :sparkles:.

cmd/examplegen/BUILD.bazel

@@ -8,7 +8,7 @@ go_library(
         "generator.go",
         "template.go",
     ],
-    importpath = "github.com/stackb/rules_proto/cmd/examplegen",
+    importpath = "github.com/stackb/rules_proto/v4/cmd/examplegen",
     visibility = ["//visibility:private"],
 )
 

cmd/gazelle/BUILD.bazel

@@ -23,26 +23,26 @@ go_library(
         "profiler.go",
         "update-repos.go",
     ],
-    importpath = "github.com/stackb/rules_proto/cmd/gazelle",
+    importpath = "github.com/stackb/rules_proto/v4/cmd/gazelle",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/gazelle/internal/wspace",
         "//language/proto_go_modules",
         "//language/protobuf",
         "//language/starlarkmodules",
-        "@bazel_gazelle//config:go_default_library",
-        "@bazel_gazelle//flag:go_default_library",
-        "@bazel_gazelle//label:go_default_library",
-        "@bazel_gazelle//language:go_default_library",
-        "@bazel_gazelle//language/go:go_default_library",
-        "@bazel_gazelle//language/proto:go_default_library",
-        "@bazel_gazelle//merger:go_default_library",
-        "@bazel_gazelle//repo:go_default_library",
-        "@bazel_gazelle//resolve:go_default_library",
-        "@bazel_gazelle//rule:go_default_library",
-        "@bazel_gazelle//walk:go_default_library",
-        "@com_github_bazelbuild_buildtools//build:go_default_library",
-        "@com_github_pmezard_go_difflib//difflib:go_default_library",
+        "@bazel_gazelle//config",
+        "@bazel_gazelle//flag",
+        "@bazel_gazelle//label",
+        "@bazel_gazelle//language",
+        "@bazel_gazelle//language/go",
+        "@bazel_gazelle//language/proto",
+        "@bazel_gazelle//merger",
+        "@bazel_gazelle//repo",
+        "@bazel_gazelle//resolve",
+        "@bazel_gazelle//rule",
+        "@bazel_gazelle//walk",
+        "@com_github_bazelbuild_buildtools//build",
+        "@com_github_pmezard_go_difflib//difflib",
     ],
 )
 
@@ -62,10 +62,10 @@ go_test(
     x_defs = {"goRootFile": "$(rlocationpath @go_sdk//:ROOT)"},
     deps = [
         "//cmd/gazelle/internal/wspace",
-        "@bazel_gazelle//config:go_default_library",
-        "@bazel_gazelle//testtools:go_default_library",
-        "@com_github_google_go_cmp//cmp:go_default_library",
-        "@io_bazel_rules_go//go/runfiles:go_default_library",
+        "@bazel_gazelle//config",
+        "@bazel_gazelle//testtools",
+        "@com_github_google_go_cmp//cmp",
+        "@io_bazel_rules_go//go/runfiles",
     ],
 )
 

cmd/gazelle/README.md

@@ -6,7 +6,7 @@ To upgrade gazelle, one must:
 
 - Compare changes in the source repo@version to the files here.  It's easiest to
   just copy over each file and see where the diffs are.  Make sure `langs.go`
-  includes `github.com/stackb/rules_proto/language/protobuf`.
+  includes `github.com/stackb/rules_proto/v4/language/protobuf`.
 - Since the `proto_gazelle.bzl` rule uses
   `@bazel_gazelle//internal:gazelle.bash.in`, changes there must remain
   compatible with proto_gazelle.  Look at the diff there and make sure the

cmd/gazelle/fix-update.go

@@ -39,7 +39,7 @@ import (
 	"github.com/bazelbuild/bazel-gazelle/resolve"
 	"github.com/bazelbuild/bazel-gazelle/rule"
 	"github.com/bazelbuild/bazel-gazelle/walk"
-	"github.com/stackb/rules_proto/cmd/gazelle/internal/wspace"
+	"github.com/stackb/rules_proto/v4/cmd/gazelle/internal/wspace"
 )
 
 // updateConfig holds configuration information needed to run the fix and

cmd/gazelle/integration_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/bazelbuild/bazel-gazelle/config"
 	"github.com/bazelbuild/bazel-gazelle/testtools"
 	"github.com/google/go-cmp/cmp"
-	"github.com/stackb/rules_proto/cmd/gazelle/internal/wspace"
+	"github.com/stackb/rules_proto/v4/cmd/gazelle/internal/wspace"
 )
 
 // skipIfWorkspaceVisible skips the test if the WORKSPACE file for the

cmd/gazelle/internal/wspace/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "wspace",
     srcs = ["finder.go"],
-    importpath = "github.com/stackb/rules_proto/cmd/gazelle/internal/wspace",
+    importpath = "github.com/stackb/rules_proto/v4/cmd/gazelle/internal/wspace",
     visibility = ["//visibility:public"],
 )