Skip to content

Bump protobuf-java and protobuf-java-util from 4.31.1 to 4.33.1 #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nico-semko wants to merge 1 commit into from
+6,998 −12
Closed

Bump protobuf-java and protobuf-java-util from 4.31.1 to 4.33.1 #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True)
rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
use_repo(rules_java_toolchains, "remote_java_tools")

bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
# Note: This upgrade requires bazel_worker_java to be updated to use protobuf 4.33.1
# The current published version (0.0.4) uses protobuf 31.1, which causes Maven dependency
# conflicts when both modules contribute to @maven. Once bazel_worker_java is released
# with protobuf 4.33.1, this should resolve automatically.
proto_version = "4.33.1"

proto_version_parts = proto_version.split(".")

proto_module_version = ".".join(proto_version_parts[-2:]) # Last 2 parts

bazel_dep(name = "protobuf", version = proto_module_version, repo_name = "com_google_protobuf")
bazel_dep(name = "rules_jvm_external", version = "6.6")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
Expand Down Expand Up @@ -79,8 +89,8 @@ maven.install(
# These technically aren't needed, but the protobuf version pulled
# in by these older deps has compatibility issues with the newer
# protobuf runtimes.
"com.google.protobuf:protobuf-java:4.31.1",
"com.google.protobuf:protobuf-java-util:4.31.1",
"com.google.protobuf:protobuf-java:{}".format(proto_version),
"com.google.protobuf:protobuf-java-util:{}".format(proto_version),
],
repositories = [
"https://maven.google.com",
Expand Down Expand Up @@ -117,8 +127,8 @@ maven.install(
"jakarta.inject:jakarta.inject-api:2.0.1",
"junit:junit:4.13.2",
"com.beust:jcommander:1.82",
"com.google.protobuf:protobuf-java:4.31.1",
"com.google.protobuf:protobuf-java-util:4.31.1",
"com.google.protobuf:protobuf-java:{}".format(proto_version),
"com.google.protobuf:protobuf-java-util:{}".format(proto_version),
"com.google.code.findbugs:jsr305:3.0.2",
"androidx.databinding:databinding-compiler:8.7.0",
"org.ow2.asm:asm:9.6",
Expand Down
18 changes: 11 additions & 7 deletions defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")

# keep in sync with MODULE.bazel and `proto_version` variable there.
proto_version = "4.33.1"

def rules_android_workspace():
""" Sets up workspace dependencies for rules_android."""

Expand Down Expand Up @@ -57,8 +60,8 @@ def rules_android_workspace():
# These technically aren't needed, but the protobuf version pulled
# in by these older deps has compatibility issues with the newer
# protobuf runtimes.
"com.google.protobuf:protobuf-java:4.31.1",
"com.google.protobuf:protobuf-java-util:4.31.1",
"com.google.protobuf:protobuf-java:{}".format(proto_version),
"com.google.protobuf:protobuf-java-util:{}".format(proto_version),
],
repositories = [
"https://maven.google.com",
Expand Down Expand Up @@ -94,8 +97,8 @@ def rules_android_workspace():
"jakarta.inject:jakarta.inject-api:2.0.1",
"junit:junit:4.13.2",
"com.beust:jcommander:1.82",
"com.google.protobuf:protobuf-java:4.31.1",
"com.google.protobuf:protobuf-java-util:4.31.1",
"com.google.protobuf:protobuf-java:{}".format(proto_version),
"com.google.protobuf:protobuf-java-util:{}".format(proto_version),
"com.google.code.findbugs:jsr305:3.0.2",
"androidx.databinding:databinding-compiler:8.7.0",
"org.ow2.asm:asm:9.6",
Expand Down Expand Up @@ -145,12 +148,13 @@ def rules_android_workspace():
# All lines in the artifacts list must be tagged "bazel worker api" for
# the presubmit maven artifact consistency checker to pass.
name = "maven",
artifacts = [ # bazel worker api
artifacts = [
# bazel worker api
"com.google.code.gson:gson:2.10.1", # bazel worker api
"com.google.errorprone:error_prone_annotations:2.23.0", # bazel worker api
"com.google.guava:guava:33.0.0-jre", # bazel worker api
"com.google.protobuf:protobuf-java:4.27.2", # bazel worker api
"com.google.protobuf:protobuf-java-util:4.27.2", # bazel worker api
"com.google.protobuf:protobuf-java:{}".format(proto_version), # bazel worker api
"com.google.protobuf:protobuf-java-util:{}".format(proto_version), # bazel worker api
"junit:junit:4.13.2", # bazel worker api
"org.mockito:mockito-core:5.4.0", # bazel worker api
"com.google.truth:truth:1.4.0", # bazel worker api
Expand Down
Loading