Merge branch 'main' into issue-123867-async-await

flutter · Dec 24, 2024 · 8ec409d · 8ec409d
2 parents 934c5c7 + 864e6be
commit 8ec409d
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 15 deletions.
diff --git a/packages/camera/camera/example/pubspec.yaml b/packages/camera/camera/example/pubspec.yaml
@@ -28,9 +28,5 @@ dev_dependencies:
   integration_test:
     sdk: flutter
 
-dependency_overrides:
-  camera_web:
-    path: ../../camera_web
-
 flutter:
   uses-material-design: true
diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.6.10+3
+
+* Bumps com.google.guava:guava from 33.3.1-android to 33.4.0-android.
+
+## 0.6.10+2
+
+* Bumps camerax_version from 1.3.4 to 1.4.1.
+
 ## 0.6.10+1
 
 * Removes nonnull annotation from MeteringPointHostApiImpl#getDefaultPointSize.

diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle
@@ -58,12 +58,12 @@ android {
 
 dependencies {
     // CameraX core library using the camera2 implementation must use same version number.
-    def camerax_version = "1.3.4"
+    def camerax_version = "1.4.1"
     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:33.3.1-android'
+    implementation 'com.google.guava:guava:33.4.0-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
@@ -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.10+1
+version: 0.6.10+3
 
 environment:
   sdk: ^3.5.0

diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+5
+
+* Bumps com.squareup.okhttp3, com.google.code.gson, and com.google.truth.
+
 ## 0.4.0+4
 
 * Updates agp to 8.7.2.

diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
@@ -58,12 +58,12 @@ android {
 
 dependencies {
     implementation 'com.google.guava:guava:33.3.1-android'
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'com.google.code.gson:gson:2.11.0'
     androidTestImplementation 'org.hamcrest:hamcrest:3.0'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation "com.google.truth:truth:1.1.3"
+    testImplementation "com.google.truth:truth:1.4.4"
     api 'androidx.test.espresso:espresso-core:3.6.1'
 
     // Core library
@@ -76,7 +76,7 @@ dependencies {
     // Assertions
     api 'androidx.test.ext:junit:1.2.1'
     api 'androidx.test.ext:truth:1.6.0'
-    api 'com.google.truth:truth:1.1.3'
+    api 'com.google.truth:truth:1.4.4'
 
     // Espresso dependencies
     api 'androidx.test.espresso:espresso-core:3.6.1'

diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
@@ -3,7 +3,7 @@ description: Java classes for testing Flutter apps using Espresso.
   Allows driving Flutter widgets from a native Espresso test.
 repository: https://github.com/flutter/packages/tree/main/packages/espresso
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22
-version: 0.4.0+4
+version: 0.4.0+5
 
 environment:
   sdk: ^3.5.0

diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.12+19
+
+* Updates androidx.activity:activity to 1.9.3.
+
 ## 0.8.12+18
 
 * Fixes a security issue related to improperly trusting filenames provided by a `ContentProvider`.

diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
@@ -38,7 +38,7 @@ android {
         implementation 'androidx.core:core:1.13.1'
         implementation 'androidx.annotation:annotation:1.9.0'
         implementation 'androidx.exifinterface:exifinterface:1.3.7'
-        implementation 'androidx.activity:activity:1.9.2'
+        implementation 'androidx.activity:activity:1.9.3'
 
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'org.mockito:mockito-core:5.1.1'

diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker_android
 description: Android implementation of the image_picker plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.12+18
+version: 0.8.12+19
 
 environment:
   sdk: ^3.5.0

diff --git a/packages/video_player/video_player/example/integration_test/video_player_test.dart b/packages/video_player/video_player/example/integration_test/video_player_test.dart
@@ -56,6 +56,15 @@ void main() {
     testWidgets(
       'live stream duration != 0',
       (WidgetTester tester) async {
+        // This test requires network access, and won't pass until a LUCI recipe
+        // change is made.
+        // TODO(camsim99): Remove once https://github.com/flutter/flutter/issues/160797 is fixed.
+        if (!kIsWeb && Platform.isAndroid) {
+          markTestSkipped(
+              'Skipping due to https://github.com/flutter/flutter/issues/160797');
+          return;
+        }
+
         final VideoPlayerController networkController =
             VideoPlayerController.networkUrl(
           Uri.parse(
@@ -266,6 +275,15 @@ void main() {
     testWidgets(
       'reports buffering status',
       (WidgetTester tester) async {
+        // This test requires network access, and won't pass until a LUCI recipe
+        // change is made.
+        // TODO(camsim99): Remove once https://github.com/flutter/flutter/issues/160797 is fixed.
+        if (!kIsWeb && Platform.isAndroid) {
+          markTestSkipped(
+              'Skipping due to https://github.com/flutter/flutter/issues/160797');
+          return;
+        }
+
         await controller.initialize();
         // Mute to allow playing without DOM interaction on Web.
         // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes

diff --git a/script/tool/pubspec.yaml b/script/tool/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   path: ^1.8.3
   platform: ^3.0.2
   pub_semver: ^2.0.0
-  pubspec_parse: ^1.2.2
+  pubspec_parse: ^1.4.0
   quiver: ^3.0.1
   test: ^1.24.0
   uuid: ^4.5.1