diff --git a/MODULE.bazel b/MODULE.bazel index 9c9c72fb991..aa8c8d84601 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -203,5 +203,3 @@ maven.override( switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") switched_rules.use_languages(java = True) - -use_repo(switched_rules, "com_google_googleapis_imports") diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index 46da0f9c2f9..3a0936780a0 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -265,3 +265,13 @@ java_binary( ":examples", ], ) + +# grpc-xds requires some WORKSPACE/MODULE deps that aren't needed by the other +# targets. This just makes sure the example WORKSPACE/MODULE works with +# grpc-xds. +java_library( + name = "test_grpc_xds_compiles", + runtime_deps = [ + "@io_grpc_grpc_java//xds", + ], +) diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index 54438442acc..60bed40f349 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -1,3 +1,4 @@ +bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5") bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.66.0-SNAPSHOT") # CURRENT_GRPC_VERSION 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") @@ -10,6 +11,10 @@ local_path_override( path = "..", ) +switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") + +switched_rules.use_languages(java = True) + maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") use_repo(maven, "maven") diff --git a/examples/WORKSPACE b/examples/WORKSPACE index 9f6a4eff704..170e06a90c7 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -35,6 +35,17 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@envoy_api//bazel:repositories.bzl", "api_dependencies") + +api_dependencies() + +load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") + +switched_rules_by_language( + name = "com_google_googleapis_imports", + java = True, +) + maven_install( artifacts = [ "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24",