From 36e687f9d9da447c5f94dd95c149fd462c3fb7f1 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Mon, 22 Jul 2024 12:58:21 -0700
Subject: [PATCH] examples: Add bzlmod support

This also updates the version number of the grpc-java module as part of
the release process.
---
 .github/workflows/testing.yml | 10 ++++++++++
 MODULE.bazel                  |  2 +-
 RELEASING.md                  |  2 ++
 examples/MODULE.bazel         | 24 ++++++++++++++++++++++++
 examples/WORKSPACE.bzlmod     |  1 +
 5 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 examples/MODULE.bazel
 create mode 100644 examples/WORKSPACE.bzlmod

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index fb44d36cfb2..bc5a175906f 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -97,7 +97,17 @@ jobs:
     - name: Run bazel build
       run: bazelisk build //... --enable_bzlmod=false
 
+    - name: Run example bazel build
+      run: bazelisk build //... --enable_bzlmod=false
+      working-directory: ./examples
+
     - name: Run bazel build (bzlmod)
       env:
         USE_BAZEL_VERSION: 7.0.0
       run: bazelisk build //... --enable_bzlmod=true
+
+    - name: Run example bazel build (bzlmod)
+      env:
+        USE_BAZEL_VERSION: 7.0.0
+      run: bazelisk build //... --enable_bzlmod=true
+      working-directory: ./examples
diff --git a/MODULE.bazel b/MODULE.bazel
index 9bf2389a2ca..9c9c72fb991 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -2,7 +2,7 @@ module(
     name = "grpc-java",
     compatibility_level = 0,
     repo_name = "io_grpc_grpc_java",
-    version = "0",
+    version = "1.66.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
 )
 
 # GRPC_DEPS_START
diff --git a/RELEASING.md b/RELEASING.md
index efa291804a5..bb1b77d0557 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -18,8 +18,10 @@ them before continuing, and set them again when resuming.
 ```bash
 MAJOR=1 MINOR=7 PATCH=0 # Set appropriately for new release
 VERSION_FILES=(
+  MODULE.bazel
   build.gradle
   core/src/main/java/io/grpc/internal/GrpcUtil.java
+  examples/MODULE.bazel
   examples/build.gradle
   examples/pom.xml
   examples/android/clientcache/app/build.gradle
diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
new file mode 100644
index 00000000000..54438442acc
--- /dev/null
+++ b/examples/MODULE.bazel
@@ -0,0 +1,24 @@
+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")
+bazel_dep(name = "rules_jvm_external", version = "6.0")
+bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
+
+# Do not use this override in your own MODULE.bazel. Use a version from BCR
+local_path_override(
+    module_name = "grpc-java",
+    path = "..",
+)
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+use_repo(maven, "maven")
+
+maven.install(
+    artifacts = [
+        "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24",
+        "com.google.api.grpc:proto-google-cloud-pubsub-v1:0.1.24",
+    ],
+    repositories = ["https://repo.maven.apache.org/maven2/"],
+    strict_visibility = True,
+)
diff --git a/examples/WORKSPACE.bzlmod b/examples/WORKSPACE.bzlmod
new file mode 100644
index 00000000000..4ecb9e5d985
--- /dev/null
+++ b/examples/WORKSPACE.bzlmod
@@ -0,0 +1 @@
+# When using bzlmod this makes sure nothing from the legacy WORKSPACE is loaded