Merge branch 'main' into video-player-android-surface-producer-redo

Author: matanlurey

.ci.yaml

@@ -65,7 +65,7 @@ platform_properties:
       device_type: none
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:114.0"}
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
         ]
   windows_arm64:
     properties:
@@ -292,21 +292,21 @@ targets:
     timeout: 30
     properties:
       target_file: analyze_legacy.yaml
-      channel: "3.22.0"
+      channel: "3.22.3"
       env_variables: >-
         {
-          "CHANNEL": "3.22.0"
+          "CHANNEL": "3.22.3"
         }
 
   - name: Linux analyze_legacy N-2
     recipe: packages/packages
     timeout: 30
     properties:
       target_file: analyze_legacy.yaml
-      channel: "3.16.9"
+      channel: "3.19.6"
       env_variables: >-
         {
-          "CHANNEL": "3.16.9"
+          "CHANNEL": "3.19.6"
         }
 
   - name: Linux_android custom_package_tests master
@@ -327,7 +327,7 @@ targets:
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "chrome_and_driver", "version": "version:114.0"}
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
         ]
       channel: master
       env_variables: >-
@@ -350,7 +350,7 @@ targets:
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "chrome_and_driver", "version": "version:114.0"}
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
         ]
       channel: stable
       env_variables: >-
@@ -364,7 +364,24 @@ targets:
     timeout: 30
     properties:
       version_file: flutter_master.version
-      target_file: android_build_all_packages.yaml
+      # This builds the all_packages app only in a current JDK.
+      target_file: android_build_all_packages_jdk17.yaml
+      channel: master
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
+
+  - name: Linux_android android_build_all_packages_legacy master
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      version_file: flutter_master.version
+      # TODO(stuartmorgan): Once stable requires JDK 17, and the
+      # legacy project is updated accordingly, this entire target
+      # can be merged back into android_build_all_packages.
+      # This file only builds a *legacy* version of the project.
+      target_file: android_build_all_packages_legacy.yaml
       channel: master
       # The legacy project build requires an older JDK.
       dependencies: >-
@@ -382,7 +399,21 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: android_build_all_packages.yaml
+      # This builds the all_packages app only in a current JDK.
+      target_file: android_build_all_packages_jdk17.yaml
+      channel: stable
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
+
+  - name: Linux_android android_build_all_packages_legacy stable
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      version_file: flutter_stable.version
+      # This file only builds a *legacy* version of the project.
+      target_file: android_build_all_packages_legacy.yaml
       channel: stable
       # The legacy project build requires an older JDK.
       dependencies: >-
@@ -935,7 +966,7 @@ targets:
       # Install Chrome as a default handler for schemes for url_launcher.
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:114.0"}
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
         ]
       env_variables: >-
         {
@@ -953,7 +984,7 @@ targets:
       # Install Chrome as a default handler for schemes for url_launcher.
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:114.0"}
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
         ]
       env_variables: >-
         {

.ci/flutter_master.version

@@ -1 +1 @@
-e726eb401c2c1c882aa393071d5bb8bfb45e1dc3
+2afc452d3a8eec9756d5936674d1269258299c4e

.ci/flutter_stable.version

@@ -1 +1 @@
-761747bfc538b5af34aa0d3fac380f1bc331ec49
+80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819

.ci/scripts/create_all_packages_app.sh

@@ -4,5 +4,16 @@
 # found in the LICENSE file.
 set -e
 
+# The base exclusion file for all_packages app.
+exclusions=("script/configs/exclude_all_packages_app.yaml")
+
+# Add a wasm-specific exclusion file if "--wasm" is specified.
+if [[ "$1" == "--wasm" ]]; then
+  exclusions+=",script/configs/exclude_all_packages_app_wasm.yaml"
+fi
+
+# Delete ./all_packages if it exists already
+rm -rf ./all_packages
+
 dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
-    --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml
+    --output-dir=. --exclude "$exclusions"

.ci/targets/android_build_all_packages_jdk17.yaml

@@ -0,0 +1,14 @@
+# This only builds the modern all_packages app, which requires jdk17+
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: create all_packages app
+    script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: build all_packages for Android debug
+    script: .ci/scripts/build_all_packages_app.sh
+    args: ["apk", "debug"]
+  - name: build all_packages for Android release
+    script: .ci/scripts/build_all_packages_app.sh
+    args: ["apk", "release"]

.ci/targets/android_build_all_packages.yaml renamed to .ci/targets/android_build_all_packages_legacy.yaml

@@ -1,16 +1,8 @@
+# This only builds the legacy all_packages app, which requires jdk11
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: create all_packages app
-    script: .ci/scripts/create_all_packages_app.sh
-    infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: build all_packages for Android debug
-    script: .ci/scripts/build_all_packages_app.sh
-    args: ["apk", "debug"]
-  - name: build all_packages for Android release
-    script: .ci/scripts/build_all_packages_app.sh
-    args: ["apk", "release"]
   - name: create all_packages app - legacy version
     script: .ci/scripts/create_all_packages_app_legacy.sh
     # Output dir; must match the final argument to build_all_packages_app_legacy

.ci/targets/repo_checks.yaml

@@ -19,7 +19,7 @@ tasks:
     script: .ci/scripts/tool_runner.sh
     args:
       - "pubspec-check"
-      - "--min-min-flutter-version=3.16.0"
+      - "--min-min-flutter-version=3.19.0"
       - "--allow-dependencies=script/configs/allowed_unpinned_deps.yaml"
       - "--allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml"
     always: true

.ci/targets/web_build_all_packages.yaml

@@ -10,3 +10,10 @@ tasks:
   - name: build all_packages app for Web release
     script: .ci/scripts/build_all_packages_app.sh
     args: ["web", "release"]
+  - name: (Wasm) create all_packages app
+    script: .ci/scripts/create_all_packages_app.sh
+    args: ["--wasm"]
+    infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: (Wasm) build all_packages app for Web release
+    script: .ci/scripts/build_all_packages_app.sh
+    args: ["web", "release", "--wasm"]

.github/workflows/release.yml

@@ -31,12 +31,12 @@ jobs:
       # the change if it doesn't.
       run: |
         cd $HOME
-        git clone https://github.com/flutter/flutter.git --depth 1 -b 3.22.0 _flutter
+        git clone https://github.com/flutter/flutter.git --depth 1 -b 3.24.0 _flutter
         echo "$HOME/_flutter/bin" >> $GITHUB_PATH
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools

.github/workflows/scorecards-analysis.yml

@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v2.4.0
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v2.4.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.0.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.0.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -41,14 +41,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v2.3.1
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v2.3.1
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v1.0.26
+        uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v1.0.26
         with:
           sarif_file: results.sarif

AUTHORS

@@ -75,5 +75,6 @@ Amir Panahandeh <[email protected]>
 Daniele Cambi <[email protected]>
 Michele Benedetti <[email protected]>
 Taskulu LDA <[email protected]>
+Alexander Rabin <[email protected]>
 LinXunFeng <[email protected]>
 Hashir Shoaib <[email protected]>

CODEOWNERS

@@ -62,8 +62,9 @@ packages/video_player/video_player_web/**                @ditman
 packages/webview_flutter/webview_flutter_web/**          @ditman
 
 # - Android
-packages/camera/camera_android/**                        @camsim99
-packages/camera/camera_android_camerax/**                @camsim99
+# TODO(matanlurey): Remove @matanlurey after https://github.com/flutter/flutter/issues/151018.
+packages/camera/camera_android/**                        @camsim99 @matanlurey
+packages/camera/camera_android_camerax/**                @camsim99 @matanlurey
 packages/espresso/**                                     @reidbaker
 packages/file_selector/file_selector_android/**          @gmackall
 packages/flutter_plugin_android_lifecycle/**             @reidbaker
@@ -76,7 +77,7 @@ packages/path_provider/path_provider_android/**          @camsim99
 packages/quick_actions/quick_actions_android/**          @camsim99
 packages/shared_preferences/shared_preferences_android/**  @reidbaker
 packages/url_launcher/url_launcher_android/**            @gmackall
-packages/video_player/video_player_android/**            @camsim99
+packages/video_player/video_player_android/**            @camsim99 @matanlurey
 # Owned by ecosystem team for now during the wrapper evaluation.
 packages/webview_flutter/webview_flutter_android/**      @bparrishMines
 

packages/animations/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
+* Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
 
 ## 2.0.11
 

packages/animations/example/pubspec.yaml

@@ -6,8 +6,8 @@ publish_to: none
 version: 0.0.1
 
 environment:
-  sdk: ^3.2.0
-  flutter: ">=3.16.0"
+  sdk: ^3.3.0
+  flutter: ">=3.19.0"
 
 dependencies:
   animations:

packages/animations/example/web/index.html

@@ -8,6 +8,6 @@
   <title>example</title>
 </head>
 <body>
-  <script src="main.dart.js" type="application/javascript"></script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>

packages/animations/pubspec.yaml

@@ -5,8 +5,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
 version: 2.0.11
 
 environment:
-  sdk: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  sdk: ^3.3.0
+  flutter: ">=3.19.0"
 
 dependencies:
   flutter:

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.0+2
+
+* Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
+
 ## 0.11.0+1
 
 * Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.

packages/camera/camera/example/pubspec.yaml

@@ -3,8 +3,8 @@ description: Demonstrates how to use the camera plugin.
 publish_to: none
 
 environment:
-  sdk: ^3.2.0
-  flutter: ">=3.16.0"
+  sdk: ^3.3.0
+  flutter: ">=3.19.0"
 
 dependencies:
   camera:
@@ -28,5 +28,9 @@ dev_dependencies:
   integration_test:
     sdk: flutter
 
+dependency_overrides:
+  camera_web:
+    path: ../../camera_web
+
 flutter:
   uses-material-design: true

packages/camera/camera/example/web/index.html

@@ -3,8 +3,9 @@
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file. -->
 <html>
-
 <head>
+  <base href="$FLUTTER_BASE_HREF">
+
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
   <meta name="description" content="An example of the camera on the web.">
@@ -16,24 +17,12 @@
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
-  <link rel="shortcut icon" type="image/png" href="favicon.png" />
+  <link rel="icon" type="image/png" href="favicon.png"/>
 
   <title>Camera Web Example</title>
   <link rel="manifest" href="manifest.json">
 </head>
-
 <body>
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
-  <script>
-    if ('serviceWorker' in navigator) {
-      window.addEventListener('load', function () {
-        navigator.serviceWorker.register('flutter_service_worker.js');
-      });
-    }
-  </script>
-  <script src="main.dart.js" type="application/javascript"></script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
-
-</html>
+</html>

packages/camera/camera/pubspec.yaml

@@ -4,11 +4,11 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.11.0+1
+version: 0.11.0+2
 
 environment:
-  sdk: ^3.2.3
-  flutter: ">=3.16.6"
+  sdk: ^3.3.0
+  flutter: ">=3.19.0"
 
 flutter:
   plugin: