Skip to content

Commit 1515388

Browse files
pkoenig10copybara-github
authored andcommitted
Merge #44 by pkoenig10
Upgrade protobuf-java Fixes #31 Follow up to #38. `protobuf-java` 4.28.0 has restored binary compatibility with classes generated using 3.x in protocolbuffers/protobuf#17913. Closes ##44 COPYBARA_INTEGRATE_REVIEW=#44 from pkoenig10:protobuf 24a4999 PiperOrigin-RevId: 672542149 Change-Id: I586ab09c8e48859065a62b5a8a8f094c1a7d81ab
1 parent 1b8f684 commit 1515388

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

maven/tink-java.pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<gson.version>2.10.1</gson.version>
8989
<error_prone_annotations.version>2.22.0</error_prone_annotations.version>
9090
<google-http-client.version>1.43.3</google-http-client.version>
91-
<protobuf-java.version>3.25.3</protobuf-java.version>
91+
<protobuf-java.version>4.28.0</protobuf-java.version>
9292
</properties>
9393

9494
<dependencies>

tink_java_deps.bzl

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
55

66
TINK_MAVEN_ARTIFACTS = [
7-
"com.google.protobuf:protobuf-java:3.25.3",
8-
"com.google.protobuf:protobuf-javalite:3.25.3",
7+
"com.google.protobuf:protobuf-java:4.28.0",
8+
"com.google.protobuf:protobuf-javalite:4.28.0",
99
"androidx.annotation:annotation:1.8.2",
1010
"androidx.test:monitor:1.7.2",
1111
"com.google.api-client:google-api-client:2.2.0",
@@ -39,13 +39,13 @@ def tink_java_deps():
3939
# -------------------------------------------------------------------------
4040
# Protobuf.
4141
# -------------------------------------------------------------------------
42-
# Release from 2024-02-16.
42+
# Release from 2024-08-28.
4343
maybe(
4444
http_archive,
4545
name = "com_google_protobuf",
46-
strip_prefix = "protobuf-25.3",
47-
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.3.zip"],
48-
sha256 = "5156b22536feaa88cf95503153a6b2cd67cc80f20f1218f154b84a12c288a220",
46+
strip_prefix = "protobuf-28.0",
47+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protobuf-28.0.tar.gz"],
48+
sha256 = "13e7749c30bc24af6ee93e092422f9dc08491c7097efa69461f88eb5f61805ce",
4949
)
5050

5151
# -------------------------------------------------------------------------

0 commit comments

Comments
 (0)