From 7ccd853440405bcc4a3383573216a973bb2f76a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 02:55:22 -0700
Subject: [PATCH] Bump protobuf-java from 3.21.5 to 3.21.6 (#4116)

Summary:
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.21.5 to 3.21.6.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb"><code>24487dd</code></a> Updating version.json and repo version numbers to: 21.6</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/d88266c319e42650344f3c5df3a0feecc7865fb5"><code>d88266c</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10545">#10545</a> from deannagarcia/21.x</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/cd0ee8f45d0d749a1e4deb9847e53efb62c04d7b"><code>cd0ee8f</code></a> Apply patch</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/ea2f20498e2853a58875f247b06edcb567ccd86b"><code>ea2f204</code></a> Uninstall system protobuf to prevent version conflicts (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10522">#10522</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/aafacb09c75d521b11500970827214f2247dd4aa"><code>aafacb0</code></a> Remove broken use_bazel.sh (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10511">#10511</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/40847c7ee5848f41c505a1ece1f27ec4a687837b"><code>40847c7</code></a> Fix Kokoro tests to work on Monterey machines (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10473">#10473</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/2fb33f46a6cf6dc20fb76edef7e00162b5eedb44"><code>2fb33f4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10382">#10382</a> from protocolbuffers/21.x-202208092202</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/29f03e04d3f72b1749b1bf720183b0fb9b6b7d69"><code>29f03e0</code></a> Update version.json to: 21.6-dev</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/638779f353731a0a04496bde20d14164684c3d93"><code>638779f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/10380">#10380</a> from protocolbuffers/21.x-202208091710</li>
<li>See full diff in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.21.5...v3.21.6">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.21.5&new-version=3.21.6)](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/4116

Reviewed By: antonk52

Differential Revision: D39933610

Pulled By: antonk52

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

diff --git a/build.gradle b/build.gradle
index 77e5107eb..921ea79fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,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.21.5',
+        protobuf           : 'com.google.protobuf:protobuf-java:3.21.6',
         testCore           : 'androidx.test:core:1.4.0',
         testRules          : 'androidx.test:rules:1.4.0',
         // Plugin dependencies