Skip to content

Commit 81aeb33

Browse files
authored
Increase Flutter framework minimum iOS version to 9.0 (flutter#86840)
1 parent eb62bce commit 81aeb33

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

dev/devicelab/lib/tasks/plugin_tests.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,16 @@ class _FlutterProject {
172172
// it's not a regression in the IPHONEOS_DEPLOYMENT_TARGET override logic.
173173
// The plugintest target should not have IPHONEOS_DEPLOYMENT_TARGET set.
174174
// See _reduceDarwinPluginMinimumVersion for details.
175-
if (target == 'ios' && 'IPHONEOS_DEPLOYMENT_TARGET'.allMatches(podsProjectContent).length != 6) {
176-
throw TaskResult.failure('plugintest may contain IPHONEOS_DEPLOYMENT_TARGET');
175+
final int iosDeploymentTargetCount = 'IPHONEOS_DEPLOYMENT_TARGET'.allMatches(podsProjectContent).length;
176+
if (target == 'ios' && iosDeploymentTargetCount != 9) {
177+
throw TaskResult.failure('plugintest may contain IPHONEOS_DEPLOYMENT_TARGET, $iosDeploymentTargetCount found');
177178
}
178179

179180
// Same for macOS, but 12.
180181
// The plugintest target should not have MACOSX_DEPLOYMENT_TARGET set.
181-
if (target == 'macos' && 'MACOSX_DEPLOYMENT_TARGET'.allMatches(podsProjectContent).length != 12) {
182-
throw TaskResult.failure('plugintest may contain MACOSX_DEPLOYMENT_TARGET');
182+
final int macosDeploymentTargetCount = 'MACOSX_DEPLOYMENT_TARGET'.allMatches(podsProjectContent).length;
183+
if (target == 'macos' && macosDeploymentTargetCount != 12) {
184+
throw TaskResult.failure('plugintest may contain MACOSX_DEPLOYMENT_TARGET, $macosDeploymentTargetCount found');
183185
}
184186
}
185187
});

packages/flutter_tools/bin/podhelper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def flutter_install_ios_engine_pod(ios_application_path = nil)
177177
s.license = { :type => 'MIT' }
178178
s.author = { 'Flutter Dev Team' => '[email protected]' }
179179
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
180-
s.ios.deployment_target = '8.0'
180+
s.ios.deployment_target = '9.0'
181181
# Framework linking is handled by Flutter tooling, not CocoaPods.
182182
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
183183
s.vendored_frameworks = 'path/to/nothing'

packages/flutter_tools/lib/src/commands/build_ios_framework.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ LICENSE
286286
s.author = { 'Flutter Dev Team' => '[email protected]' }
287287
s.source = { :http => '${_cache.storageBaseUrl}/flutter_infra_release/flutter/${_cache.engineRevision}/$artifactsMode/artifacts.zip' }
288288
s.documentation_url = 'https://flutter.dev/docs'
289-
s.platform = :ios, '8.0'
289+
s.platform = :ios, '9.0'
290290
s.vendored_frameworks = 'Flutter.xcframework'
291291
end
292292
''';

packages/flutter_tools/templates/module/ios/host_app_ephemeral/Flutter/engine/Flutter.podspec.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ This pod vends the iOS Flutter engine framework. It is compatible with applicati
1515
s.author = { 'Flutter Dev Team' => '[email protected]' }
1616
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
1717
s.documentation_url = 'https://flutter.dev/docs'
18-
s.ios.deployment_target = '8.0'
18+
s.ios.deployment_target = '9.0'
1919
s.vendored_frameworks = 'Flutter.xcframework'
2020
end

0 commit comments

Comments
 (0)