From 1a8ddac3794fdd4dc05752fef513d42f1740c863 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 06:58:55 -0700
Subject: [PATCH] Bump protobuf-java from 3.20.1 to 3.21.4 (#3957)

Summary:
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.20.1 to 3.21.4.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/c9869dc7803eb0a21d7e589c40ff4f9288cd34ae"><code>c9869dc</code></a> Updating version.json and repo version numbers to: 21.4</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/c2548258b9e0a6713ae368888628137b1ac50735"><code>c254825</code></a> Reduce the required alignment of ArenaString from 8 to 4 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10298">#10298</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/ddb21b2dffd8f864b517290ad8d1411cd4e68b61"><code>ddb21b2</code></a> Update version.json to: 21.4-dev (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10299">#10299</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/4e7c56cf43634886e3ed7beea8dd0041dabc23db"><code>4e7c56c</code></a> Update developer username in package.xml (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10297">#10297</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/e7835368be17c82689020b6af6d84088c3b19d4e"><code>e783536</code></a> Update the release date in package.xml (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10295">#10295</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/4d2d935f6cd41d3d3cfcab600feb6abfc3a05feb"><code>4d2d935</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10289">#10289</a> from protocolbuffers/21.x-202207202258</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/b1eb1260fce7308081822413a0cba77365e7a6ab"><code>b1eb126</code></a> Updating version.json and repo version numbers to: 21.3</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/00253761b2d5074cb56719c6e5b5fabcab010ad6"><code>0025376</code></a> Upgrade upb and update CHANGES.txt (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10286">#10286</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/c8b4ef27a029831c00eaa3625ca8f37af01f847d"><code>c8b4ef2</code></a> [Bazel] Add back a filegroup for :well_known_protos (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10279">#10279</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/f049e5f02960d3d8b7c4f49f35dca8880636b949"><code>f049e5f</code></a> Update version.json to: 21.3-dev (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10275">#10275</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.20.1...v3.21.4">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.20.1&new-version=3.21.4)](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 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/3957

Reviewed By: passy

Differential Revision: D38315196

Pulled By: LukeDefeo

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

diff --git a/build.gradle b/build.gradle
index 678e7a2b0..a3c608776 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,7 +99,7 @@ ext.deps = [
         okhttp3            : 'com.squareup.okhttp3:okhttp:4.9.3',
         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.20.1',
+        protobuf           : 'com.google.protobuf:protobuf-java:3.21.4',
         testCore           : 'androidx.test:core:1.4.0',
         testRules          : 'androidx.test:rules:1.4.0',
         // Plugin dependencies