Merge origin changes

.ci.yaml

@@ -25,6 +25,17 @@ platform_properties:
         ]
       device_type: none
       os: Windows
+  mac_arm64:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "xcode", "version": "14a5294e"},
+          {"dependency": "gems", "version": "v3.3.14"}
+        ]
+      os: Mac-12
+      device_type: none
+      cpu: arm64
+      xcode: 14a5294e # xcode 14.0 beta 5
   mac_x64:
     properties:
       dependencies: >-
@@ -36,31 +47,32 @@ platform_properties:
       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.
+  # When moving it, rename the task and file to check_podspecs
   - name: Mac_x64 lint_podspecs
     recipe: plugins/plugins
     timeout: 30
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_lint_podspecs.yaml
+      target_file: macos_lint_podspecs.yaml
 
   ### macOS desktop tasks ###
-  # macos-platform_tests builds all the plugins on M1, so this build is run
+  # macos-platform_tests builds all the plugins on ARM, 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
     timeout: 30
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_build_all_plugins.yaml
+      target_file: macos_build_all_plugins.yaml
       channel: master
 
   - name: Mac_x64 build_all_plugins stable
@@ -69,97 +81,267 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_build_all_plugins.yaml
+      target_file: macos_build_all_plugins.yaml
       channel: stable
 
+  - name: Mac_arm64 macos_platform_tests master
+    recipe: plugins/plugins
+    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
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 60
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: macos_platform_tests.yaml
+
   ### 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
+  # TODO(stuartmorgan): Swap the architecture of this and ios_platform_tests_*
+  # once simulator tests are reliable on the ARM infrastructure. See discussion
+  # at https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
+  - name: Mac_arm64 ios_build_all_plugins master
     recipe: plugins/plugins
     timeout: 30
     properties:
+      channel: master
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: ios_build_all_plugins.yaml
+
+  - name: Mac_arm64 ios_build_all_plugins stable
+    recipe: plugins/plugins
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_build_all_plugins.yaml
+
+  - name: Mac_x64 ios_build_all_plugins master
+    bringup: true # New task, replaces ARM version
+    recipe: plugins/plugins
+    timeout: 30
+    properties:
+      channel: master
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_build_all_plugins.yaml
+
+  - name: Mac_x64 ios_build_all_plugins stable
+    bringup: true # New task, replaces ARM version
+    recipe: plugins/plugins
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_build_all_plugins.yaml
+
+  # TODO(stuartmorgan): Swap the architecture of 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
+    timeout: 60
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 0 --shardCount 4"
 
   - name: Mac_x64 ios_platform_tests_2_of_4 master
     recipe: plugins/plugins
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 1 --shardCount 4"
 
   - name: Mac_x64 ios_platform_tests_3_of_4 master
     recipe: plugins/plugins
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 2 --shardCount 4"
 
   - name: Mac_x64 ios_platform_tests_4_of_4 master
     recipe: plugins/plugins
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 3 --shardCount 4"
 
+  - name: Mac_arm64 ios_platform_tests_shard_1 master - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    timeout: 60
+    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_x64 ios_platform_tests_1_of_4 stable
     recipe: plugins/plugins
     presubmit: false
-    timeout: 30
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: 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
-    timeout: 30
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: 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
-    timeout: 30
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: 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
-    timeout: 30
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_ios_platform_tests.yaml
+      target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 3 --shardCount 4"
 
+  - name: Mac_arm64 ios_platform_tests_shard_1 stable - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 60
+    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 - plugins
+    bringup: true # New task; will replace Intel version
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 60
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 4 --shardCount 5"
+
   - name: Windows win32-platform_tests master
     recipe: plugins/plugins
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
@@ -172,7 +354,8 @@ targets:
 
   - name: Windows win32-platform_tests stable
     recipe: plugins/plugins
-    timeout: 30
+    presubmit: false
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
@@ -188,7 +371,7 @@ targets:
     timeout: 30
     properties:
       add_recipes_cq: "true"
-      target_file: build_all_plugins.yaml
+      target_file: windows_build_all_plugins.yaml
       channel: master
       version_file: flutter_master.version
       dependencies: >
@@ -201,7 +384,7 @@ targets:
     timeout: 30
     properties:
       add_recipes_cq: "true"
-      target_file: build_all_plugins.yaml
+      target_file: windows_build_all_plugins.yaml
       channel: stable
       version_file: flutter_stable.version
       dependencies: >

.ci/flutter_master.version

@@ -1 +1 @@
-dbc9306380d8a72273b478b8fcc934a6014f946d
+c5e8757fcb795867f9f1ef42d7c2e98a74d6a231

.ci/flutter_stable.version

@@ -1 +1 @@
-135454af32477f815a7525073027a3ff9eff1bfd
+7048ed95a5ad3e43d697e0c397464193991fc230

.ci/scripts/build_all_plugins.sh

@@ -5,5 +5,6 @@
 
 platform="$1"
 build_mode="$2"
+shift 2
 cd all_packages
-flutter build "$platform" --"$build_mode"
+flutter build "$platform" --"$build_mode" "$@"

.ci/scripts/create_all_plugins_app.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 
 dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
-    --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
+    --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml