Merge branch 'main' into null_status_retriable

* main: (3910 commits)
  [various] Align Flutter and Dart SDK constraints (flutter#3349)
  Roll Flutter from c590086 to f2f8005 (14 revisions) (flutter#3373)
  [webview_flutter] Enable warnings-as-errors on Android (flutter#3356)
  [ci] Increase Android platform test sharding (flutter#3365)
  Roll Flutter from f032a4d to c590086 (69 revisions) (flutter#3366)
  [Espresso] Update truth package to 1.1.3 (flutter#3358)
  [google_maps] Relax the Android renderer requset test (flutter#3364)
  [pigeon] Only check generated files on master (flutter#3357)
  [webview]: Bump androidx.webkit:webkit from 1.5.0 to 1.6.0 in /packages/webview_flutter/webview_flutter_android/android (flutter#3243)
  [ci+various] Partially enable javac warning checks (flutter#3293)
  [webview_flutter] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3336)
  [local_auth] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3335)
  [google_sign_in] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3330)
  [google_maps_flutter] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3329)
  [video_player] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3328)
  [file_selector] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3325)
  [go_router_builder] Fix the example for default values in the README (flutter#3231)
  Update annotation and espresso dependencies (flutter#3271)
  [tool] Provide a --base-branch flag (flutter#3322)
  [image_picker_android] Adds Android 13 photo picker functionality (flutter#3267)
  ...

.ci.yaml

@@ -44,26 +44,17 @@ platform_properties:
       xcode: 14a5294e # xcode 14.0 beta 5
 
 targets:
-  ### iOS tasks ###
-  - name: Mac_arm64 ios_build_all_packages master
-    bringup: true
+  ### iOS+macOS tasks ***
+  # TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM
+  # support. `pod lint` makes a synthetic target that doesn't respect the
+  # pod's arch exclusions, so fails to build.
+  - name: Mac_x64 check_podspecs
     recipe: packages/packages
     timeout: 30
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: ios_build_all_packages.yaml
-      channel: master
-
-  - name: Mac_arm64 ios_build_all_packages stable
-    bringup: true
-    recipe: packages/packages
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_build_all_packages.yaml
-      channel: stable
+      target_file: macos_check_podspecs.yaml
 
   ### macOS desktop tasks ###
   # macos-platform_tests builds all the packages on ARM, so this build is run
@@ -74,7 +65,7 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_build_all_packages.yaml
+      target_file: macos_build_all_packages.yaml
       channel: master
 
   - name: Mac_x64 build_all_packages stable
@@ -83,33 +74,179 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_build_all_packages.yaml
+      target_file: macos_build_all_packages.yaml
       channel: stable
 
+  # TODO(stuartmorgan): Remove "- packages" from all task names once
+  # flutter/plugins is merged into this repo and turned down; it's here only
+  # because names must be unique across all flutter repositories.
+  - name: Mac_arm64 macos_platform_tests master - packages
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      channel: master
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: macos_platform_tests.yaml
+
+  - name: Mac_arm64 macos_platform_tests stable - packages
+    recipe: packages/packages
+    presubmit: false
+    timeout: 60
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: macos_platform_tests.yaml
+
   - name: Mac_arm64 custom_package_tests master
-    bringup: true # New configuration
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_custom_package_tests.yaml
+      target_file: macos_custom_package_tests.yaml
       channel: master
 
   - name: Mac_arm64 custom_package_tests stable
-    bringup: true # New configuration
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: macos_custom_package_tests.yaml
+      channel: stable
+
+  ### iOS tasks ###
+  # ios_platform_tests builds all the packages on ARM, so this build is run
+  # on Intel to give us build coverage of both host types.
+  - name: Mac_x64 ios_build_all_packages master
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      channel: master
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_build_all_packages.yaml
+
+  - name: Mac_x64 ios_build_all_packages stable
+    bringup: true # New target
     recipe: packages/packages
     timeout: 30
     properties:
+      channel: stable
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_custom_package_tests.yaml
+      target_file: ios_build_all_packages.yaml
+
+  # TODO(stuartmorgan): Change all of the ios_platform_tests_* task timeouts
+  # to 60 minutes once https://github.com/flutter/flutter/issues/119750 is
+  # fixed.
+  - name: Mac_arm64 ios_platform_tests_shard_1 master
+    recipe: packages/packages
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_2 master
+    recipe: packages/packages
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_3 master
+    recipe: packages/packages
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_4 master
+    recipe: packages/packages
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 3 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_5 master
+    recipe: packages/packages
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 4 --shardCount 5"
+
+  # Don't run full platform tests on both channels in pre-submit.
+  - name: Mac_arm64 ios_platform_tests_shard_1 stable
+    recipe: packages/packages
+    presubmit: false
+    timeout: 120
+    properties:
       channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_2 stable
+    recipe: packages/packages
+    presubmit: false
+    timeout: 120
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_3 stable
+    recipe: packages/packages
+    presubmit: false
+    timeout: 120
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_4 stable
+    recipe: packages/packages
+    presubmit: false
+    timeout: 120
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 3 --shardCount 5"
+
+  - name: Mac_arm64 ios_platform_tests_shard_5 stable
+    recipe: packages/packages
+    presubmit: false
+    timeout: 120
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 4 --shardCount 5"
 
   ### Windows desktop tasks ###
   - name: Windows custom_package_tests master - packages
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: windows_custom_package_tests.yaml
@@ -122,7 +259,7 @@ targets:
 
   - name: Windows dart_unit_tests master - packages
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: windows_dart_unit_tests.yaml
@@ -136,7 +273,7 @@ targets:
 
   - name: Windows win32-platform_tests master - packages
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
@@ -149,7 +286,7 @@ targets:
 
   - name: Windows win32-platform_tests stable - packages
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
@@ -186,6 +323,15 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows repo_tools_tests
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      target_file: repo_tools_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+
   - name: Linux ci_yaml packages roller
     recipe: infra/ci_yaml
     timeout: 30

.ci/flutter_master.version

@@ -1 +1 @@
-27f8ebdaed7078f311d456befae1c6236ba65fd8
+f2f80059ff87be34f773de33400af52a00c81a1a

.ci/flutter_stable.version

@@ -1 +1 @@
-b06b8b2710955028a6b562f5aa6fe62941d6febf
+c07f7888888435fd9df505aa2efc38d3cf65681b

.ci/scripts/build_examples_win32.sh

@@ -3,5 +3,5 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-dart pub global run flutter_plugin_tools build-examples --windows \
+dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \
    --packages-for-branch --log-timing

.ci/scripts/create_all_packages_app.sh

@@ -3,5 +3,5 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-dart pub global run flutter_plugin_tools create-all-packages-app \
+dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
     --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml

.ci/scripts/create_simulator.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+device=com.apple.CoreSimulator.SimDeviceType.iPhone-13
+os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
+
+xcrun simctl list
+xcrun simctl create Flutter-iPhone "$device" "$os" | xargs xcrun simctl boot

.ci/scripts/custom_package_tests.sh

@@ -8,6 +8,6 @@
 # script/configs/linux_only_custom_test.yaml
 #   Custom tests need Chrome. (They run in linux-custom_package_tests)
 
-dart pub global run flutter_plugin_tools custom-test \
+dart ./script/tool/bin/flutter_plugin_tools.dart custom-test \
    --packages-for-branch --log-timing \
    --exclude=script/configs/linux_only_custom_test.yaml

.ci/scripts/dart_unit_tests_win32.sh

@@ -3,5 +3,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-dart pub global run flutter_plugin_tools test --exclude=script/configs/windows_unit_tests_exceptions.yaml \
+dart ./script/tool/bin/flutter_plugin_tools.dart test \
+  --exclude=script/configs/windows_unit_tests_exceptions.yaml \
   --packages-for-branch --log-timing

.ci/scripts/drive_examples_win32.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
+   --exclude=script/configs/exclude_integration_win32.yaml --packages-for-branch --log-timing

.ci/scripts/native_test_win32.sh

@@ -3,5 +3,5 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-dart pub global run flutter_plugin_tools native-test --windows \
+dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
    --no-integration --packages-for-branch --log-timing

.ci/scripts/plugin_tools_tests.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+cd script/tool
+dart pub run test

.ci/scripts/prepare_tool.sh

@@ -6,6 +6,5 @@
 # To set FETCH_HEAD for "git merge-base" to work
 git fetch origin main
 
-# Pinned version of the plugin tools, to avoid breakage in this repository
-# when pushing updates from flutter/plugins.
-dart pub global activate flutter_plugin_tools 0.13.4
+cd script/tool
+dart pub get

.ci/targets/ios_platform_tests.yaml

@@ -0,0 +1,24 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: create simulator
+    script: .ci/scripts/create_simulator.sh
+  - name: build examples
+    script: script/tool_runner.sh
+    args: ["build-examples", "--ios"]
+  - name: xcode analyze
+    script: script/tool_runner.sh
+    args: ["xcode-analyze", "--ios"]
+  - name: xcode analyze deprecation
+    # Ensure we don't accidentally introduce deprecated code.
+    script: script/tool_runner.sh
+    args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
+  - name: native test
+    script: script/tool_runner.sh
+    args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 13,OS=latest"]
+  - name: drive examples
+    # `drive-examples` contains integration tests, which changes the UI of the application.
+    # This UI change sometimes affects `xctest`.
+    # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
+    script: script/tool_runner.sh
+    args: ["drive-examples", "--ios", "--exclude=script/configs/exclude_integration_ios.yaml"]

.ci/targets/mac_build_all_packages.yaml → .ci/targets/macos_build_all_packages.yaml

@@ -6,6 +6,6 @@ tasks:
   - name: build all_packages for macOS debug
     script: .ci/scripts/build_all_packages_app.sh
     args: ["macos", "debug"]
-  - name: build all_plugins for macOS release
+  - name: build all_packages for macOS release
     script: .ci/scripts/build_all_packages_app.sh
     args: ["macos", "release"]

.ci/targets/macos_check_podspecs.yaml

@@ -0,0 +1,6 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: validate iOS and macOS podspecs
+    script: script/tool_runner.sh
+    args: ["podspec-check"]

.ci/targets/mac_custom_package_tests.yaml → .ci/targets/macos_custom_package_tests.yaml

@@ -1,5 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+  - name: create simulator
+    script: .ci/scripts/create_simulator.sh
   - name: custom package tests
     script: .ci/scripts/custom_package_tests.sh