Skip to content

Commit 0e83dda

Browse files
l46kokcopybara-github
authored andcommitted
Upgrade protobuf-java version to 4.31.0
PiperOrigin-RevId: 762421275
1 parent cad23d1 commit 0e83dda

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ build --java_language_version=11
66
# Hide Java 8 deprecation warnings.
77
common --javacopt=-Xlint:-options
88

9-
# MacOS Fix https://github.com/protocolbuffers/protobuf/issues/16944
10-
build --host_cxxopt=-std=c++14
11-
build --cxxopt=-std=c++14

WORKSPACE

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ register_toolchains("//:repository_default_toolchain_definition")
1818

1919
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
2020

21-
# Load license rules.
22-
# Must be loaded first due to https://github.com/bazel-contrib/rules_jvm_external/issues/1244
23-
24-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2521
http_archive(
2622
name = "rules_license",
2723
urls = [
@@ -71,7 +67,7 @@ http_archive(
7167
http_archive(
7268
name = "com_google_protobuf",
7369
sha256 = "008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e",
74-
strip_prefix = "protobuf-29.3",
70+
strip_prefix = "protobuf-29.3", # See https://github.com/bazelbuild/rules_android/issues/373
7571
urls = ["https://github.com/protocolbuffers/protobuf/archive/v29.3.tar.gz"],
7672
)
7773

@@ -132,8 +128,8 @@ maven_install(
132128
"com.google.auto.value:auto-value-annotations:1.11.0",
133129
"com.google.guava:guava:33.4.0-jre",
134130
"com.google.guava:guava-testlib:33.4.0-jre",
135-
"com.google.protobuf:protobuf-java:4.29.3",
136-
"com.google.protobuf:protobuf-java-util:4.29.3",
131+
"com.google.protobuf:protobuf-java:4.31.0",
132+
"com.google.protobuf:protobuf-java-util:4.31.0",
137133
"com.google.re2j:re2j:1.8",
138134
"info.picocli:picocli:4.7.6",
139135
"org.antlr:antlr4-runtime:" + ANTLR4_VERSION,
@@ -162,7 +158,7 @@ maven_install(
162158
# keep sorted
163159
artifacts = [
164160
"com.google.guava:guava:33.4.0-android",
165-
"com.google.protobuf:protobuf-javalite:4.29.3",
161+
"com.google.protobuf:protobuf-javalite:4.31.0",
166162
],
167163
repositories = [
168164
"https://maven.google.com",

0 commit comments

Comments
 (0)