Merge branch 'flutter:main' into main

.ci.yaml

@@ -25,8 +25,149 @@ platform_properties:
         ]
       device_type: none
       os: Windows
+  mac_x64:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "xcode", "version": "14a5294e"},
+          {"dependency": "gems", "version": "v3.3.14"}
+        ]
+      os: Mac-12
+      device_type: none
+      cpu: x86
+      xcode: 14a5294e # xcode 14.0 beta 5
+
 
 targets:
+  ### 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 lint_podspecs
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6637
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_lint_podspecs.yaml
+
+  ### macOS desktop tasks ###
+  # macos-platform_tests builds all the plugins on M1, so this build is run
+  # on Intel to give us build coverage of both host types.
+  - name: Mac_x64 build_all_plugins master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6671
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_build_all_plugins.yaml
+      channel: master
+
+  - name: Mac_x64 build_all_plugins stable
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6671
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_build_all_plugins.yaml
+      channel: stable
+
+  ### iOS tasks ###
+  # TODO(stuartmorgan): Swap this and ios-build_all_plugins once simulator
+  # tests are reliable on the ARM infrastructure. See discussion at
+  # https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
+  - name: Mac_x64 ios_platform_tests_1_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_2_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_3_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_4_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 3 --shardCount 4"
+
+  # Don't run full platform tests on both channels in pre-submit.
+  - name: Mac_x64 ios_platform_tests_1_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_2_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_3_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_4_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 3 --shardCount 4"
+
   - name: Windows win32-platform_tests master
     recipe: plugins/plugins
     timeout: 30

.ci/flutter_master.version

@@ -1 +1 @@
-be86a916548a66c93e4f2f919b5ca0ccd2cdae0c
+61e927d22fe6d82c94c368d62aa81f733bd9218d

.ci/flutter_stable.version

@@ -1 +1 @@
-eb6d86ee27deecba4a83536aa20f366a6044895c
+52b3dc25f6471c27b2144594abb11c741cb88f57

.ci/scripts/build_all_plugins.sh

@@ -3,6 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-cd all_plugins
-flutter build windows --debug
-flutter build windows --release
+platform="$1"
+build_mode="$2"
+cd all_packages
+flutter build "$platform" --"$build_mode"

.ci/scripts/create_all_plugins_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 ./script/tool/bin/flutter_plugin_tools.dart all-plugins-app \
+dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
     --output-dir=. --exclude script/configs/exclude_all_plugins_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-11
+os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
+
+xcrun simctl list
+xcrun simctl create Flutter-iPhone "$device" "$os" | xargs xcrun simctl boot

.ci/targets/build_all_plugins.yaml

@@ -3,5 +3,9 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
   - name: create all_plugins app
     script: .ci/scripts/create_all_plugins_app.sh
-  - name: build all_plugins
+  - name: build all_plugins debug
     script: .ci/scripts/build_all_plugins.sh
+    args: ["windows", "debug"]
+  - name: build all_plugins release
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["windows", "release"]

.ci/targets/mac_build_all_plugins.yaml

@@ -0,0 +1,11 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: create all_plugins app
+    script: .ci/scripts/create_all_plugins_app.sh
+  - name: build all_plugins debug
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["macos", "debug"]
+  - name: build all_plugins release
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["macos", "release"]

.ci/targets/mac_ios_platform_tests.yaml

@@ -0,0 +1,22 @@
+tasks:
+  - 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 11,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_lint_podspecs.yaml

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