Merge remote-tracking branch 'upstream/main' into camx_pcp

Author: camsim99

.ci/Dockerfile

@@ -1,47 +1,40 @@
 # The Flutter version is not important here, since the CI scripts update Flutter
 # before running. What matters is that the base image is pinned to minimize
 # unintended changes when modifying this file.
-FROM cirrusci/flutter@sha256:505fe8bce2896c75b4df9ccf500b1604155bf932af7465ffcc66fcae8612f82f
+# This is the hash for the 3.0.0 image.
+FROM cirrusci/flutter@sha256:0224587bba33241cf908184283ec2b544f1b672d87043ead1c00521c368cf844
 
 RUN apt-get update -y
 
+# Set up Firebase Test Lab requirements.
 RUN apt-get install -y --no-install-recommends gnupg
-
-# Add repo for gcloud sdk and install it
 RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
     sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
     sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
-
 RUN apt-get update && apt-get install -y google-cloud-sdk && \
     gcloud config set core/disable_usage_reporting true && \
     gcloud config set component_manager/disable_update_check true
 
-RUN yes | sdkmanager \
-    "platforms;android-27" \
-    "build-tools;27.0.3" \
-    "extras;google;m2repository" \
-    "extras;android;m2repository"
-
-RUN yes | sdkmanager --licenses
-
-# Install formatter.
+# Install formatter for C-based languages.
 RUN apt-get install -y clang-format
 
-# Install xvfb to allow running headless
-RUN apt-get install -y xvfb libegl1-mesa
-# Install Linux desktop build tool requirements.
+# Install Linux desktop requirements:
+# - build tools.
 RUN apt-get install -y clang cmake ninja-build file pkg-config
-# Install necessary libraries.
+# - libraries.
 RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
+# - xvfb to allow running headless.
+RUN apt-get install -y xvfb libegl1-mesa
 
-# Add repo for Google Chrome and install it
+# Install Chrome and make it the default browser, for url_launcher tests.
+# IMPORTANT: Web tests should use a pinned version of Chromium, not this, since
+# this isn't pinned, so any time the docker image is re-created the version of
+# Chrome may change.
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
 RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
 RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
-
-# Make Chrome the default so http: and file: has a handler for url_launcher tests.
+# Make Chrome the default for http:, https: and file:.
 RUN apt-get install -y xdg-utils
 RUN xdg-settings set default-web-browser google-chrome.desktop
 RUN xdg-mime default google-chrome.desktop inode/directory

.ci/flutter_master.version

@@ -1 +1 @@
-64f84f6a47d276e4d79cb10c203adbddeeeae336
+f57c2fe8ff4993fbe017d1f5fb7c7a4145d66492

.github/workflows/release.yml

@@ -50,5 +50,5 @@ jobs:
       run: |
         git config --global user.name ${{ secrets.USER_NAME }}
         git config --global user.email ${{ secrets.USER_EMAIL }}
-        dart ./script/tool/lib/src/main.dart publish-plugin --all-changed --base-sha=HEAD~ --skip-confirmation --remote=origin
+        dart ./script/tool/lib/src/main.dart publish --all-changed --base-sha=HEAD~ --skip-confirmation --remote=origin
       env: {PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"}

.github/workflows/scorecards-analysis.yml

@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@904260d7d935dff982205cbdb42025ce30b7a34f
+        uses: github/codeql-action/upload-sarif@86f3159a697a097a813ad9bfa0002412d97690a4
         with:
           sarif_file: results.sarif

analysis_options.yaml

@@ -23,8 +23,8 @@
 
 analyzer:
   strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+    strict-casts: true
+    strict-raw-types: true
   errors:
     # treat missing required parameters as a warning (not a hint)
     missing_required_param: warning
@@ -114,7 +114,7 @@ linter:
     # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
     - control_flow_in_finally
     # - curly_braces_in_flow_control_structures # not required by flutter style
-    # - depend_on_referenced_packages # LOCAL CHANGE - Needs to be enabled and violations fixed.
+    - depend_on_referenced_packages
     - deprecated_consistency
     # - diagnostic_describe_all_properties # enabled only at the framework level (packages/flutter/lib)
     - directives_ordering

packages/camera/camera_android/example/pubspec.yaml

@@ -14,6 +14,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
+  camera_platform_interface: ^2.2.0
   flutter:
     sdk: flutter
   path_provider: ^2.0.0

packages/camera/camera_android_camerax/example/pubspec.yaml

@@ -14,6 +14,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
+  camera_platform_interface: ^2.2.0
   flutter:
     sdk: flutter
 
@@ -25,4 +26,3 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
-  

packages/camera/camera_avfoundation/example/pubspec.yaml

@@ -14,6 +14,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
+  camera_platform_interface: ^2.2.0
   flutter:
     sdk: flutter
   path_provider: ^2.0.0

packages/camera/camera_web/example/pubspec.yaml

@@ -10,8 +10,11 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  async: ^2.5.0
+  camera_platform_interface: ^2.1.0
   camera_web:
     path: ../
+  cross_file: ^0.3.1
   flutter_driver:
     sdk: flutter
   flutter_test:

packages/camera/camera_windows/example/pubspec.yaml

@@ -19,6 +19,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  async: ^2.5.0
   flutter_test:
     sdk: flutter
   integration_test: