Update google-cloud-spanner to 6.23.3.

This also updates related dependencies, including a workaround for grpc/grpc-java#9149.

build/cloud_spanner_emulator/defs.bzl

@@ -41,6 +41,6 @@ _cloud_spanner_emulator_binaries = repository_rule(
 def cloud_spanner_emulator_binaries():
     _cloud_spanner_emulator_binaries(
         name = "cloud_spanner_emulator",
-        sha256 = "7a3cdd5db7f5a427230ab67a8dc09cfcb6752dd7f0b28d51e8d08150b2641506",
-        version = "1.1.1",
+        sha256 = "7048efb8708e0b2af98d84c9bd86ecb158b5663116c5dea789974d6a616f0e12",
+        version = "1.4.2",
     )

build/com_github_grpc_grpc/repo.bzl

@@ -22,7 +22,7 @@ def com_github_grpc_grpc_repo():
     if "com_github_grpc_grpc" not in native.existing_rules():
         http_archive(
             name = "com_github_grpc_grpc",
-            sha256 = "8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a",
-            strip_prefix = "grpc-1.36.4",
-            urls = ["https://github.com/grpc/grpc/archive/v1.36.4.tar.gz"],
+            sha256 = "67423a4cd706ce16a88d1549297023f0f9f0d695a96dd684adc21e67b021f9bc",
+            strip_prefix = "grpc-1.46.0",
+            urls = ["https://github.com/grpc/grpc/archive/v1.46.0.tar.gz"],
         )

build/com_github_grpc_grpc_kotlin/repo.bzl

@@ -29,8 +29,7 @@ def com_github_grpc_grpc_kotlin_repo():
     if "io_grpc_grpc_java" not in native.existing_rules():
         http_archive(
             name = "io_grpc_grpc_java",
-            sha256 = "85927f857e0b3ad5c4e51c2e6d29213d3e0319f20784aa2113552f71311ba74c",
-            # Latest compatible version per https://github.com/grpc/grpc-kotlin/blob/v1.2.1/compiler/README.md
-            strip_prefix = "grpc-java-1.39.0",
-            url = "https://github.com/grpc/grpc-java/archive/refs/tags/v1.39.0.tar.gz",
+            sha256 = "c1b80883511ceb1e433fb2d4b2f6d85dca0c62a265a6a3e6695144610d6f65b8",
+            strip_prefix = "grpc-java-1.46.0",
+            url = "https://github.com/grpc/grpc-java/archive/refs/tags/v1.46.0.tar.gz",
         )

build/common_jvm_deps.bzl

@@ -24,20 +24,18 @@ load("//build/io_bazel_rules_kotlin:deps.bzl", "rules_kotlin_deps")
 load("//build/io_bazel_rules_docker:base_images.bzl", "base_java_images")
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
-load("//build/io_bazel_rules_go:deps.bzl", "rules_go_deps")
 load("@tink_java//:tink_java_deps.bzl", "tink_java_deps")
 
 def common_jvm_deps():
     """
     Adds all external repos necessary for common-jvm.
     """
+    grpc_deps()
     container_repositories()
     rules_kotlin_deps()
     base_java_images()
-    grpc_deps()
     switched_rules_by_language(
         name = "com_google_googleapis_imports",
         java = True,
     )
-    rules_go_deps()
     tink_java_deps()

build/common_jvm_extra_deps.bzl

@@ -30,9 +30,9 @@ def common_jvm_extra_deps():
     """
     Adds all external repos necessary for common-jvm.
     """
+    grpc_extra_deps()
     compat_repositories()
     container_deps()
     java_image_repositories()
-    grpc_extra_deps()
     grpc_kt_repositories()
     grpc_java_repositories()

build/common_jvm_maven.bzl

@@ -58,11 +58,10 @@ def common_jvm_maven_artifacts():
     # or default dependency versions).
     maven_artifacts.update({
         "com.adobe.testing:s3mock-junit4": "2.2.3",
-        "com.google.api:gax-grpc": "2.12.2",
-        "com.google.api.grpc:grpc-core-proto": "0.0.6",
-        "com.google.cloud:google-cloud-bigquery": "2.4.1",
-        "com.google.cloud:google-cloud-nio": "0.123.10",
-        "com.google.cloud:google-cloud-spanner": "3.0.3",
+        "com.google.cloud:google-cloud-bigquery": "2.10.10",
+        "com.google.cloud:google-cloud-nio": "0.123.28",
+        "com.google.cloud:google-cloud-spanner": "6.23.3",
+        "com.google.cloud:google-cloud-storage": "2.6.1",
         "com.google.guava:guava": "31.0.1-jre",
         "info.picocli:picocli": "4.4.0",
         "junit:junit": "4.13",

build/common_jvm_repositories.bzl

@@ -30,7 +30,6 @@ load(
     "//build/io_bazel_rules_kotlin:repo.bzl",
     "rules_kotlin_repo",
 )
-load("//build/io_bazel_rules_go:repo.bzl", "rules_go_repo")
 load("//build/tink:repo.bzl", "tink_java")
 
 def common_jvm_repositories():
@@ -48,5 +47,4 @@ def common_jvm_repositories():
     grpc_health_probe_repo()
     rules_docker_repo()
     com_google_googleapis_repo()
-    rules_go_repo()
     tink_java()

imports/java/com/google/type/BUILD.bazel

@@ -0,0 +1,6 @@
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "type_java_proto",
+    actual = "@com_google_googleapis//google/type:type_java_proto",
+)

src/main/kotlin/org/wfanet/measurement/gcloud/common/BUILD.bazel

@@ -9,9 +9,9 @@ kt_jvm_library(
     srcs = glob(["*.kt"]),
     deps = [
         "//imports/java/com/google/api/core",
-        "//imports/java/com/google/api/grpc",
         "//imports/java/com/google/cloud:core",
         "//imports/java/com/google/protobuf",
+        "//imports/java/com/google/type:type_java_proto",
         "//imports/kotlin/kotlinx/coroutines:core",
     ],
 )

src/main/kotlin/org/wfanet/measurement/gcloud/spanner/BUILD.bazel

@@ -7,6 +7,7 @@ package(default_visibility = ["//visibility:public"])
 kt_jvm_library(
     name = "spanner",
     srcs = glob(["*.kt"]),
+    resources = ["//src/main/resources/META-INF/services:grpclb"],
     deps = [
         "//imports/java/com/google/cloud/spanner",
         "//imports/java/picocli",

src/main/resources/META-INF/services/BUILD.bazel

@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+# TODO(grpc/grpc-java#9149): Remove once @io_grpc_grpc_java//grpclb contains
+# these resources.
+filegroup(
+    name = "grpclb",
+    srcs = glob(["io.grpc.*"]),
+)

src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider

@@ -0,0 +1 @@
+io.grpc.grpclb.GrpclbLoadBalancerProvider

src/main/resources/META-INF/services/io.grpc.NameResolverProvider

@@ -0,0 +1 @@
+io.grpc.grpclb.SecretGrpclbNameResolverProvider$Provider