Fix in app purchase android billing client reconnect

.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,7 +47,7 @@ platform_properties:
       device_type: none
       cpu: x86
       xcode: 14a5294e # xcode 14.0 beta 5
-      
+
 
 targets:
   ### iOS+macOS tasks ***
@@ -50,18 +61,18 @@ targets:
     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
@@ -70,97 +81,156 @@ 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
+  # ios_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 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
-      package_sharding: "--shardIndex 0 --shardCount 4"
+      target_file: ios_build_all_plugins.yaml
 
-  - name: Mac_x64 ios_platform_tests_2_of_4 master
+  - name: Mac_x64 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
+
+  # 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 - plugins
+    recipe: plugins/plugins
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
-      package_sharding: "--shardIndex 1 --shardCount 4"
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 5"
 
-  - name: Mac_x64 ios_platform_tests_3_of_4 master
+  - name: Mac_arm64 ios_platform_tests_shard_2 master - plugins
     recipe: plugins/plugins
-    timeout: 30
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
-      package_sharding: "--shardIndex 2 --shardCount 4"
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 5"
 
-  - name: Mac_x64 ios_platform_tests_4_of_4 master
+  - name: Mac_arm64 ios_platform_tests_shard_3 master - plugins
     recipe: plugins/plugins
-    timeout: 30
+    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 - plugins
+    recipe: plugins/plugins
+    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 - plugins
+    recipe: plugins/plugins
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_ios_platform_tests.yaml
-      package_sharding: "--shardIndex 3 --shardCount 4"
+      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
+  - name: Mac_arm64 ios_platform_tests_shard_1 stable - plugins
     recipe: plugins/plugins
     presubmit: false
-    timeout: 30
+    timeout: 120
     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"
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 5"
 
-  - name: Mac_x64 ios_platform_tests_2_of_4 stable
+  - name: Mac_arm64 ios_platform_tests_shard_2 stable - plugins
     recipe: plugins/plugins
     presubmit: false
-    timeout: 30
+    timeout: 120
     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"
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 5"
 
-  - name: Mac_x64 ios_platform_tests_3_of_4 stable
+  - name: Mac_arm64 ios_platform_tests_shard_3 stable - plugins
     recipe: plugins/plugins
     presubmit: false
-    timeout: 30
+    timeout: 120
     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"
+      target_file: ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 5"
 
-  - name: Mac_x64 ios_platform_tests_4_of_4 stable
+  - name: Mac_arm64 ios_platform_tests_shard_4 stable - plugins
     recipe: plugins/plugins
     presubmit: false
-    timeout: 30
+    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 - plugins
+    recipe: plugins/plugins
+    presubmit: false
+    timeout: 120
     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"
+      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
@@ -173,7 +243,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
@@ -189,7 +260,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: >
@@ -202,23 +273,14 @@ 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: >
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows plugin_tools_tests
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: plugin_tools_tests.yaml
-      channel: master
-      version_file: flutter_master.version
-
   - name: Linux ci_yaml plugins roller
     recipe: infra/ci_yaml
     timeout: 30

.ci/flutter_master.version

@@ -1 +1 @@
-973cff40b4022edd59dbf44475ffc569bece1ea8
+33e4d21f7c13e02a7c92c7272309afbff792a864

.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/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 ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \
+dart pub global run flutter_plugin_tools build-examples --windows \
    --packages-for-branch --log-timing

.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 create-all-packages-app \
-    --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
+dart pub global run flutter_plugin_tools create-all-packages-app \
+    --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml

.ci/scripts/create_simulator.sh

@@ -3,7 +3,7 @@
 # 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
+device=com.apple.CoreSimulator.SimDeviceType.iPhone-13
 os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
 
 xcrun simctl list

.ci/scripts/drive_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 ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
+dart pub global run flutter_plugin_tools 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 ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
+dart pub global run flutter_plugin_tools native-test --windows \
    --no-integration --packages-for-branch --log-timing

.ci/scripts/prepare_tool.sh

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

.ci/targets/ios_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 for iOS debug
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["ios", "debug", "--no-codesign"]
+  - name: build all_plugins for iOS release
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["ios", "release", "--no-codesign"]

.ci/targets/mac_ios_platform_tests.yaml → .ci/targets/ios_platform_tests.yaml

@@ -15,7 +15,7 @@ tasks:
     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"]
+    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`.

.ci/targets/mac_build_all_plugins.yaml → .ci/targets/macos_build_all_plugins.yaml

@@ -3,9 +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 debug
+  - name: build all_plugins for macOS debug
     script: .ci/scripts/build_all_plugins.sh
     args: ["macos", "debug"]
-  - name: build all_plugins release
+  - name: build all_plugins for macOS release
     script: .ci/scripts/build_all_plugins.sh
     args: ["macos", "release"]

.ci/targets/macos_platform_tests.yaml

@@ -0,0 +1,19 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: build examples
+    script: script/tool_runner.sh
+    args: ["build-examples", "--macos"]
+  - name: xcode analyze
+    script: script/tool_runner.sh
+    args: ["xcode-analyze", "--macos"]
+  - name: xcode analyze deprecation
+    # Ensure we don't accidentally introduce deprecated code.
+    script: script/tool_runner.sh
+    args: ["xcode-analyze", "--macos", "--macos-min-version=12.3"]
+  - name: native test
+    script: script/tool_runner.sh
+    args: ["native-test", "--macos"]
+  - name: drive examples
+    script: script/tool_runner.sh
+    args: ["drive-examples", "--macos", "--exclude=script/configs/exclude_integration_macos.yaml"]