Unverified Commit 036cae36 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Enforce minimum plugin version iOS 11 (#103545)

parent 9f28b83c
...@@ -204,7 +204,7 @@ class $dartPluginClass { ...@@ -204,7 +204,7 @@ class $dartPluginClass {
podspecContent = podspecContent.replaceFirst( podspecContent = podspecContent.replaceFirst(
versionString, versionString,
target == 'ios' target == 'ios'
? "s.platform = :ios, '7.0'" ? "s.platform = :ios, '10.0'"
: "s.platform = :osx, '10.8'" : "s.platform = :osx, '10.8'"
); );
podspec.writeAsStringSync(podspecContent, flush: true); podspec.writeAsStringSync(podspecContent, flush: true);
...@@ -240,8 +240,8 @@ class $dartPluginClass { ...@@ -240,8 +240,8 @@ class $dartPluginClass {
if (target == 'ios') { if (target == 'ios') {
// Plugins with versions lower than the app version should not have IPHONEOS_DEPLOYMENT_TARGET set. // Plugins with versions lower than the app version should not have IPHONEOS_DEPLOYMENT_TARGET set.
// The plugintest plugin target should not have IPHONEOS_DEPLOYMENT_TARGET set since it has been lowered // The plugintest plugin target should not have IPHONEOS_DEPLOYMENT_TARGET set since it has been lowered
// in _reduceDarwinPluginMinimumVersion to 7, which is below the target version of 9. // in _reduceDarwinPluginMinimumVersion to 10, which is below the target version of 11.
if (podsProjectContent.contains('IPHONEOS_DEPLOYMENT_TARGET = 7')) { if (podsProjectContent.contains('IPHONEOS_DEPLOYMENT_TARGET = 10')) {
throw TaskResult.failure('Plugin build setting IPHONEOS_DEPLOYMENT_TARGET not removed'); throw TaskResult.failure('Plugin build setting IPHONEOS_DEPLOYMENT_TARGET not removed');
} }
if (!podsProjectContent.contains(r'"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited) i386";')) { if (!podsProjectContent.contains(r'"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited) i386";')) {
......
...@@ -34,7 +34,7 @@ def flutter_additional_ios_build_settings(target) ...@@ -34,7 +34,7 @@ def flutter_additional_ios_build_settings(target)
return unless target.platform_name == :ios return unless target.platform_name == :ios
# [target.deployment_target] is a [String] formatted as "8.0". # [target.deployment_target] is a [String] formatted as "8.0".
inherit_deployment_target = target.deployment_target[/\d+/].to_i < 9 inherit_deployment_target = target.deployment_target[/\d+/].to_i < 11
# This podhelper script is at $FLUTTER_ROOT/packages/flutter_tools/bin. # This podhelper script is at $FLUTTER_ROOT/packages/flutter_tools/bin.
# Add search paths from $FLUTTER_ROOT/bin/cache/artifacts/engine. # Add search paths from $FLUTTER_ROOT/bin/cache/artifacts/engine.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment