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

[camera]: Bump com.google.guava:guava from 32.0.1-android to 32.1.1-android in /packages/camera/camera_android_camerax/android #4361

Closed
wants to merge 2 commits into from
Closed

[camera]: Bump com.google.guava:guava from 32.0.1-android to 32.1.1-android in /packages/camera/camera_android_camerax/android #4361

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
639e0a9
[camera]: Bump com.google.guava:guava
dependabot[bot] Jul 6, 2023
149eb95
Add workaround and bump version
camsim99 Jul 6, 2023
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
4 changes: 4 additions & 0 deletions packages/camera/camera_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.10.8+4

* Updates Guava version to 32.1.1.

## 0.10.8+3

* Fixes unawaited_futures violations.
Expand Down
7 changes: 7 additions & 0 deletions packages/camera/camera_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,11 @@ dependencies {
testImplementation 'org.mockito:mockito-inline:5.0.0'
testImplementation 'androidx.test:core:1.4.0'
testImplementation 'org.robolectric:robolectric:4.10.3'

// TODO(camsim99): Remove this workaround when Gradle conflict is fixed: https://github.com/gradle/gradle/issues/22326.
modules {
module("com.google.guava:listenablefuture") {
replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
}
}
}
2 changes: 1 addition & 1 deletion packages/camera/camera_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22

version: 0.10.8+3
version: 0.10.8+4

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
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:32.1.1-android'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.0.0'
testImplementation 'androidx.test:core:1.4.0'
Expand Down