Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
81aeb33c
Unverified
Commit
81aeb33c
authored
Jul 22, 2021
by
Jenn Magder
Committed by
GitHub
Jul 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase Flutter framework minimum iOS version to 9.0 (#86840)
parent
eb62bce9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
plugin_tests.dart
dev/devicelab/lib/tasks/plugin_tests.dart
+6
-4
podhelper.rb
packages/flutter_tools/bin/podhelper.rb
+1
-1
build_ios_framework.dart
...s/flutter_tools/lib/src/commands/build_ios_framework.dart
+1
-1
Flutter.podspec.tmpl
...os/host_app_ephemeral/Flutter/engine/Flutter.podspec.tmpl
+1
-1
No files found.
dev/devicelab/lib/tasks/plugin_tests.dart
View file @
81aeb33c
...
@@ -172,14 +172,16 @@ class _FlutterProject {
...
@@ -172,14 +172,16 @@ class _FlutterProject {
// it's not a regression in the IPHONEOS_DEPLOYMENT_TARGET override logic.
// it's not a regression in the IPHONEOS_DEPLOYMENT_TARGET override logic.
// The plugintest target should not have IPHONEOS_DEPLOYMENT_TARGET set.
// The plugintest target should not have IPHONEOS_DEPLOYMENT_TARGET set.
// See _reduceDarwinPluginMinimumVersion for details.
// See _reduceDarwinPluginMinimumVersion for details.
if
(
target
==
'ios'
&&
'IPHONEOS_DEPLOYMENT_TARGET'
.
allMatches
(
podsProjectContent
).
length
!=
6
)
{
final
int
iosDeploymentTargetCount
=
'IPHONEOS_DEPLOYMENT_TARGET'
.
allMatches
(
podsProjectContent
).
length
;
throw
TaskResult
.
failure
(
'plugintest may contain IPHONEOS_DEPLOYMENT_TARGET'
);
if
(
target
==
'ios'
&&
iosDeploymentTargetCount
!=
9
)
{
throw
TaskResult
.
failure
(
'plugintest may contain IPHONEOS_DEPLOYMENT_TARGET,
$iosDeploymentTargetCount
found'
);
}
}
// Same for macOS, but 12.
// Same for macOS, but 12.
// The plugintest target should not have MACOSX_DEPLOYMENT_TARGET set.
// The plugintest target should not have MACOSX_DEPLOYMENT_TARGET set.
if
(
target
==
'macos'
&&
'MACOSX_DEPLOYMENT_TARGET'
.
allMatches
(
podsProjectContent
).
length
!=
12
)
{
final
int
macosDeploymentTargetCount
=
'MACOSX_DEPLOYMENT_TARGET'
.
allMatches
(
podsProjectContent
).
length
;
throw
TaskResult
.
failure
(
'plugintest may contain MACOSX_DEPLOYMENT_TARGET'
);
if
(
target
==
'macos'
&&
macosDeploymentTargetCount
!=
12
)
{
throw
TaskResult
.
failure
(
'plugintest may contain MACOSX_DEPLOYMENT_TARGET,
$macosDeploymentTargetCount
found'
);
}
}
}
}
});
});
...
...
packages/flutter_tools/bin/podhelper.rb
View file @
81aeb33c
...
@@ -177,7 +177,7 @@ def flutter_install_ios_engine_pod(ios_application_path = nil)
...
@@ -177,7 +177,7 @@ def flutter_install_ios_engine_pod(ios_application_path = nil)
s.license = { :type => 'MIT' }
s.license = { :type => 'MIT' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.ios.deployment_target = '
8
.0'
s.ios.deployment_target = '
9
.0'
# Framework linking is handled by Flutter tooling, not CocoaPods.
# Framework linking is handled by Flutter tooling, not CocoaPods.
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
s.vendored_frameworks = 'path/to/nothing'
s.vendored_frameworks = 'path/to/nothing'
...
...
packages/flutter_tools/lib/src/commands/build_ios_framework.dart
View file @
81aeb33c
...
@@ -286,7 +286,7 @@ LICENSE
...
@@ -286,7 +286,7 @@ LICENSE
s
.
author
=
{
'Flutter Dev Team'
=>
'flutter-dev@googlegroups.com'
}
s
.
author
=
{
'Flutter Dev Team'
=>
'flutter-dev@googlegroups.com'
}
s
.
source
=
{
:
http
=>
'
${_cache.storageBaseUrl}
/flutter_infra_release/flutter/
${_cache.engineRevision}
/
$artifactsMode
/artifacts.zip'
}
s
.
source
=
{
:
http
=>
'
${_cache.storageBaseUrl}
/flutter_infra_release/flutter/
${_cache.engineRevision}
/
$artifactsMode
/artifacts.zip'
}
s
.
documentation_url
=
'https://flutter.dev/docs'
s
.
documentation_url
=
'https://flutter.dev/docs'
s
.
platform
=
:
ios
,
'
8
.0'
s
.
platform
=
:
ios
,
'
9
.0'
s
.
vendored_frameworks
=
'Flutter.xcframework'
s
.
vendored_frameworks
=
'Flutter.xcframework'
end
end
''';
''';
...
...
packages/flutter_tools/templates/module/ios/host_app_ephemeral/Flutter/engine/Flutter.podspec.tmpl
View file @
81aeb33c
...
@@ -15,6 +15,6 @@ This pod vends the iOS Flutter engine framework. It is compatible with applicati
...
@@ -15,6 +15,6 @@ This pod vends the iOS Flutter engine framework. It is compatible with applicati
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.documentation_url = 'https://flutter.dev/docs'
s.documentation_url = 'https://flutter.dev/docs'
s.ios.deployment_target = '
8
.0'
s.ios.deployment_target = '
9
.0'
s.vendored_frameworks = 'Flutter.xcframework'
s.vendored_frameworks = 'Flutter.xcframework'
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment