Skip to content
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

Jump to bottom

Cherry-picks for 1.14.1 patch release #40

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Cherry-picks for 1.14.1 patch release #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
341c804
Downgrade proto to 3.25.3
morambro Jul 18, 2024
decd0e0
Bump tink-java version to 1.14.1
morambro Jul 18, 2024
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
2 changes: 1 addition & 1 deletion maven/tink-java.pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<gson.version>2.10.1</gson.version>
<error_prone_annotations.version>2.22.0</error_prone_annotations.version>
<google-http-client.version>1.43.3</google-http-client.version>
<protobuf-java.version>4.27.0</protobuf-java.version>
<protobuf-java.version>3.25.3</protobuf-java.version>
</properties>

<dependencies>
Expand Down
20 changes: 7 additions & 13 deletions tink_java_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")

TINK_MAVEN_ARTIFACTS = [
"com.google.protobuf:protobuf-java:4.27.0",
"com.google.protobuf:protobuf-javalite:4.27.0",
"com.google.protobuf:protobuf-java:3.25.3",
"com.google.protobuf:protobuf-javalite:3.25.3",
"androidx.annotation:annotation:1.5.0",
"com.google.api-client:google-api-client:2.2.0",
"com.google.code.findbugs:jsr305:3.0.2",
Expand Down Expand Up @@ -38,19 +38,13 @@ def tink_java_deps():
# -------------------------------------------------------------------------
# Protobuf.
# -------------------------------------------------------------------------
# proto_library, cc_proto_library and java_proto_library rules implicitly
# depend respectively on:
# * @com_google_protobuf//:proto
# * @com_google_protobuf//:cc_toolchain
# * @com_google_protobuf//:java_toolchain
# This statement defines the @com_google_protobuf repo.
# Release May 23rd, 2024.
# Release from 2024-02-16.
maybe(
http_archive,
name = "com_google_protobuf",
strip_prefix = "protobuf-27.0",
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v27.0.zip"],
sha256 = "a7e735f510520b41962d07459f6f5b99dd594c7ed4690bf1191b9924bec094a2",
strip_prefix = "protobuf-25.3",
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.3.zip"],
sha256 = "5156b22536feaa88cf95503153a6b2cd67cc80f20f1218f154b84a12c288a220",
)

# -------------------------------------------------------------------------
Expand Down Expand Up @@ -93,7 +87,7 @@ def tink_java_deps():
# Rules Python.
# -------------------------------------------------------------------------
# Required by protobuf.
# Release from Aug 22, 2023
# Release from 2023-08-22.
maybe(
http_archive,
name = "rules_python",
Expand Down
2 changes: 1 addition & 1 deletion tink_version.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Version of the current release of Tink Java."""
TINK_VERSION_LABEL = "1.14.0"
TINK_VERSION_LABEL = "1.14.1"