Merge remote-tracking branch 'upstream/main' into video-player-android-surface-producer-redo

Author: matanlurey

.ci.yaml

@@ -31,7 +31,7 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8739520057779466577"}
         ]
   linux_android_legacy:
     properties:
@@ -44,7 +44,7 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
           {"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8739520057779466577"}
         ]
   linux_desktop:
     properties:
@@ -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
+b8f89f70bf4e8c304fc909b58e23f2358983bb41

.ci/flutter_stable.version

@@ -1 +1 @@
-761747bfc538b5af34aa0d3fac380f1bc331ec49
+5874a72aa4c779a02553007c47dacbefba2374dc

.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/labeler.yml

@@ -108,6 +108,11 @@
     - any-glob-to-any-file:
       - packages/in_app_purchase/**/*
 
+'p: interactive_media_ads':
+  - changed-files:
+    - any-glob-to-any-file:
+      - packages/interactive_media_ads/**/*
+
 'p: ios_platform_images':
   - changed-files:
     - any-glob-to-any-file:

.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