From d8eb4fa776d3ddce31ab293a0b1588df6bd91cd1 Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Tue, 22 Jul 2025 14:27:01 -0400 Subject: [PATCH 1/6] Make grpc-java work with bazel HEAD Symbols such as java_* and ProtoInfo now must be loaded from their starlark equivalents. --- api/BUILD.bazel | 1 + context/BUILD.bazel | 2 ++ core/BUILD.bazel | 1 + java_grpc_library.bzl | 1 + netty/BUILD.bazel | 1 + protobuf-lite/BUILD.bazel | 1 + protobuf/BUILD.bazel | 1 + stub/BUILD.bazel | 1 + util/BUILD.bazel | 1 + 9 files changed, 10 insertions(+) diff --git a/api/BUILD.bazel b/api/BUILD.bazel index 965d14a9eb0..baa90c6a6e3 100644 --- a/api/BUILD.bazel +++ b/api/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/context/BUILD.bazel b/context/BUILD.bazel index d0c4b04ce00..43fcd6997c4 100644 --- a/context/BUILD.bazel +++ b/context/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_java//java:java_library.bzl", "java_library") + java_library( name = "context", visibility = ["//visibility:public"], diff --git a/core/BUILD.bazel b/core/BUILD.bazel index 6dd5199b5c0..878610e0c6a 100644 --- a/core/BUILD.bazel +++ b/core/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl index e7d133a2769..9ed1f58202b 100644 --- a/java_grpc_library.bzl +++ b/java_grpc_library.bzl @@ -1,5 +1,6 @@ """Build rule for java_grpc_library.""" +load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo") load("@rules_java//java:defs.bzl", "JavaInfo", "JavaPluginInfo", "java_common") _JavaRpcToolchainInfo = provider( diff --git a/netty/BUILD.bazel b/netty/BUILD.bazel index 52fdcb19fd8..3a868b77822 100644 --- a/netty/BUILD.bazel +++ b/netty/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel index dad794e8b58..28dd20db2b4 100644 --- a/protobuf-lite/BUILD.bazel +++ b/protobuf-lite/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel index 02a136554d2..17dd2a34660 100644 --- a/protobuf/BUILD.bazel +++ b/protobuf/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/stub/BUILD.bazel b/stub/BUILD.bazel index 692ebd6059f..0778e257e65 100644 --- a/stub/BUILD.bazel +++ b/stub/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/util/BUILD.bazel b/util/BUILD.bazel index 8fb00e21d56..088e1f5d134 100644 --- a/util/BUILD.bazel +++ b/util/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_java//java:java_library.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( From e719c0f3ee600718cd3107a9136d8688e7e4d259 Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Tue, 22 Jul 2025 15:07:59 -0400 Subject: [PATCH 2/6] Update rules_java --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index ed027757e86..f2a14fc1e03 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -55,7 +55,7 @@ bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.b bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58") bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "5.3.5") +bazel_dep(name = "rules_java", version = "8.14.0") bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0") bazel_dep(name = "rules_jvm_external", version = "6.0") bazel_dep(name = "rules_proto", version = "5.3.0-21.7") From d67a992bcc386a9040f65c70f419075c1ad2b6a4 Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Tue, 22 Jul 2025 15:11:42 -0400 Subject: [PATCH 3/6] Update rules_java for WORKSPACE --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7bbfbcc5fa3..c953eaf92ee 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_java", - url = "https://github.com/bazelbuild/rules_java/releases/download/5.3.5/rules_java-5.3.5.tar.gz", - sha256 = "c73336802d0b4882e40770666ad055212df4ea62cfa6edf9cb0f9d29828a0934", + url = "https://github.com/bazelbuild/rules_java/releases/download/8.14.0/rules_java-8.14.0.tar.gz", + sha256 = "bbe7d94360cc9ed4607ec5fd94995fd1ec41e84257020b6f09e64055281ecb12", ) http_archive( From e076f9eed65d3abd29e08357213288a68f73a68e Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Tue, 22 Jul 2025 15:11:55 -0400 Subject: [PATCH 4/6] Revert "Update rules_java for WORKSPACE" This reverts commit d67a992bcc386a9040f65c70f419075c1ad2b6a4. --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c953eaf92ee..7bbfbcc5fa3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_java", - url = "https://github.com/bazelbuild/rules_java/releases/download/8.14.0/rules_java-8.14.0.tar.gz", - sha256 = "bbe7d94360cc9ed4607ec5fd94995fd1ec41e84257020b6f09e64055281ecb12", + url = "https://github.com/bazelbuild/rules_java/releases/download/5.3.5/rules_java-5.3.5.tar.gz", + sha256 = "c73336802d0b4882e40770666ad055212df4ea62cfa6edf9cb0f9d29828a0934", ) http_archive( From e183b61fd9a0970f99ec2d07c369a0e1253ed155 Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Tue, 22 Jul 2025 15:12:03 -0400 Subject: [PATCH 5/6] Revert "Update rules_java" This reverts commit e719c0f3ee600718cd3107a9136d8688e7e4d259. --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index f2a14fc1e03..ed027757e86 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -55,7 +55,7 @@ bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.b bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58") bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "8.14.0") +bazel_dep(name = "rules_java", version = "5.3.5") bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0") bazel_dep(name = "rules_jvm_external", version = "6.0") bazel_dep(name = "rules_proto", version = "5.3.0-21.7") From d6e1874ad9b5aab8b0a19842ab12015c3f0e521f Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Tue, 22 Jul 2025 15:14:19 -0400 Subject: [PATCH 6/6] Load defs.bzl instead of java_library.bzl --- api/BUILD.bazel | 2 +- context/BUILD.bazel | 2 +- core/BUILD.bazel | 2 +- netty/BUILD.bazel | 2 +- protobuf-lite/BUILD.bazel | 2 +- protobuf/BUILD.bazel | 2 +- stub/BUILD.bazel | 2 +- util/BUILD.bazel | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/BUILD.bazel b/api/BUILD.bazel index baa90c6a6e3..4c5e750b5e4 100644 --- a/api/BUILD.bazel +++ b/api/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/context/BUILD.bazel b/context/BUILD.bazel index 43fcd6997c4..0a51dca24a9 100644 --- a/context/BUILD.bazel +++ b/context/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") java_library( name = "context", diff --git a/core/BUILD.bazel b/core/BUILD.bazel index 878610e0c6a..1a743ff9eda 100644 --- a/core/BUILD.bazel +++ b/core/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/netty/BUILD.bazel b/netty/BUILD.bazel index 3a868b77822..8253d1f5bff 100644 --- a/netty/BUILD.bazel +++ b/netty/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel index 28dd20db2b4..97a5e492d80 100644 --- a/protobuf-lite/BUILD.bazel +++ b/protobuf-lite/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel index 17dd2a34660..a31f8b6f6f5 100644 --- a/protobuf/BUILD.bazel +++ b/protobuf/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/stub/BUILD.bazel b/stub/BUILD.bazel index 0778e257e65..f9188c27272 100644 --- a/stub/BUILD.bazel +++ b/stub/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library( diff --git a/util/BUILD.bazel b/util/BUILD.bazel index 088e1f5d134..32d5a367b95 100644 --- a/util/BUILD.bazel +++ b/util/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_java//java:java_library.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm_external//:defs.bzl", "artifact") java_library(