From 747340b3f981db1a324eaab1ee078d288376d229 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 16:16:19 +0000
Subject: [PATCH] [camera]: Bump com.google.guava:guava from 32.0.1-android to
 33.2.1-android and CameraX version to 1.3.4 in
 /packages/camera/camera_android_camerax/android (#6847)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.0.1-android to 33.2.1-android and CameraX version to 1.3.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/google/guava/releases">com.google.guava:guava's releases</a>.</em></p>
<blockquote>
<h2>33.2.1</h2>
<pre lang="xml"><code>&lt;dependency&gt;
  &lt;groupId&gt;com.google.guava&lt;/groupId&gt;
  &lt;artifactId&gt;guava&lt;/artifactId&gt;
  &lt;version&gt;33.2.1-jre&lt;/version&gt;
  &lt;!-- or, for Android: --&gt;
  &lt;version&gt;33.2.1-android&lt;/version&gt;
&lt;/dependency&gt;
</code></pre>
<h3>Jar files</h3>
<ul>
<li><a href="https://repo1.maven.org/maven2/com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.jar">33.2.1-jre.jar</a></li>
<li><a href="https://repo1.maven.org/maven2/com/google/guava/guava/33.2.1-android/guava-33.2.1-android.jar">33.2.1-android.jar</a></li>
</ul>
<p>Guava requires <a href="https://github.com/google/guava/wiki/UseGuavaInYourBuild#what-about-guavas-own-dependencies">one runtime dependency</a>, which you can download here:</p>
<ul>
<li><a href="https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar">failureaccess-1.0.1.jar</a></li>
</ul>
<h3>Javadoc</h3>
<ul>
<li><a href="https://guava.dev/releases/33.2.1-jre/api/docs/">33.2.1-jre</a></li>
<li><a href="https://guava.dev/releases/33.2.1-android/api/docs/">33.2.1-android</a></li>
</ul>
<h3>JDiff</h3>
<ul>
<li><a href="https://guava.dev/releases/33.2.1-jre/api/diffs/">33.2.1-jre vs. 33.2.0-jre</a></li>
<li><a href="https://guava.dev/releases/33.2.1-android/api/diffs/">33.2.1-android vs. 33.2.0-android</a></li>
<li><a href="https://guava.dev/releases/33.2.1-android/api/androiddiffs/">33.2.1-android vs. 33.2.1-jre</a></li>
</ul>
<h3>Changelog</h3>
<ul>
<li><code>net</code>: Changed <code>InetAddress</code>-<code>String</code> conversion methods to preserve the IPv6 scope ID if present. The scope ID can be necessary for IPv6-capable devices with multiple network interfaces. However, preserving it can also lead to problems for callers that rely on the returned values <em>not</em> to include the scope ID:
<ul>
<li>Callers might compensate for the old behavior of the methods by appending the scope ID to a returned string themselves. If so, you can update your code to stop doing so at the same time as you upgrade Guava. Of, if your code might run against multiple versions of Guava, you can check whether Guava has included a scope ID before you add one yourself.</li>
<li>Callers might pass the returned string to another system that does not understand scope IDs. If so, you can strip the scope ID off, whether by truncating the string form at a <code>%</code> character (leaving behind any trailing <code>]</code> character in the case of <code>forUriString</code>) or by replacing the returned <code>InetAddress</code> with a new instance constructed by calling <code>InetAddress.getByAddress(addr)</code>.</li>
<li><code>java.net.InetAddress</code> validates any provided scope ID against the interfaces available on the machine. As a result, methods in <code>InetAddresses</code> may now fail if the scope ID fails validation.
<ul>
<li>Notable cases in which this may happen include:
<ul>
<li>if the code runs in an Android app without networking permission</li>
<li>if code passes <code>InetAddress</code> instances or strings across devices</li>
</ul>
</li>
<li>If this is not the behavior that you want, then you can strip off the scope ID from the input string before passing it to Guava, as discussed above. (3f61870ac6)</li>
</ul>
</li>
</ul>
</li>
</ul>
<h2>33.2.0</h2>
<h3>Android users: Please test recent Guava versions</h3>
<p>If you know of Guava Android users who have not yet upgraded to at least release <a href="https://github.com/google/guava/releases/tag/v33.0.0">33.0.0</a>, please encourage them to upgrade, preferably to today's release, 33.2.0. These releases have begun adding Java 8+ APIs to <code>guava-android</code>. While we don't anticipate problems, we do anticipate that any unexpected problems could force a disruptive rollback. To minimize any disruption, we'd like to catch any such problems early.</p>
<p>Please <a href="https://github.com/google/guava/issues/new?assignees=&amp;labels=type%3Ddefect&amp;projects=&amp;template=bug_report.yaml">let us know of any problems you encounter</a>.</p>
<h3>Maven</h3>
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/google/guava/commits">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=gradle&previous-version=32.0.1-android&new-version=33.2.1-android)](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`.

---

<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>
---
 packages/camera/camera_android_camerax/CHANGELOG.md         | 5 +++++
 packages/camera/camera_android_camerax/android/build.gradle | 4 ++--
 packages/camera/camera_android_camerax/pubspec.yaml         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md
index b82edaf5db9e2..8307d7077d8ab 100644
--- a/packages/camera/camera_android_camerax/CHANGELOG.md
+++ b/packages/camera/camera_android_camerax/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.5+6
+
+* Updates Guava version to 33.2.1.
+* Updates CameraX version to 1.3.4.
+
 ## 0.6.5+5
 
 * Reverts changes to support Impeller.
diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle
index 5c22e1a203668..71d87a7522e04 100644
--- a/packages/camera/camera_android_camerax/android/build.gradle
+++ b/packages/camera/camera_android_camerax/android/build.gradle
@@ -61,12 +61,12 @@ android {
 
 dependencies {
     // CameraX core library using the camera2 implementation must use same version number.
-    def camerax_version = "1.3.3"
+    def camerax_version = "1.3.4"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
     implementation "androidx.camera:camera-video:${camerax_version}"
-    implementation 'com.google.guava:guava:32.0.1-android'
+    implementation 'com.google.guava:guava:33.2.1-android'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
     testImplementation 'androidx.test:core:1.4.0'
diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml
index e1de51a0ee92b..eb94986cbe9eb 100644
--- a/packages/camera/camera_android_camerax/pubspec.yaml
+++ b/packages/camera/camera_android_camerax/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera_android_camerax
 description: Android implementation of the camera plugin using the CameraX library.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.6.5+5
+version: 0.6.5+6
 
 environment:
   sdk: ^3.4.0