From b908ab50ac0a4d2f44ca3f5b56c07fdcbb03b976 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Nov 2023 07:05:56 -0800
Subject: [PATCH] Bump com.google.protobuf:protobuf-java from 3.23.4 to 3.25.1
 (#5300)

Summary:
Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.23.4 to 3.25.1.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/7f94235e552599141950d7a4a3eaf93bc87d1b22"><code>7f94235</code></a> Updating version.json and repo version numbers to: 25.1</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/e4b00c75ecbc40389615ddf5482dbabc3a354eea"><code>e4b00c7</code></a> Add support for extensions in CRuby, JRuby, and FFI Ruby (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14703">#14703</a>) (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14756">#14756</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/2495d4f96bf4edcc4f770ceb27ae98c71a56fcdb"><code>2495d4f</code></a> Add support for options in CRuby, JRuby and FFI (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14594">#14594</a>) (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14739">#14739</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/a29f47df0ffb54ec96714ba2d041eee2902b608c"><code>a29f47d</code></a> Bump mac PHP version to 8.2 to fix non-hermetic breakages. (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14741">#14741</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/f36432a6d11948f0fbb826d51460f3f568802d5c"><code>f36432a</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14674">#14674</a> from anandolee/25.x</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/74f5cf4106d7bcdd4612caed9f85af5096f4a390"><code>74f5cf4</code></a> Raise warnings for python syntax usages</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/edb1afd0490d202d78eb0e8a275fef72077a3eae"><code>edb1afd</code></a> Move python/BUILD to python/BUILD.bazel (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14658">#14658</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/666689e0f7ce71fa01d7641ac39ae5e2cd2e72a9"><code>666689e</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14620">#14620</a> from protocolbuffers/win2019-25.x</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/1577c305cf0928b4b29433812a4dfcb26d37249d"><code>1577c30</code></a> Error on staleness failure</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/1155c804efe5457071b813ca9cc17c7535e7ba09"><code>1155c80</code></a> Update <code>cc_file_list_aspect</code> to handle targets with missing <code>hdrs/textual_hdrs</code></li>
<li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.23.4...v3.25.1">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.protobuf:protobuf-java&package-manager=gradle&previous-version=3.23.4&new-version=3.25.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

 ---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `dependabot rebase` will rebase this PR
- `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `dependabot merge` will merge this PR after your CI passes on it
- `dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `dependabot cancel merge` will cancel a previously requested merge and block automerging
- `dependabot reopen` will reopen this PR if it is closed
- `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>

Pull Request resolved: https://github.com/facebook/flipper/pull/5300

Reviewed By: antonk52

Differential Revision: D51525558

Pulled By: passy

fbshipit-source-id: df9f980c75af74e622cc3a899c5a53684ffd8b90
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 48fc54c05..a30924ed0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,7 +109,7 @@ ext.deps = [
         okhttp3            : 'com.squareup.okhttp3:okhttp:4.11.0',
         leakcanary         : 'com.squareup.leakcanary:leakcanary-android:1.6.3',
         leakcanary2        : 'com.squareup.leakcanary:leakcanary-android:2.8.1',
-        protobuf           : 'com.google.protobuf:protobuf-java:3.23.4',
+        protobuf           : 'com.google.protobuf:protobuf-java:3.25.1',
         testCore           : 'androidx.test:core:1.4.0',
         testRules          : 'androidx.test:rules:1.5.0',
         // Plugin dependencies