Skip to content

Commit b8eafbf

Browse files
l46kokcopybara-github
authored andcommitted
OSS Fix for Bazel 9
PiperOrigin-RevId: 859145330
1 parent b564c48 commit b8eafbf

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ build --java_language_version=11
44

55
# Hide Java 8 deprecation warnings.
66
common --javacopt=-Xlint:-options
7+
8+
# Remove flag once https://github.com/google/cel-spec/issues/508 and rules_jvm_external is fixed.
9+
common --incompatible_autoload_externally=proto_library,cc_proto_library,java_proto_library,java_test

BUILD.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ load(
2222
"DEFAULT_TOOLCHAIN_CONFIGURATION",
2323
"default_java_toolchain",
2424
)
25+
load(
26+
"@rules_java//java:defs.bzl",
27+
"java_binary",
28+
"java_library",
29+
"java_package_configuration",
30+
"java_plugin",
31+
)
2532
load("@rules_license//rules:license.bzl", "license")
2633

2734
licenses(["notice"]) # Apache License 2.0

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ module(
1717
)
1818

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

4040
TRUTH_VERSION = "1.4.4"
4141

42-
PROTOBUF_JAVA_VERSION = "4.33.0"
42+
PROTOBUF_JAVA_VERSION = "4.33.4"
4343

4444
# Compile only artifacts
4545
[

conformance/src/test/java/dev/cel/conformance/conformance_test.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ This module contains build rules for generating the conformance test targets.
1717
"""
1818

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

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

82-
native.sh_test(
83+
sh_test(
8384
name = name,
8485
size = "small",
8586
srcs = ["//conformance/src/test/java/dev/cel/conformance:conformance_test.sh"],

0 commit comments

Comments
 (0)