Skip to content

Commit dbe275e

Browse files
committed
build: Revert grpc back to 1.76.2 and drop protobuf 4.33 Bazel migrations
1 parent 6ab022a commit dbe275e

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

WORKSPACE

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,6 @@ workspace(name = "gapic_generator_java")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

5-
http_archive(
6-
name = "rules_java",
7-
sha256 = "47632cc506c858011853073449801d648e10483d4b50e080ec2549a4b2398960",
8-
urls = [
9-
"https://github.com/bazelbuild/rules_java/releases/download/8.15.2/rules_java-8.15.2.tar.gz",
10-
],
11-
)
12-
13-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
14-
rules_java_dependencies()
15-
16-
http_archive(
17-
name = "rules_python",
18-
sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
19-
strip_prefix = "rules_python-0.31.0",
20-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
21-
)
22-
23-
load("@rules_python//python:repositories.bzl", "py_repositories")
24-
py_repositories()
255
# gax-java and its transitive dependencies must be imported before
266
# gapic-generator-java dependencies to match the order in googleapis repository,
277
# which in its turn, prioritizes actual generated clients runtime dependencies

sdk-platform-java/gax-java/dependencies.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ version.gax_httpjson=2.76.1-SNAPSHOT
2626
# The protobuf version is only used for generating gradle files for showcase module,
2727
# not for self-service clients (from googleapis project).
2828

29-
version.com_google_protobuf=4.33.2
29+
version.com_google_protobuf=3.25.8
3030
version.google_java_format=1.15.0
31-
version.io_grpc=1.80.0
31+
version.io_grpc=1.76.2
3232

3333
# Maven artifacts.
3434
# Note, the actual name of each property matters (bazel build scripts depend on it).
@@ -74,11 +74,11 @@ maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam
7474
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.58.2
7575
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.47.1
7676
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.47.1
77-
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.26
77+
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.24
7878
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
7979
maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2
8080
maven.org_slf4j_slf4j_api=org.slf4j:slf4j-api:2.0.16
81-
maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:4.33.2
81+
maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:3.25.5
8282

8383
# Testing maven artifacts
8484
maven.junit_junit=junit:junit:4.13.2

sdk-platform-java/gax-java/repositories.bzl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ def com_google_api_gax_java_repositories():
4747
# properties file.
4848

4949
_protobuf_version = PROPERTIES["version.com_google_protobuf"]
50-
_protobuf_source_tag = _protobuf_version[2:] if _protobuf_version.startswith("4.") else _protobuf_version
51-
_protobuf_version_in_link = "v%s" % _protobuf_source_tag
50+
_protobuf_version_in_link = "v%s" % _protobuf_version
5251
_maybe(
5352
http_archive,
5453
name = "com_google_protobuf",
5554
urls = ["https://github.com/protocolbuffers/protobuf/archive/%s.zip" % _protobuf_version_in_link],
56-
strip_prefix = "protobuf-%s" % _protobuf_source_tag,
55+
strip_prefix = "protobuf-%s" % _protobuf_version,
5756
)
5857

5958
_grpc_version = PROPERTIES["version.io_grpc"]

0 commit comments

Comments
 (0)