Set MinimumOSVersion in iOS Info.plist based on buildroot setting

Author: jmagman

build/copy_info_plist.py

@@ -10,14 +10,12 @@
 
 Precondition: $CWD/../../flutter is the path to the flutter engine repo.
 
-usage: copy_info_plist.py <src_path> <dest_path> --bitcode=<enable_bitcode>
+usage: copy_info_plist.py --source <src_path> --destination <dest_path> --bitcode --minversion=<deployment_target>
 """
 
-
-
-
 import subprocess
 
+import argparse
 import sys
 import git_revision
 import os
@@ -30,13 +28,25 @@ def GetClangVersion(bitcode) :
   return version.splitlines()[0]
 
 def main():
-  text = open(sys.argv[1]).read()
+
+  parser = argparse.ArgumentParser(
+      description='Copies the Info.plist and adds extra fields to it like the git hash of the engine')
+
+  parser.add_argument('--source', help='Path to Info.plist source template', type=str, required=True)
+  parser.add_argument('--destination', help='Path to destination Info.plist', type=str, required=True)
+  parser.add_argument('--bitcode', help='Built with bitcode', action='store_true')
+  parser.add_argument('--minversion', help='Minimum device OS version like "9.0"', type=str)
+
+  args = parser.parse_args()
+
+  text = open(args.source).read()
   engine_path = os.path.join(os.getcwd(), "..", "..", "flutter")
   revision = git_revision.GetRepositoryVersion(engine_path)
-  clang_version = GetClangVersion(sys.argv[3] == "--bitcode=true")
-  text = text.format(revision, clang_version)
+  bitcode = args.bitcode is not None;
+  clang_version = GetClangVersion(bitcode)
+  text = text.format(revision = revision, clang_version = clang_version, min_version = args.minversion)
 
-  with open(sys.argv[2], "w") as outfile:
+  with open(args.destination, "w") as outfile:
     outfile.write(text)
 
 if __name__ == "__main__":

shell/platform/darwin/ios/BUILD.gn

@@ -259,6 +259,7 @@ shared_library("ios_test_flutter") {
     ":flutter_framework_source",
     ":ios_gpu_configuration",
     ":ios_test_flutter_mrc",
+    ":universal_flutter_framework",
     "//flutter/common:common",
     "//flutter/lib/ui:ui",
     "//flutter/shell/platform/darwin/common:framework_shared",
@@ -323,10 +324,16 @@ action("copy_framework_info_plist") {
   sources = [ "framework/Info.plist" ]
   outputs = [ "$_flutter_framework_dir/Info.plist" ]
   args = [
+    "--source",
     rebase_path(sources[0]),
+    "--destination",
     rebase_path(outputs[0]),
-    "--bitcode=$enable_bitcode",
+    "--minversion",
+    ios_deployment_target,
   ]
+  if (enable_bitcode) {
+    args += [ "--bitcode" ]
+  }
 }
 
 copy("copy_framework_module_map") {

shell/platform/darwin/ios/framework/Info.plist

@@ -21,10 +21,10 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>{min_version}</string>
   <key>FlutterEngine</key>
-  <string>{0}</string>
+  <string>{revision}</string>
   <key>ClangVersion</key>
-  <string>{1}</string>
+  <string>{clang_version}</string>
 </dict>
 </plist>

shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import <Foundation/Foundation.h>
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
@@ -30,6 +31,21 @@ - (void)testCreate {
   XCTAssertNotNil(engine);
 }
 
+- (void)testInfoPlist {
+  NSBundle* flutterBundle = [NSBundle bundleForClass:[FlutterEngine class]];
+  XCTAssertEqualObjects(flutterBundle.bundleIdentifier, @"io.flutter.flutter");
+  NSDictionary<NSString*, id>* infoDictionary = flutterBundle.infoDictionary;
+  XCTAssertEqualObjects(infoDictionary[@"MinimumOSVersion"], @"9.0");
+
+  // SHA length is 40.
+  XCTAssertEqual(((NSString*)infoDictionary[@"FlutterEngine"]).length, 40);
+
+  // {clang_version} placeholder is 15 characters. The clang string version
+  // is longer than that, so check if the placeholder has been replaced, without
+  // actually checking a literal string, which could be different on various machines.
+  XCTAssertTrue(((NSString*)infoDictionary[@"ClangVersion"]).length > 15);
+}
+
 - (void)testDeallocated {
   __weak FlutterEngine* weakEngine = nil;
   {

shell/platform/embedder/BUILD.gn

@@ -320,10 +320,14 @@ if (is_mac && !embedder_for_target) {
     outputs =
         [ "$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist" ]
     args = [
+      "--source",
       rebase_path(sources[0]),
+      "--destination",
       rebase_path(outputs[0]),
-      "--bitcode=$enable_bitcode",
     ]
+    if (enable_bitcode) {
+      args += [ "--bitcode" ]
+    }
   }
 
   copy("copy_module_map") {

shell/platform/embedder/assets/EmbedderInfo.plist

@@ -25,8 +25,8 @@
   <key>NSHumanReadableCopyright</key>
   <string>Copyright 2013 The Flutter Authors. All rights reserved.</string>
   <key>FlutterEngine</key>
-  <string>{0}</string>
+  <string>{revision}</string>
   <key>ClangVersion</key>
-  <string>{1}</string>
+  <string>{clang_version}</string>
 </dict>
 </plist>