From 7bbf111e4fe61c92cbfef316ba0a67f22d879de6 Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor.korotkov@gmail.com>
Date: Fri, 12 Jul 2019 09:47:54 -0400
Subject: [PATCH 1/4] [ci] Switch to macOS VM with Flutter pre-installed

---
 .cirrus.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5286dcd22302..cac3af00210c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -59,26 +59,20 @@ task:
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
-    image: mojave-xcode-10.1
-  install_cocoapods_script:
-    - sudo gem install cocoapods
+    image: mojave-xcode-10.2-flutter
   setup_script:
     - brew update
-    - brew install libimobiledevice
-    - brew install ideviceinstaller
-    - brew install ios-deploy
     - pod repo update
-    - git clone https://github.com/flutter/flutter.git
-    - git fetch origin master
-    - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
+    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
+  switch_channel_script:
+    - flutter channel master
+    - flutter upgrade
     - flutter doctor
+  activate_script:
     - pub global activate flutter_plugin_tools
-    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
-      script:
-        - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
-        - ./script/build_all_plugins_app.sh ios --no-codesign
+      script: ./script/build_all_plugins_app.sh ios --no-codesign
     - name: build-ipas+drive-examples
       env:
         PATH: $PATH:/usr/local/bin
@@ -89,6 +83,5 @@ task:
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       build_script:
-        - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
         - ./script/incremental_build.sh build-examples --ipa
-        - ./script/incremental_build.sh drive-examples
+        - ./script/incremental_build.sh drive-examples
\ No newline at end of file

From 7e39f2a2189890c0032a0bac21997b615a1aed23 Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor.korotkov@gmail.com>
Date: Fri, 12 Jul 2019 10:14:25 -0400
Subject: [PATCH 2/4] No need to `brew update`

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index cac3af00210c..7f78221c6237 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -61,7 +61,6 @@ task:
   osx_instance:
     image: mojave-xcode-10.2-flutter
   setup_script:
-    - brew update
     - pod repo update
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
   switch_channel_script:

From 0e47f90ca94e925c99361452f4bd42b7a1bca40c Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor.korotkov@gmail.com>
Date: Fri, 12 Jul 2019 10:23:14 -0400
Subject: [PATCH 3/4] Create simulator in a separate script

---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7f78221c6237..c69f3f8c4981 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -62,13 +62,14 @@ task:
     image: mojave-xcode-10.2-flutter
   setup_script:
     - pod repo update
-    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
   switch_channel_script:
     - flutter channel master
     - flutter upgrade
     - flutter doctor
   activate_script:
     - pub global activate flutter_plugin_tools
+  create_simulator_script:
+    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
       script: ./script/build_all_plugins_app.sh ios --no-codesign

From ad983895b84af491988a0d9fb9cfe2a716efed58 Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor.korotkov@gmail.com>
Date: Fri, 12 Jul 2019 10:34:12 -0400
Subject: [PATCH 4/4] xcrun simctl list

---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c69f3f8c4981..3bfa2ef9dd87 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -69,7 +69,8 @@ task:
   activate_script:
     - pub global activate flutter_plugin_tools
   create_simulator_script:
-    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
+    - xcrun simctl list
+    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-2 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
       script: ./script/build_all_plugins_app.sh ios --no-codesign