Skip to content

Commit 036cae3

Browse files
authored
Enforce minimum plugin version iOS 11 (#103545)
1 parent 9f28b83 commit 036cae3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dev/devicelab/lib/tasks/plugin_tests.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class $dartPluginClass {
204204
podspecContent = podspecContent.replaceFirst(
205205
versionString,
206206
target == 'ios'
207-
? "s.platform = :ios, '7.0'"
207+
? "s.platform = :ios, '10.0'"
208208
: "s.platform = :osx, '10.8'"
209209
);
210210
podspec.writeAsStringSync(podspecContent, flush: true);
@@ -240,8 +240,8 @@ class $dartPluginClass {
240240
if (target == 'ios') {
241241
// Plugins with versions lower than the app version should not have IPHONEOS_DEPLOYMENT_TARGET set.
242242
// The plugintest plugin target should not have IPHONEOS_DEPLOYMENT_TARGET set since it has been lowered
243-
// in _reduceDarwinPluginMinimumVersion to 7, which is below the target version of 9.
244-
if (podsProjectContent.contains('IPHONEOS_DEPLOYMENT_TARGET = 7')) {
243+
// in _reduceDarwinPluginMinimumVersion to 10, which is below the target version of 11.
244+
if (podsProjectContent.contains('IPHONEOS_DEPLOYMENT_TARGET = 10')) {
245245
throw TaskResult.failure('Plugin build setting IPHONEOS_DEPLOYMENT_TARGET not removed');
246246
}
247247
if (!podsProjectContent.contains(r'"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited) i386";')) {

packages/flutter_tools/bin/podhelper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def flutter_additional_ios_build_settings(target)
3434
return unless target.platform_name == :ios
3535

3636
# [target.deployment_target] is a [String] formatted as "8.0".
37-
inherit_deployment_target = target.deployment_target[/\d+/].to_i < 9
37+
inherit_deployment_target = target.deployment_target[/\d+/].to_i < 11
3838

3939
# This podhelper script is at $FLUTTER_ROOT/packages/flutter_tools/bin.
4040
# Add search paths from $FLUTTER_ROOT/bin/cache/artifacts/engine.

0 commit comments

Comments
 (0)