Skip to content

Commit 429650f

Browse files
authored
[camera, google_sign_in, espresso] Bump guava to version 33.3.1. (#7773)
Fixes flutter/flutter#155458 Fixes flutter/flutter#154586 Bumps Guava to `33.3.1`, as from what I can tell we were essentially hitting google/guava#7397, from a [comment](google/guava#7397 (comment)) on the issue: > I'm a little surprised that AGP wouldn't have complained already for any builds that depended on Guava classes that used those annotations, since it presumably wouldn't find the annotations on the runtime classpath. I believe this maintainers suspicions were warranted, as it seems AGP was complaining in our case! That issue was fixed in version `33.3.1` of Guava. Verified that I could re-create the failure in the [first issue](flutter/flutter#155458), and then verified that it was fixed with no additional proguard rules by upgrading the Guava version used by the `google_sign_in` plugin. Decided to make the upgrade everywhere we use guava, so we don't hit it in another plugin later.
1 parent 309398a commit 429650f

File tree

9 files changed

+18
-6
lines changed

9 files changed

+18
-6
lines changed

packages/camera/camera_android_camerax/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.9+1
2+
3+
* Bumps `com.google.guava:guava` from `33.3.0` to `33.3.1`.
4+
15
## 0.6.9
26

37
* Corrects assumption about automatic preview correction happening on API >= 29 to API > 29,

packages/camera/camera_android_camerax/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
implementation "androidx.camera:camera-camera2:${camerax_version}"
6767
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
6868
implementation "androidx.camera:camera-video:${camerax_version}"
69-
implementation 'com.google.guava:guava:33.3.0-android'
69+
implementation 'com.google.guava:guava:33.3.1-android'
7070
testImplementation 'junit:junit:4.13.2'
7171
testImplementation 'org.mockito:mockito-inline:5.0.0'
7272
testImplementation 'androidx.test:core:1.4.0'

packages/camera/camera_android_camerax/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera_android_camerax
22
description: Android implementation of the camera plugin using the CameraX library.
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.6.9
5+
version: 0.6.9+1
66

77
environment:
88
sdk: ^3.5.0

packages/espresso/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.0+2
2+
3+
* Bumps `com.google.guava:guava` from `31.1` to `33.3.1`.
4+
15
## 0.4.0+1
26

37
* Updates lint checks to ignore NewerVersionAvailable.

packages/espresso/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ android {
6060
}
6161

6262
dependencies {
63-
implementation 'com.google.guava:guava:31.1-android'
63+
implementation 'com.google.guava:guava:33.3.1-android'
6464
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
6565
implementation 'com.google.code.gson:gson:2.10.1'
6666
androidTestImplementation 'org.hamcrest:hamcrest:2.2'

packages/espresso/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Java classes for testing Flutter apps using Espresso.
33
Allows driving Flutter widgets from a native Espresso test.
44
repository: https://github.com/flutter/packages/tree/main/packages/espresso
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22
6-
version: 0.4.0+1
6+
version: 0.4.0+2
77

88
environment:
99
sdk: ^3.4.0

packages/google_sign_in/google_sign_in_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 6.1.31
2+
3+
* Bumps `com.google.guava:guava` from `32.0.1` to `33.3.1`.
4+
15
## 6.1.30
26

37
* Temporarily downgrades Guava from version 33.3.0 to 32.0.1 to fix an R8 related error.

packages/google_sign_in/google_sign_in_android/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ android {
6060

6161
dependencies {
6262
implementation 'com.google.android.gms:play-services-auth:21.0.0'
63-
implementation 'com.google.guava:guava:32.0.1-android'
63+
implementation 'com.google.guava:guava:33.3.1-android'
6464
testImplementation 'junit:junit:4.13.2'
6565
testImplementation 'org.mockito:mockito-inline:5.0.0'
6666
}

packages/google_sign_in/google_sign_in_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_sign_in_android
22
description: Android implementation of the google_sign_in plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
5-
version: 6.1.30
5+
version: 6.1.31
66

77
environment:
88
sdk: ^3.4.0

0 commit comments

Comments
 (0)