Skip to content

Bump build_stack_rules_proto #5

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Bump build_stack_rules_proto #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a82676
Bump build_stack_rules_proto
pcj Oct 9, 2025
daf623e
Use fully-qualified labels in bzl files
pcj Oct 9, 2025
70347d4
override bsrp
pcj Oct 9, 2025
06bcc2d
Use separate maven namespace for our deps
pcj Oct 9, 2025
37aa57e
Resolve maven dep issues
pcj Oct 9, 2025
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
40 changes: 37 additions & 3 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module(
# -------------------------------------------------------------------

bazel_dep(name = "bazel_skylib", version = "1.8.2")
bazel_dep(name = "build_stack_rules_proto", version = "4.1.0")
bazel_dep(name = "build_stack_rules_proto", version = "4.1.1")
bazel_dep(name = "closure-templates", version = "1.0.1")
bazel_dep(name = "google_bazel_common", version = "0.0.1")
bazel_dep(name = "platforms", version = "1.0.0")
Expand Down Expand Up @@ -45,6 +45,21 @@ archive_override(
patch_strip = 1,
)

# Commit: 04fc63fb40bf30d2e5e0b3786028eb41218de979
# Date: 2025-10-09 04:43:15 +0000 UTC
# URL: https://github.com/stackb/rules_proto/commit/04fc63fb40bf30d2e5e0b3786028eb41218de979
#
# Remove lock file for @maven
#
# It is shared by multiple workspaces and seems to cause problems when locked
# Size: 4088796 (4.1 MB)
archive_override(
module_name = "build_stack_rules_proto",
sha256 = "aff21579deef91316c726582bec71c621dde2ae2ec74099a55b637bda8997333",
strip_prefix = "rules_proto-04fc63fb40bf30d2e5e0b3786028eb41218de979",
urls = ["https://github.com/stackb/rules_proto/archive/04fc63fb40bf30d2e5e0b3786028eb41218de979.tar.gz"],
)

# -------------------------------------------------------------------
# additional http dependencies
# -------------------------------------------------------------------
Expand Down Expand Up @@ -126,7 +141,23 @@ platform_http_file(
# -------------------------------------------------------------------

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

# NOTE: even though we isolate OUR maven deps into a separate namespace, we
# still need the ones from other contributing modules. That is why this
# maven.install() declaration exists, and I am surprised bzlmod /
# rules_jvm_external works this way.
maven.install(
name = "maven",
known_contributing_modules = [
"build_stack_rules_proto",
"grpc-java",
"io_bazel_rules_closure",
"protobuf",
"rules_web_testing_java",
],
)
maven.install(
name = "maven_rules_closure",
artifacts = [
"args4j:args4j:2.33",
"com.google.closure-stylesheets:closure-stylesheets:1.5.0",
Expand All @@ -138,14 +169,17 @@ maven.install(
"org.seleniumhq.selenium:selenium-api:4.27.0",
"org.seleniumhq.selenium:selenium-support:4.27.0",
],
lock_file = "//:maven_rules_closure_install.json",
)
maven.artifact(
name = "maven_rules_closure",
artifact = "closure-compiler",
group = "com.google.javascript",
version = "v20250402", # Using maven.artifact here because the version number vxxxxx cannot parsed correctly.
)
maven.override(
name = "maven_rules_closure",
coordinates = "javacc:javacc",
target = "@maven//:net_java_dev_javacc_javacc", # javacc:javacc was not updated since 2008 and relocated to net.java.dev.javacc
target = "@maven_rules_closure//:net_java_dev_javacc_javacc", # javacc:javacc was not updated since 2008 and relocated to net.java.dev.javacc
)
use_repo(maven, "maven")
use_repo(maven, "maven_rules_closure")
2 changes: 1 addition & 1 deletion closure/compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ licenses(["notice"])

java_library(
name = "compiler",
exports = ["@maven//:com_google_javascript_closure_compiler"],
exports = ["@maven_rules_closure//:com_google_javascript_closure_compiler"],
)

bzl_library(
Expand Down
2 changes: 1 addition & 1 deletion closure/protobuf/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@//closure/compiler:closure_js_library.bzl", "closure_js_library")
load("@io_bazel_rules_closure//closure/compiler:closure_js_library.bzl", "closure_js_library")
load("@build_stack_rules_proto//rules:proto_plugin.bzl", "proto_plugin")

package(default_visibility = ["//visibility:public"])
Expand Down
2 changes: 1 addition & 1 deletion closure/stylesheets/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ java_binary(
main_class = "com.google.common.css.compiler.commandline.ClosureCommandLineCompiler",
visibility = ["//:__subpackages__"],
runtime_deps = [
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@maven_rules_closure//:com_google_closure_stylesheets_closure_stylesheets",
],
)
54 changes: 27 additions & 27 deletions closure/templates/closure_js_template_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"""Utilities for compiling Closure Templates to JavaScript.
"""

load("//closure/compiler:closure_js_aspect.bzl", "closure_js_aspect")
load("//closure/compiler:closure_js_library.bzl", "closure_js_library")
load("//closure/private:defs.bzl", "ClosureJsLibraryInfo", "SOY_FILE_TYPE", "extract_providers", "unfurl")
load("//closure/templates:closure_templates_plugin.bzl", "SoyPluginInfo")
load("@io_bazel_rules_closure//closure/compiler:closure_js_aspect.bzl", "closure_js_aspect")
load("@io_bazel_rules_closure//closure/compiler:closure_js_library.bzl", "closure_js_library")
load("@io_bazel_rules_closure//closure/private:defs.bzl", "ClosureJsLibraryInfo", "SOY_FILE_TYPE", "extract_providers", "unfurl")
load("@io_bazel_rules_closure//closure/templates:closure_templates_plugin.bzl", "SoyPluginInfo")

_SOYTOJSSRCCOMPILER = "@closure-templates//java/src/com/google/template/soy:SoyToJsSrcCompiler"

Expand Down Expand Up @@ -128,29 +128,29 @@ def closure_js_template_library(
)

deps = deps + [
"//closure/goog/array",
"//closure/goog/asserts",
"//closure/goog/debug",
"//closure/goog/format",
"//closure/goog/html:safehtml",
"//closure/goog/html:safescript",
"//closure/goog/html:safestyle",
"//closure/goog/html:safestylesheet",
"//closure/goog/html:safeurl",
"//closure/goog/html:trustedresourceurl",
"//closure/goog/html:uncheckedconversions",
"//closure/goog/i18n:bidi",
"//closure/goog/i18n:bidiformatter",
"//closure/goog/i18n:numberformat",
"//closure/goog/object",
"//closure/goog/soy",
"//closure/goog/soy:data",
"//closure/goog/soy:renderer",
"//closure/goog/string",
"//closure/goog/string:const",
"//closure/goog/uri",
"//closure/templates:soy_jssrc",
"//google3/javascript/xid",
"@io_bazel_rules_closure//closure/goog/array",
"@io_bazel_rules_closure//closure/goog/asserts",
"@io_bazel_rules_closure//closure/goog/debug",
"@io_bazel_rules_closure//closure/goog/format",
"@io_bazel_rules_closure//closure/goog/html:safehtml",
"@io_bazel_rules_closure//closure/goog/html:safescript",
"@io_bazel_rules_closure//closure/goog/html:safestyle",
"@io_bazel_rules_closure//closure/goog/html:safestylesheet",
"@io_bazel_rules_closure//closure/goog/html:safeurl",
"@io_bazel_rules_closure//closure/goog/html:trustedresourceurl",
"@io_bazel_rules_closure//closure/goog/html:uncheckedconversions",
"@io_bazel_rules_closure//closure/goog/i18n:bidi",
"@io_bazel_rules_closure//closure/goog/i18n:bidiformatter",
"@io_bazel_rules_closure//closure/goog/i18n:numberformat",
"@io_bazel_rules_closure//closure/goog/object",
"@io_bazel_rules_closure//closure/goog/soy",
"@io_bazel_rules_closure//closure/goog/soy:data",
"@io_bazel_rules_closure//closure/goog/soy:renderer",
"@io_bazel_rules_closure//closure/goog/string",
"@io_bazel_rules_closure//closure/goog/string:const",
"@io_bazel_rules_closure//closure/goog/uri",
"@io_bazel_rules_closure//closure/templates:soy_jssrc",
"@io_bazel_rules_closure//google3/javascript/xid",
]

closure_js_library(
Expand Down
6 changes: 2 additions & 4 deletions closure/webfiles/web_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
load(
"//closure/private:defs.bzl",
"WebFilesInfo",
"collect_runfiles",
"create_argfile",
"difference",
"extract_providers",
"long_path",
"unfurl",
"collect_runfiles",
)

def _web_library(ctx):
Expand Down Expand Up @@ -224,9 +224,7 @@ web_library = rule(
cfg = "exec",
),
"server": attr.label(
default = Label(
"//java/io/bazel/rules/closure/webfiles/server:WebfilesServer",
),
default = Label("//java/io/bazel/rules/closure/webfiles/server:WebfilesServer"),
executable = True,
cfg = "exec",
),
Expand Down
2 changes: 1 addition & 1 deletion java/com/google/javascript/jscomp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ java_library(
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:args4j_args4j",
"@maven_rules_closure//:args4j_args4j",
],
)
6 changes: 3 additions & 3 deletions java/io/bazel/rules/closure/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ java_binary(
deps = [
"//java/io/bazel/rules/closure/webfiles/server",
"@google_bazel_common//third_party/java/guava",
"@maven//:org_seleniumhq_selenium_selenium_api",
"@maven//:org_seleniumhq_selenium_selenium_remote_driver",
"@maven//:org_seleniumhq_selenium_selenium_support",
"@maven_rules_closure//:org_seleniumhq_selenium_selenium_api",
"@maven_rules_closure//:org_seleniumhq_selenium_selenium_remote_driver",
"@maven_rules_closure//:org_seleniumhq_selenium_selenium_support",
"@rules_web_testing_java//java/com/google/testing/web",
],
)
4 changes: 2 additions & 2 deletions java/io/bazel/rules/closure/webfiles/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ java_library(
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr305_annotations",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@maven//:org_jsoup_jsoup",
"@maven_rules_closure//:com_google_closure_stylesheets_closure_stylesheets",
"@maven_rules_closure//:org_jsoup_jsoup",
],
)

Expand Down
2 changes: 1 addition & 1 deletion java/io/bazel/rules/closure/webfiles/compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ java_library(
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@maven_rules_closure//:com_google_closure_stylesheets_closure_stylesheets",
],
)
2 changes: 1 addition & 1 deletion java/org/jsoup/nodes/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"@google_bazel_common//third_party/java/guava",
"@maven//:org_jsoup_jsoup",
"@maven_rules_closure//:org_jsoup_jsoup",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ java_test(
"@google_bazel_common//third_party/java/guava:testlib",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@maven_rules_closure//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ java_test(
"@google_bazel_common//third_party/java/jsr330_inject",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_dagger_dagger_producers",
"@maven_rules_closure//:com_google_dagger_dagger_producers",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/webfiles/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ java_test(
"@google_bazel_common//third_party/java/guava:testlib",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@maven_rules_closure//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/webfiles/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ java_test(
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/mockito",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@maven_rules_closure//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/worker/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ java_test(
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/mockito",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@maven_rules_closure//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/org/jsoup/nodes/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ java_test(
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:org_jsoup_jsoup",
"@maven_rules_closure//:org_jsoup_jsoup",
],
)
Loading