Skip to content

OSS Fix for Bazel 9 #924

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

Merged
copybara-service merged 1 commit into from
Jan 21, 2026
+15 −4
Merged

OSS Fix for Bazel 9 #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ build --java_language_version=11

# Hide Java 8 deprecation warnings.
common --javacopt=-Xlint:-options

# Remove flag once https://github.com/google/cel-spec/issues/508 and rules_jvm_external is fixed.
common --incompatible_autoload_externally=proto_library,cc_proto_library,java_proto_library,java_test
7 changes: 7 additions & 0 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ load(
"DEFAULT_TOOLCHAIN_CONFIGURATION",
"default_java_toolchain",
)
load(
"@rules_java//java:defs.bzl",
"java_binary",
"java_library",
"java_package_configuration",
"java_plugin",
)
load("@rules_license//rules:license.bzl", "license")

licenses(["notice"]) # Apache License 2.0
Expand Down
6 changes: 3 additions & 3 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ module(
)

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "rules_jvm_external", version = "6.9")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "rules_android", version = "0.7.1")
bazel_dep(name = "rules_shell", version = "0.5.1")
bazel_dep(name = "googleapis-java", version = "1.0.0")
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")
Expand All @@ -39,7 +39,7 @@ GUAVA_VERSION = "33.5.0"

TRUTH_VERSION = "1.4.4"

PROTOBUF_JAVA_VERSION = "4.33.0"
PROTOBUF_JAVA_VERSION = "4.33.4"

# Compile only artifacts
[
Expand Down
3 changes: 2 additions & 1 deletion conformance/src/test/java/dev/cel/conformance/conformance_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This module contains build rules for generating the conformance test targets.
"""

load("@rules_java//java:defs.bzl", "java_test")
load("@rules_shell//shell:sh_test.bzl", "sh_test")

# Converts the list of tests to skip from the format used by the original Go test runner to a single
# flag value where each test is separated by a comma. It also performs expansion, for example
Expand Down Expand Up @@ -79,7 +80,7 @@ def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
],
)

native.sh_test(
sh_test(
name = name,
size = "small",
srcs = ["//conformance/src/test/java/dev/cel/conformance:conformance_test.sh"],
Expand Down
Loading