Skip to content

Commit 5c45048

Browse files
committed
Upgrade protobuf to 34.1
1 parent 71ea32a commit 5c45048

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

MODULE.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
1515
rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
1616
use_repo(rules_java_toolchains, "remote_java_tools")
1717

18-
bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
18+
bazel_dep(name = "protobuf", version = "34.1", repo_name = "com_google_protobuf")
1919
bazel_dep(name = "rules_jvm_external", version = "6.9")
2020
bazel_dep(name = "bazel_skylib", version = "1.8.1")
2121
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
@@ -78,8 +78,8 @@ maven.install(
7878
# These technically aren't needed, but the protobuf version pulled
7979
# in by these older deps has compatibility issues with the newer
8080
# protobuf runtimes.
81-
"com.google.protobuf:protobuf-java:4.33.4",
82-
"com.google.protobuf:protobuf-java-util:4.33.4",
81+
"com.google.protobuf:protobuf-java:4.34.1",
82+
"com.google.protobuf:protobuf-java-util:4.34.1",
8383
],
8484
repositories = [
8585
"https://maven.google.com",
@@ -117,8 +117,8 @@ maven.install(
117117
"jakarta.inject:jakarta.inject-api:2.0.1",
118118
"junit:junit:4.13.2",
119119
"com.beust:jcommander:1.82",
120-
"com.google.protobuf:protobuf-java:4.33.4",
121-
"com.google.protobuf:protobuf-java-util:4.33.4",
120+
"com.google.protobuf:protobuf-java:4.34.1",
121+
"com.google.protobuf:protobuf-java-util:4.34.1",
122122
"com.google.code.findbugs:jsr305:3.0.2",
123123
"androidx.databinding:databinding-compiler:8.7.0",
124124
"org.ow2.asm:asm:9.6",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
4646
rules_java_dependencies()
4747
# note that the following line is what is minimally required from protobuf for the java rules
4848
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
49-
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
49+
load("@com_google_protobuf//bazel/private/oss:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
5050
proto_bazel_features(name = "proto_bazel_features")
5151
# register toolchains
5252
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rules_java_dependencies()
1717

1818
# note that the following line is what is minimally required from protobuf for the java rules
1919
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
20-
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
20+
load("@com_google_protobuf//bazel/private/oss:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
2121

2222
proto_bazel_features(name = "proto_bazel_features")
2323

defs.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ def rules_android_workspace():
5757
# These technically aren't needed, but the protobuf version pulled
5858
# in by these older deps has compatibility issues with the newer
5959
# protobuf runtimes.
60-
"com.google.protobuf:protobuf-java:4.33.4",
61-
"com.google.protobuf:protobuf-java-util:4.33.4",
60+
"com.google.protobuf:protobuf-java:4.34.1",
61+
"com.google.protobuf:protobuf-java-util:4.34.1",
6262
],
6363
repositories = [
6464
"https://maven.google.com",
@@ -94,8 +94,8 @@ def rules_android_workspace():
9494
"jakarta.inject:jakarta.inject-api:2.0.1",
9595
"junit:junit:4.13.2",
9696
"com.beust:jcommander:1.82",
97-
"com.google.protobuf:protobuf-java:4.33.4",
98-
"com.google.protobuf:protobuf-java-util:4.33.4",
97+
"com.google.protobuf:protobuf-java:4.34.1",
98+
"com.google.protobuf:protobuf-java-util:4.34.1",
9999
"com.google.code.findbugs:jsr305:3.0.2",
100100
"androidx.databinding:databinding-compiler:8.7.0",
101101
"org.ow2.asm:asm:9.6",
@@ -150,8 +150,8 @@ def rules_android_workspace():
150150
"com.google.code.gson:gson:2.10.1", # bazel worker api
151151
"com.google.errorprone:error_prone_annotations:2.23.0", # bazel worker api
152152
"com.google.guava:guava:33.0.0-jre", # bazel worker api
153-
"com.google.protobuf:protobuf-java:4.33.4", # bazel worker api
154-
"com.google.protobuf:protobuf-java-util:4.33.4", # bazel worker api
153+
"com.google.protobuf:protobuf-java:4.34.1", # bazel worker api
154+
"com.google.protobuf:protobuf-java-util:4.34.1", # bazel worker api
155155
"junit:junit:4.13.2", # bazel worker api
156156
"org.mockito:mockito-core:5.4.0", # bazel worker api
157157
"com.google.truth:truth:1.4.0", # bazel worker api

examples/basicapp/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rules_java_dependencies()
2121

2222
# note that the following line is what is minimally required from protobuf for the java rules
2323
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
24-
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
24+
load("@com_google_protobuf//bazel/private/oss:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
2525
proto_bazel_features(name = "proto_bazel_features")
2626
# register toolchains
2727
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")

prereqs.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def rules_android_prereqs(dev_mode = False):
6363
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG),
6464
)
6565

66-
PROTOBUF_VERSION = "33.4"
67-
PROTOBUF_HASH = "bc670a4e34992c175137ddda24e76562bb928f849d712a0e3c2fb2e19249bea1"
66+
PROTOBUF_VERSION = "34.1"
67+
PROTOBUF_HASH = "e4e6ff10760cf747a2decd1867741f561b216bd60cc4038c87564713a6da1848"
6868
maybe(
6969
http_archive,
7070
name = "com_google_protobuf",

0 commit comments

Comments
 (0)