From 1c3e6595155bed464e2d782ce1df68bb698bcd47 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Tue, 1 Dec 2020 15:46:38 -0800
Subject: [PATCH 01/21] [pigeon] Null safe requires Dart 2.12

---
 packages/pigeon/CHANGELOG.md            | 4 ++++
 packages/pigeon/lib/dart_generator.dart | 4 ++--
 packages/pigeon/pubspec.yaml            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index fa028701c92..13af210ceed 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.17
+
+* Null safe required Dart 2.12.
+
 ## 0.1.16
 
 * Fixed running in certain environments where NNBD is enabled by default.
diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart
index 121056803fb..469569e7f3b 100644
--- a/packages/pigeon/lib/dart_generator.dart
+++ b/packages/pigeon/lib/dart_generator.dart
@@ -7,7 +7,7 @@ import 'generator_tools.dart';
 
 /// Options that control how Dart code will be generated.
 class DartOptions {
-  /// Determines if the generated code has null safety annotations (Dart >2.10 required).
+  /// Determines if the generated code has null safety annotations (Dart >=2.12 required).
   bool isNullSafe = false;
 }
 
@@ -155,7 +155,7 @@ void generateDart(DartOptions opt, Root root, StringSink sink) {
   indent.writeln('// $seeAlsoWarning');
   indent.writeln(
       '// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import');
-  indent.writeln('// @dart = ${opt.isNullSafe ? '2.10' : '2.8'}');
+  indent.writeln('// @dart = ${opt.isNullSafe ? '2.12' : '2.8'}');
   indent.writeln('import \'dart:async\';');
   indent.writeln('import \'package:flutter/services.dart\';');
   indent.writeln(
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index fbdd518e1cf..b3ea3c2fefc 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -1,5 +1,5 @@
 name: pigeon
-version: 0.1.16
+version: 0.1.17
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 homepage: https://github.com/flutter/packages/tree/master/packages/pigeon
 dependencies:

From 6912e2ec1e0d614134053aec353936dcb1cf26c1 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Tue, 1 Dec 2020 15:56:35 -0800
Subject: [PATCH 02/21] Update pigeon version

---
 packages/pigeon/lib/generator_tools.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index 447c37075c3..7d81f8314a4 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -8,7 +8,7 @@ import 'dart:mirrors';
 import 'ast.dart';
 
 /// The current version of pigeon.
-const String pigeonVersion = '0.1.16';
+const String pigeonVersion = '0.1.17';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

From 7d99ef58999db893ff86b539abdc932921b36ec0 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 15:22:32 -0800
Subject: [PATCH 03/21] Bump version in pubspec.yaml

---
 packages/pigeon/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index b3ea3c2fefc..3d2425bc6ac 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -1,5 +1,5 @@
 name: pigeon
-version: 0.1.17
+version: 0.1.18
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 homepage: https://github.com/flutter/packages/tree/master/packages/pigeon
 dependencies:

From 099f7e93339ca561db5852eb6502b41e56056b8e Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 15:25:22 -0800
Subject: [PATCH 04/21] Generator

---
 packages/pigeon/lib/dart_generator.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart
index 215cfedb09a..ac4333e48aa 100644
--- a/packages/pigeon/lib/dart_generator.dart
+++ b/packages/pigeon/lib/dart_generator.dart
@@ -284,7 +284,7 @@ void generateTestDart(
   indent.writeln(
     '// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import',
   );
-  indent.writeln('// @dart = ${opt.isNullSafe ? '2.10' : '2.8'}');
+  indent.writeln('// @dart = ${opt.isNullSafe ? '2.12' : '2.8'}');
   indent.writeln('import \'dart:async\';');
   indent.writeln(
     'import \'dart:typed_data\' show Uint8List, Int32List, Int64List, Float64List;',

From 0cefb0e678573be2f8b2daa339824215dab1056a Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 15:26:17 -0800
Subject: [PATCH 05/21] tense

---
 packages/pigeon/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index e27404b4842..d9b335f3a44 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.1.18
 
-* Null safe required Dart 2.12.
+* Null safe requires Dart 2.12.
 
 ## 0.1.17
 

From 34ad3522b1ebb823aeded8869350f12a56e32b04 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 15:29:50 -0800
Subject: [PATCH 06/21] Version

---
 packages/pigeon/lib/generator_tools.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index cc2696b253c..bbb76e2b74a 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -8,7 +8,7 @@ import 'dart:mirrors';
 import 'ast.dart';
 
 /// The current version of pigeon.
-const String pigeonVersion = '0.1.17';
+const String pigeonVersion = '0.1.18';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

From f5416cf0eb81856d2ae769773cf48f714f27f3cf Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 15:45:31 -0800
Subject: [PATCH 07/21] Use Flutter master

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 673bf9ba34e..a72f5b897c0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -73,6 +73,8 @@ task:
   setup_script:
     - pod repo update
     - git fetch origin master
+    - flutter channel master  # required for Dart with null-safety
+    - flutter upgrade
     - flutter doctor
     - pub global activate flutter_plugin_tools
     - brew install clang-format

From 9feb91a3b475493a9ab9b486cb95f283ca965de2 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 15:47:42 -0800
Subject: [PATCH 08/21] Update setup script

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

diff --git a/.cirrus.yml b/.cirrus.yml
index a72f5b897c0..76fa6b2b92d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -73,7 +73,7 @@ task:
   setup_script:
     - pod repo update
     - git fetch origin master
-    - flutter channel master  # required for Dart with null-safety
+    - flutter channel dev  # required for Dart with null-safety
     - flutter upgrade
     - flutter doctor
     - pub global activate flutter_plugin_tools

From 2ae3b9fd6269215c70320da908149a41699765ca Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 11 Dec 2020 17:17:15 -0800
Subject: [PATCH 09/21] Precache artifacts

---
 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 76fa6b2b92d..8d8dd990ab0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -75,6 +75,7 @@ task:
     - git fetch origin master
     - flutter channel dev  # required for Dart with null-safety
     - flutter upgrade
+    - flutter precache
     - flutter doctor
     - pub global activate flutter_plugin_tools
     - brew install clang-format

From 0126fa069a1086eb0763ab966f3231f1497bbc67 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 14 Dec 2020 18:57:45 -0800
Subject: [PATCH 10/21] debug

---
 packages/pigeon/run_tests.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index b740f5f346b..1a339ff8db2 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -39,6 +39,9 @@ test_pigeon_ios() {
     --objc_header_out $temp_dir/pigeon.h \
     --objc_source_out $temp_dir/pigeon.m
 
+  ls -la $framework_path
+  find $framework_path -name 'Flutter.h'
+
   xcrun clang \
     -arch arm64 \
     -isysroot $(xcrun --sdk iphoneos --show-sdk-path) \

From 235d3c93ff8dae162f0954576a102f9fbe0acecf Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 14 Dec 2020 19:20:34 -0800
Subject: [PATCH 11/21] Try with different image

---
 .cirrus.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8d8dd990ab0..d590dc2fa4b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -67,14 +67,15 @@ task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   name: local_tests
   osx_instance:
-    image: catalina-flutter
+    image: high-sierra-xcode-9.4.1
   env:
     PATH: $PATH:/usr/local/bin
   setup_script:
     - pod repo update
     - git fetch origin master
-    - flutter channel dev  # required for Dart with null-safety
-    - flutter upgrade
+    - 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
     - flutter precache
     - flutter doctor
     - pub global activate flutter_plugin_tools

From 4108f07394697fb21d3e7ed88d930c88110f4188 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 14 Dec 2020 19:42:52 -0800
Subject: [PATCH 12/21] Debug version of dartanalyzer

---
 packages/pigeon/run_tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index 1a339ff8db2..d663087a377 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -90,6 +90,10 @@ test_null_safe_dart() {
     --dart_null_safety \
     --dart_out $temp_dir/pigeon.dart
 
+  which dartanalyzer
+
+  dartanalyzer --version
+
   dartanalyzer $temp_dir/pigeon.dart --fatal-infos --fatal-warnings --packages ./e2e_tests/test_objc/.packages --enable-experiment=non-nullable
   rm -rf $temp_dir
 }

From 865b56994ba5854f4eab1d36cb1af594bdd56705 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 14 Dec 2020 19:44:28 -0800
Subject: [PATCH 13/21] Upgrade Flutter version

---
 .cirrus.yml                  | 10 ++++++----
 packages/pigeon/run_tests.sh |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d590dc2fa4b..5041f794eb9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -71,14 +71,16 @@ task:
   env:
     PATH: $PATH:/usr/local/bin
   setup_script:
-    - pod repo update
-    - git fetch origin master
     - 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
-    - flutter precache
-    - flutter doctor
     - pub global activate flutter_plugin_tools
     - brew install clang-format
+  upgrade_script:
+    - pod repo update
+    - git fetch origin master
+    - flutter channel master
+    - flutter upgrade
   build_script:
+    - flutter doctor
     - ./script/local_tests.sh
diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index d663087a377..480bf464892 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -1,7 +1,7 @@
 ###############################################################################
 # run_tests.sh
 #
-# This runs all the different types of tests for pigeon.  It should be run from 
+# This runs all the different types of tests for pigeon.  It should be run from
 # the directory that contains the script.
 ###############################################################################
 

From 01ada7dcb79bb5e5e8dadbcd150ccad3a9c121c3 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Fri, 29 Jan 2021 18:40:45 -0800
Subject: [PATCH 14/21] Add ios-armv7_arm64

---
 packages/pigeon/run_tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index 480bf464892..365e7e4bfe9 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -46,6 +46,7 @@ test_pigeon_ios() {
     -arch arm64 \
     -isysroot $(xcrun --sdk iphoneos --show-sdk-path) \
     -F $framework_path \
+    -F $framework_path/Flutter.xcframework/ios-armv7_arm64 \
     -Werror \
     -fobjc-arc \
     -c $temp_dir/pigeon.m \

From b0f0b4140ccd287eb9cef2264cad40f2c531cd03 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 1 Feb 2021 09:42:12 -0800
Subject: [PATCH 15/21] Update podfile

---
 .../pigeon/e2e_tests/test_objc/ios/Podfile    | 80 ++++---------------
 1 file changed, 17 insertions(+), 63 deletions(-)

diff --git a/packages/pigeon/e2e_tests/test_objc/ios/Podfile b/packages/pigeon/e2e_tests/test_objc/ios/Podfile
index 8fdf29fc3d1..c382d62e477 100644
--- a/packages/pigeon/e2e_tests/test_objc/ios/Podfile
+++ b/packages/pigeon/e2e_tests/test_objc/ios/Podfile
@@ -10,79 +10,33 @@ project 'Runner', {
   'Release' => :release,
 }
 
-def parse_KV_file(file, separator='=')
-  file_abs_path = File.expand_path(file)
-  if !File.exists? file_abs_path
-    return [];
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
   end
-  generated_key_values = {}
-  skip_line_start_symbols = ["#", "/"]
-  File.foreach(file_abs_path) do |line|
-    next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
-    plugin = line.split(pattern=separator)
-    if plugin.length == 2
-      podname = plugin[0].strip()
-      path = plugin[1].strip()
-      podpath = File.expand_path("#{path}", file_abs_path)
-      generated_key_values[podname] = podpath
-    else
-      puts "Invalid plugin specification: #{line}"
-    end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
   end
-  generated_key_values
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
-target 'Runner' do
-  # Flutter Pod
-  use_frameworks!
-
-  copied_flutter_dir = File.join(__dir__, 'Flutter')
-  copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
-  copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
-  unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
-    # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
-    # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
-    # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
-
-    generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
-    unless File.exist?(generated_xcode_build_settings_path)
-      raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-    end
-    generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
-    cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
-
-    unless File.exist?(copied_framework_path)
-      FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
-    end
-    unless File.exist?(copied_podspec_path)
-      FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
-    end
-  end
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
-  # Keep pod path relative so it can be checked into Podfile.lock.
-  pod 'Flutter', :path => 'Flutter'
+flutter_ios_podfile_setup
 
-  # Plugin Pods
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
 
-  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
-  # referring to absolute paths on developers' machines.
-  system('rm -rf .symlinks')
-  system('mkdir -p .symlinks/plugins')
-  plugin_pods = parse_KV_file('../.flutter-plugins')
-  plugin_pods.each do |name, path|
-    symlink = File.join('.symlinks', 'plugins', name)
-    File.symlink(path, symlink)
-    pod name, :path => File.join(symlink, 'ios')
-  end
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
-# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
-install! 'cocoapods', :disable_input_output_paths => true
-
 post_install do |installer|
   installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['ENABLE_BITCODE'] = 'NO'
-    end
+    flutter_additional_ios_build_settings(target)
   end
 end
+

From d3b179472a96b805f223af9a1817ff021aa2c2bb Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 1 Feb 2021 11:04:57 -0800
Subject: [PATCH 16/21] Revert osx image

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

diff --git a/.cirrus.yml b/.cirrus.yml
index b03ad89add5..baf2fda5f9c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -70,7 +70,7 @@ task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   name: local_tests
   osx_instance:
-    image: high-sierra-xcode-9.4.1
+    image: catalina-flutter
   env:
     PATH: $PATH:/usr/local/bin
   setup_script:

From cc06ff1f299bab18e3ec5e0f5d700f54c64e00dd Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 1 Feb 2021 15:15:48 -0800
Subject: [PATCH 17/21] Remove debug commands

---
 packages/pigeon/run_tests.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index 365e7e4bfe9..43df0707316 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -39,9 +39,6 @@ test_pigeon_ios() {
     --objc_header_out $temp_dir/pigeon.h \
     --objc_source_out $temp_dir/pigeon.m
 
-  ls -la $framework_path
-  find $framework_path -name 'Flutter.h'
-
   xcrun clang \
     -arch arm64 \
     -isysroot $(xcrun --sdk iphoneos --show-sdk-path) \
@@ -91,10 +88,6 @@ test_null_safe_dart() {
     --dart_null_safety \
     --dart_out $temp_dir/pigeon.dart
 
-  which dartanalyzer
-
-  dartanalyzer --version
-
   dartanalyzer $temp_dir/pigeon.dart --fatal-infos --fatal-warnings --packages ./e2e_tests/test_objc/.packages --enable-experiment=non-nullable
   rm -rf $temp_dir
 }

From de8e9ea5970f55ef6560e002ff5b2ff25c9daa18 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 1 Feb 2021 17:46:01 -0800
Subject: [PATCH 18/21] Remove xcpretty

---
 packages/pigeon/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index 43df0707316..32797814971 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -195,7 +195,7 @@ xcodebuild \
   -scheme RunnerTests \
   -sdk iphonesimulator \
   -destination 'platform=iOS Simulator,name=iPhone 8' \
-  test | xcpretty
+  test
 popd
 
 ###############################################################################

From 228749a4cfb250017fea6c68f7174f6dcebbc2b5 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 1 Feb 2021 18:29:32 -0800
Subject: [PATCH 19/21] Test on master and stable

---
 .cirrus.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index baf2fda5f9c..b4a171704ef 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -73,6 +73,9 @@ task:
     image: catalina-flutter
   env:
     PATH: $PATH:/usr/local/bin
+    matrix:
+      CHANNEL: "master"
+      CHANNEL: "stable"
   setup_script:
     - git clone https://github.com/flutter/flutter.git
     - git fetch origin master
@@ -82,7 +85,7 @@ task:
   upgrade_script:
     - pod repo update
     - git fetch origin master
-    - flutter channel master
+    - flutter channel $CHANNEL
     - flutter upgrade
   build_script:
     - flutter doctor

From 318e04ca845f5724a11f1e36bd815a8c293f1fcb Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 1 Feb 2021 19:24:07 -0800
Subject: [PATCH 20/21] Skip test and add TODO

---
 packages/pigeon/run_tests.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
index 32797814971..beb8b10a49e 100755
--- a/packages/pigeon/run_tests.sh
+++ b/packages/pigeon/run_tests.sh
@@ -8,6 +8,12 @@
 # exit when any command fails
 set -ex
 
+# TODO(blasten): Enable on stable when possible.
+# https://github.com/flutter/flutter/issues/75187
+if [[ "$CHANNEL" == "stable" ]]; then
+  exit 0
+fi
+
 ###############################################################################
 # Variables
 ###############################################################################

From fcb0ca05790dd322bf4be6f9e7c22a8e719a9ade Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Tue, 2 Feb 2021 09:56:16 -0800
Subject: [PATCH 21/21] Clean up

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

diff --git a/.cirrus.yml b/.cirrus.yml
index b4a171704ef..91a71f1c457 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -77,16 +77,15 @@ task:
       CHANNEL: "master"
       CHANNEL: "stable"
   setup_script:
+    - 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
     - pub global activate flutter_plugin_tools
     - brew install clang-format
   upgrade_script:
-    - pod repo update
-    - git fetch origin master
     - flutter channel $CHANNEL
     - flutter upgrade
-  build_script:
     - flutter doctor
+  build_script:
     - ./script/local_tests.sh