From f63d56e45517f7672ea34b4541d36a5f043e2fd0 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 22 Oct 2020 13:50:54 -0700
Subject: [PATCH] App.framework must support iOS 8 for older Flutter projects
 (#68729)

* App.framework must support iOS 8 for older Flutter projects

* Fix test
---
 examples/flutter_view/ios/Flutter/AppFrameworkInfo.plist  | 2 +-
 examples/hello_world/ios/Flutter/AppFrameworkInfo.plist   | 2 +-
 examples/image_list/ios/Flutter/AppFrameworkInfo.plist    | 2 +-
 examples/layers/ios/Flutter/AppFrameworkInfo.plist        | 2 +-
 .../platform_channel/ios/Flutter/AppFrameworkInfo.plist   | 2 +-
 .../ios/Flutter/AppFrameworkInfo.plist                    | 2 +-
 examples/platform_view/ios/Flutter/AppFrameworkInfo.plist | 2 +-
 packages/flutter_tools/lib/src/base/build.dart            | 7 ++-----
 .../templates/app/ios.tmpl/Flutter/AppFrameworkInfo.plist | 2 +-
 .../ios/library/Flutter.tmpl/AppFrameworkInfo.plist       | 2 +-
 .../flutter_tools/test/general.shard/base/build_test.dart | 4 ++--
 .../general.shard/build_system/targets/common_test.dart   | 8 ++++----
 12 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/examples/flutter_view/ios/Flutter/AppFrameworkInfo.plist b/examples/flutter_view/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/flutter_view/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/flutter_view/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/examples/hello_world/ios/Flutter/AppFrameworkInfo.plist b/examples/hello_world/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/hello_world/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/hello_world/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/examples/image_list/ios/Flutter/AppFrameworkInfo.plist b/examples/image_list/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/image_list/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/image_list/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/examples/layers/ios/Flutter/AppFrameworkInfo.plist b/examples/layers/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/layers/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/layers/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/examples/platform_channel/ios/Flutter/AppFrameworkInfo.plist b/examples/platform_channel/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/platform_channel/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/platform_channel/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/examples/platform_channel_swift/ios/Flutter/AppFrameworkInfo.plist b/examples/platform_channel_swift/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/platform_channel_swift/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/platform_channel_swift/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/examples/platform_view/ios/Flutter/AppFrameworkInfo.plist b/examples/platform_view/ios/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/examples/platform_view/ios/Flutter/AppFrameworkInfo.plist
+++ b/examples/platform_view/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart
index ec61885752e..cb71b38873c 100644
--- a/packages/flutter_tools/lib/src/base/build.dart
+++ b/packages/flutter_tools/lib/src/base/build.dart
@@ -241,12 +241,9 @@ class AOTSnapshotter {
       '-arch', targetArch,
       if (isIOS)
         // When the minimum version is updated, remember to update
-        // template IPHONEOS_DEPLOYMENT_TARGET and MinimumOSVersion.
+        // template MinimumOSVersion.
         // https://github.com/flutter/flutter/pull/62902
-        // Also update the podhelper.rb "deployment version too low"
-        // warning suppression version.
-        // https://github.com/flutter/flutter/pull/66590
-        '-miphoneos-version-min=9.0',
+        '-miphoneos-version-min=8.0',
     ];
 
     const String embedBitcodeArg = '-fembed-bitcode';
diff --git a/packages/flutter_tools/templates/app/ios.tmpl/Flutter/AppFrameworkInfo.plist b/packages/flutter_tools/templates/app/ios.tmpl/Flutter/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/packages/flutter_tools/templates/app/ios.tmpl/Flutter/AppFrameworkInfo.plist
+++ b/packages/flutter_tools/templates/app/ios.tmpl/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/AppFrameworkInfo.plist b/packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/AppFrameworkInfo.plist
index f2872cf474e..6b4c0f78a78 100644
--- a/packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/AppFrameworkInfo.plist
+++ b/packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>8.0</string>
 </dict>
 </plist>
diff --git a/packages/flutter_tools/test/general.shard/base/build_test.dart b/packages/flutter_tools/test/general.shard/base/build_test.dart
index 1a200b3919b..b061e3c7c1e 100644
--- a/packages/flutter_tools/test/general.shard/base/build_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/build_test.dart
@@ -34,7 +34,7 @@ const FakeCommand kSdkPathCommand = FakeCommand(
 );
 
 const List<String> kDefaultClang = <String>[
-  '-miphoneos-version-min=9.0',
+  '-miphoneos-version-min=8.0',
   '-dynamiclib',
   '-Xlinker',
   '-rpath',
@@ -54,7 +54,7 @@ const List<String> kDefaultClang = <String>[
 ];
 
 const List<String> kBitcodeClang = <String>[
-  '-miphoneos-version-min=9.0',
+  '-miphoneos-version-min=8.0',
   '-dynamiclib',
   '-Xlinker',
   '-rpath',
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart
index a7f05435c7b..fee5a5e978d 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart
@@ -526,7 +526,7 @@ void main() {
         'clang',
         '-arch',
         'armv7',
-        '-miphoneos-version-min=9.0',
+        '-miphoneos-version-min=8.0',
         '-dynamiclib',
         '-Xlinker',
         '-rpath',
@@ -549,7 +549,7 @@ void main() {
         'clang',
         '-arch',
         'arm64',
-        '-miphoneos-version-min=9.0',
+        '-miphoneos-version-min=8.0',
         '-dynamiclib',
         '-Xlinker',
         '-rpath',
@@ -635,7 +635,7 @@ void main() {
         'clang',
         '-arch',
         'arm64',
-        '-miphoneos-version-min=9.0',
+        '-miphoneos-version-min=8.0',
         '-dynamiclib',
         '-Xlinker',
         '-rpath',
@@ -724,7 +724,7 @@ void main() {
         'clang',
         '-arch',
         'arm64',
-        '-miphoneos-version-min=9.0',
+        '-miphoneos-version-min=8.0',
         '-dynamiclib',
         '-Xlinker',
         '-rpath',