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
7711c1ef
Unverified
Commit
7711c1ef
authored
Feb 03, 2021
by
Jenn Magder
Committed by
GitHub
Feb 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Suggest precache instead of build when engine artifacts are missing (#75351)
parent
d01d5732
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
podhelper.rb
packages/flutter_tools/bin/podhelper.rb
+6
-1
artifacts.dart
packages/flutter_tools/lib/src/artifacts.dart
+1
-1
podhelper.rb.tmpl
...mplates/module/ios/library/Flutter.tmpl/podhelper.rb.tmpl
+1
-1
artifacts_test.dart
...ages/flutter_tools/test/general.shard/artifacts_test.dart
+2
-2
No files found.
packages/flutter_tools/bin/podhelper.rb
View file @
7711c1ef
...
...
@@ -43,7 +43,7 @@ def flutter_additional_ios_build_settings(target)
unless
Dir
.
exist?
(
debug_framework_dir
)
# iOS artifacts have not been downloaded.
raise
"
#{
debug_framework_dir
}
must exist. If you're running pod install manually, make sure
flutter build ios
is executed first"
raise
"
#{
debug_framework_dir
}
must exist. If you're running pod install manually, make sure
\"
flutter precache --ios
\"
is executed first"
end
release_framework_dir
=
File
.
expand_path
(
File
.
join
(
artifacts_dir
,
'ios-release'
,
'Flutter.xcframework'
),
__FILE__
)
...
...
@@ -90,6 +90,11 @@ def flutter_additional_macos_build_settings(target)
debug_framework_dir
=
File
.
expand_path
(
File
.
join
(
artifacts_dir
,
'darwin-x64'
),
__FILE__
)
release_framework_dir
=
File
.
expand_path
(
File
.
join
(
artifacts_dir
,
'darwin-x64-release'
),
__FILE__
)
unless
Dir
.
exist?
(
debug_framework_dir
)
# macOS artifacts have not been downloaded.
raise
"
#{
debug_framework_dir
}
must exist. If you're running pod install manually, make sure
\"
flutter precache --macos
\"
is executed first"
end
target
.
build_configurations
.
each
do
|
build_configuration
|
# Profile can't be derived from the CocoaPods build configuration. Use release framework (for linking only).
configuration_engine_dir
=
build_configuration
.
type
==
:debug
?
debug_framework_dir
:
release_framework_dir
...
...
packages/flutter_tools/lib/src/artifacts.dart
View file @
7711c1ef
...
...
@@ -549,7 +549,7 @@ String _getIosEngineArtifactPath(String engineDirectory,
.
childDirectory
(
_artifactToFileName
(
Artifact
.
flutterXcframework
));
if
(!
xcframeworkDirectory
.
existsSync
())
{
throwToolExit
(
'No xcframework found at
${xcframeworkDirectory.path}
. Try running "flutter
build
ios".'
);
throwToolExit
(
'No xcframework found at
${xcframeworkDirectory.path}
. Try running "flutter
precache --
ios".'
);
}
Directory
flutterFrameworkSource
;
for
(
final
Directory
platformDirectory
...
...
packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/podhelper.rb.tmpl
View file @
7711c1ef
...
...
@@ -38,7 +38,7 @@ def install_flutter_engine_pod
release_framework_dir = File.join(flutter_root, 'bin', 'cache', 'artifacts', 'engine', 'ios-release')
unless Dir.exist?(release_framework_dir)
# iOS artifacts have not been downloaded.
raise "#{release_framework_dir} must exist. Make sure \"flutter
build
ios\" has been run at least once"
raise "#{release_framework_dir} must exist. Make sure \"flutter
precache --
ios\" has been run at least once"
end
FileUtils.cp_r(File.join(release_framework_dir, framework_name), engine_dir)
end
...
...
packages/flutter_tools/test/general.shard/artifacts_test.dart
View file @
7711c1ef
...
...
@@ -70,7 +70,7 @@ void main() {
),
throwsToolExit
(
message:
'No xcframework found at
$xcframeworkPath
.
Try running "flutter build ios".
'
),
'No xcframework found at
$xcframeworkPath
.'
),
);
fileSystem
.
directory
(
xcframeworkPath
).
createSync
(
recursive:
true
);
expect
(
...
...
@@ -215,7 +215,7 @@ void main() {
),
throwsToolExit
(
message:
'No xcframework found at /out/android_debug_unopt/Flutter.xcframework
. Try running "flutter build ios".
'
),
'No xcframework found at /out/android_debug_unopt/Flutter.xcframework'
),
);
fileSystem
.
directory
(
xcframeworkPath
).
createSync
(
recursive:
true
);
expect
(
...
...
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