flutter · vanlooverenkoen · Nov 17, 2021 · Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022
diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-abfba69f87762414e69c72ad92006f6cc56055c9
+66c306b452282016e4a146a8f1c11f44836560f1
diff --git a/.ci/flutter_stable.version b/.ci/flutter_stable.version
@@ -1 +1 @@
-f1875d570e39de09040c8f79aa13cc56baab8db1
+ffccd96b62ee8cec7740dab303538c5fc26ac543
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -161,8 +161,8 @@ task:
       depends_on: analyze
       env:
         matrix:
+          CHANNEL: "3.0.5"
           CHANNEL: "2.10.5"
-          CHANNEL: "2.8.1"
       package_prep_script:
         # Allow analyzing plugins that use a Pigeon version with a higher
         # minimum Flutter/Dart version than the plugin itself.
@@ -237,11 +237,11 @@ task:
       skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
       env:
         matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 5"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 5"
-          PLUGIN_SHARDING: "--shardIndex 2 --shardCount 5"
-          PLUGIN_SHARDING: "--shardIndex 3 --shardCount 5"
-          PLUGIN_SHARDING: "--shardIndex 4 --shardCount 5"
+          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 5"
+          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 5"
+          PACKAGE_SHARDING: "--shardIndex 2 --shardCount 5"
+          PACKAGE_SHARDING: "--shardIndex 3 --shardCount 5"
+          PACKAGE_SHARDING: "--shardIndex 4 --shardCount 5"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
@@ -300,8 +300,8 @@ task:
     - name: web-platform_tests
       env:
         matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 2"
+          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
@@ -377,10 +377,10 @@ task:
       env:
         PATH: $PATH:/usr/local/bin
         matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
-          PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
-          PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
+          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 4"
+          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 4"
+          PACKAGE_SHARDING: "--shardIndex 2 --shardCount 4"
+          PACKAGE_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"

diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml
@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@9fd24f1f9d6ceb64ba34d181b329ee72f99978a0
+      - uses: actions/labeler@e54e5b338fbd6e6cdb5d60f51c22335fc57c401e
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
 
     # This workflow should be the last to run. So wait for all the other tests to succeed.
     - name: Wait on all tests
-      uses: lewagon/wait-on-check-action@752bfae19aef55dab12a00bc36d48acc46b77e9d
+      uses: lewagon/wait-on-check-action@e2558238c09778af25867eb5de5a3ce4bbae3dcd
       with:
         ref: ${{ github.sha }}
         running-workflow-name: 'release'

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e
+        uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564
         with:
           results_file: results.sarif
           results_format: sarif
@@ -48,6 +48,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2ca79b6fa8d3ec278944088b4aa5f46912db5d63
+        uses: github/codeql-action/upload-sarif@c7f292ea4f542c473194b33813ccd4c207a6c725
         with:
           sarif_file: results.sarif
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -15,7 +15,7 @@ packages/local_auth/**                                   @stuartmorgan
 packages/path_provider/**                                @gaaclarke
 packages/plugin_platform_interface/**                    @stuartmorgan
 packages/quick_actions/**                                @stuartmorgan
-packages/shared_preferences/**                           @gaaclarke
+packages/shared_preferences/**                           @tarrinneal
 packages/url_launcher/**                                 @stuartmorgan
 packages/video_player/**                                 @gaaclarke
 packages/webview_flutter/**                              @bparrishMines

diff --git a/README.md b/README.md
diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates minimum Flutter version to 2.10.
+
 ## 0.10.0+1
 
 * Fixes avoid_redundant_argument_values lint warnings and minor typos.

diff --git a/packages/camera/camera/example/pubspec.yaml b/packages/camera/camera/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   camera:

diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
@@ -8,7 +8,7 @@ version: 0.10.0+1
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 flutter:
   plugin:

diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.10.0+2
+
+* Removes call to `join` on the camera's background `HandlerThread`.
+* Updates minimum Flutter version to 2.10.
+
 ## 0.10.0+1
 
 * Fixes avoid_redundant_argument_values lint warnings and minor typos.

diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java
@@ -131,8 +131,6 @@ class Camera
 
   /** An additional thread for running tasks that shouldn't block the UI. */
   private HandlerThread backgroundHandlerThread;
-  /** True when backgroundHandlerThread is in the process of being stopped. */
-  private boolean stoppingBackgroundHandlerThread = false;
 
   private CameraDeviceWrapper cameraDevice;
   private CameraCaptureSession captureSession;
@@ -671,21 +669,11 @@ public void startBackgroundThread() {
 
   /** Stops the background thread and its {@link Handler}. */
   public void stopBackgroundThread() {
-    if (stoppingBackgroundHandlerThread) {
-      return;
-    }
     if (backgroundHandlerThread != null) {
-      stoppingBackgroundHandlerThread = true;
       backgroundHandlerThread.quitSafely();
-      try {
-        backgroundHandlerThread.join();
-      } catch (InterruptedException e) {
-        dartMessenger.error(flutterResult, "cameraAccess", e.getMessage(), null);
-      }
     }
     backgroundHandlerThread = null;
     backgroundHandler = null;
-    stoppingBackgroundHandlerThread = false;
   }
 
   /** Start capturing a picture, doing autofocus first. */

diff --git a/...ges/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraTest.java b/...ges/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraTest.java
@@ -838,25 +838,12 @@ public void startBackgroundThread_shouldNotStartNewThreadWhenAlreadyCreated() {
   }
 
   @Test
-  public void stopBackgroundThread_cancelsDuplicateCalls() throws InterruptedException {
-    TestUtils.setPrivateField(camera, "stoppingBackgroundHandlerThread", true);
-
-    camera.startBackgroundThread();
-    camera.stopBackgroundThread();
-
-    verify(mockHandlerThread, never()).quitSafely();
-    verify(mockHandlerThread, never()).join();
-  }
-
-  @Test
-  public void stopBackgroundThread_proceedsWithoutDuplicateCall() throws InterruptedException {
-    TestUtils.setPrivateField(camera, "stoppingBackgroundHandlerThread", false);
-
+  public void stopBackgroundThread_quitsSafely() throws InterruptedException {
     camera.startBackgroundThread();
     camera.stopBackgroundThread();
 
     verify(mockHandlerThread).quitSafely();
-    verify(mockHandlerThread).join();
+    verify(mockHandlerThread, never()).join();
   }
 
   @Test

diff --git a/packages/camera/camera_android/example/pubspec.yaml b/packages/camera/camera_android/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   camera_android:

diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
@@ -2,11 +2,11 @@ name: camera_android
 description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/plugins/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.0+1
+version: 0.10.0+2
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 flutter:
   plugin:

diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates minimum Flutter version to 2.10.
+
 ## 0.9.8+5
 
 * Fixes a regression introduced in 0.9.8+4 where the stream handler is not set. 

diff --git a/packages/camera/camera_avfoundation/example/pubspec.yaml b/packages/camera/camera_avfoundation/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   camera_avfoundation:

diff --git a/packages/camera/camera_avfoundation/pubspec.yaml b/packages/camera/camera_avfoundation/pubspec.yaml
@@ -6,7 +6,7 @@ version: 0.9.8+5
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 flutter:
   plugin:

diff --git a/packages/camera/camera_platform_interface/CHANGELOG.md b/packages/camera/camera_platform_interface/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## NEXT
 
+* Updates minimum Flutter version to 2.10.
 * Fixes avoid_redundant_argument_values lint warnings and minor typos.
 * Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/104231).
 * Ignores missing return warnings in preparation for [upcoming analysis changes](https://github.com/flutter/flutter/issues/105750).

diff --git a/packages/camera/camera_platform_interface/pubspec.yaml b/packages/camera/camera_platform_interface/pubspec.yaml
@@ -8,7 +8,7 @@ version: 2.2.0
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   cross_file: ^0.3.1

diff --git a/packages/camera/camera_web/CHANGELOG.md b/packages/camera/camera_web/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## NEXT
 
+* Updates minimum Flutter version to 2.10.
 * Fixes avoid_redundant_argument_values lint warnings and minor typos.
 * Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/106316).
 

diff --git a/packages/camera/camera_web/example/pubspec.yaml b/packages/camera/camera_web/example/pubspec.yaml
@@ -3,7 +3,7 @@ publish_to: none
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   flutter:

diff --git a/packages/camera/camera_web/pubspec.yaml b/packages/camera/camera_web/pubspec.yaml
@@ -6,7 +6,7 @@ version: 0.3.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 flutter:
   plugin:

diff --git a/packages/camera/camera_windows/CHANGELOG.md b/packages/camera/camera_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates minimum Flutter version to 2.10.
+
 ## 0.2.1+1
 
 * Fixes avoid_redundant_argument_values lint warnings and minor typos.

diff --git a/packages/camera/camera_windows/example/pubspec.yaml b/packages/camera/camera_windows/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   camera_platform_interface: ^2.1.2

diff --git a/packages/camera/camera_windows/pubspec.yaml b/packages/camera/camera_windows/pubspec.yaml
@@ -6,7 +6,7 @@ version: 0.2.1+1
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 flutter:
   plugin:

diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.0+4
+
+* Updates minimum Flutter version to 2.10.
+* Bumps gson to 2.9.1
+
 ## 0.2.0+3
 
 * Bumps okhttp to 4.10.0.

diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
@@ -51,7 +51,7 @@ android {
 dependencies {
     implementation 'com.google.guava:guava:31.1-android'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.9.1'
     androidTestImplementation 'org.hamcrest:hamcrest:2.2'
 
     testImplementation 'junit:junit:4.13.2'

diff --git a/packages/espresso/example/pubspec.yaml b/packages/espresso/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   flutter:

diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
@@ -3,11 +3,11 @@ description: Java classes for testing Flutter apps using Espresso.
   Allows driving Flutter widgets from a native Espresso test.
 repository: https://github.com/flutter/plugins/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.2.0+3
+version: 0.2.0+4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.10.0"
 
 flutter:
   plugin:

diff --git a/packages/file_selector/file_selector/CHANGELOG.md b/packages/file_selector/file_selector/CHANGELOG.md
@@ -1,3 +1,11 @@
+## NEXT
+
+* Updates minimum Flutter version to 2.10.
+
+## 0.9.2
+
+* Adds an endorsed iOS implementation.
+
 ## 0.9.1
 
 * Adds an endorsed Linux implementation.

diff --git a/packages/file_selector/file_selector/README.md b/packages/file_selector/file_selector/README.md
@@ -6,9 +6,9 @@
 
 A Flutter plugin that manages files and interactions with file dialogs.
 
-|             | Linux | macOS  | Web | Windows     |
-|-------------|-------|--------|-----|-------------|
-| **Support** | Any   | 10.11+ | Any | Windows 10+ |
+|             | iOS    | Linux | macOS  | Web | Windows     |
+|-------------|--------|-------|--------|-----|-------------|
+| **Support** | iOS 9+ | Any   | 10.11+ | Any | Windows 10+ |
 
 ## Usage
 To use this plugin, add `file_selector` as a [dependency in your pubspec.yaml file](https://flutter.dev/platform-plugins/).

diff --git a/packages/file_selector/file_selector/example/.gitignore b/packages/file_selector/file_selector/example/.gitignore
@@ -40,9 +40,5 @@ app.*.symbols
 # Obfuscation related
 app.*.map.json
 
-# Currently only web supported
-android/
-ios/
-
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		abfba69f87762414e69c72ad92006f6cc56055c9
		66c306b452282016e4a146a8f1c11f44836560f1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f1875d570e39de09040c8f79aa13cc56baab8db1
		ffccd96b62ee8cec7740dab303538c5fc26ac543