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
db94472a
Unverified
Commit
db94472a
authored
Mar 05, 2020
by
Jenn Magder
Committed by
GitHub
Mar 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip iOS project migration when script is already embedding frameworks (#51963)
parent
dc333346
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
remove_framework_link_and_embedding_migration.dart
...ations/remove_framework_link_and_embedding_migration.dart
+1
-1
ios_project_migration_test.dart
...ls/test/general.shard/ios/ios_project_migration_test.dart
+16
-0
No files found.
packages/flutter_tools/lib/src/ios/migrations/remove_framework_link_and_embedding_migration.dart
View file @
db94472a
...
...
@@ -87,7 +87,7 @@ class RemoveFrameworkLinkAndEmbeddingMigration extends IOSMigrator {
// Embed and thin frameworks in a script instead of using Xcode's link / embed build phases.
const
String
thinBinaryScript
=
'xcode_backend.sh
\\
" thin'
;
if
(
line
.
contains
(
thinBinaryScript
))
{
if
(
line
.
contains
(
thinBinaryScript
)
&&
!
line
.
contains
(
' embed'
)
)
{
return
line
.
replaceFirst
(
thinBinaryScript
,
'xcode_backend.sh
\\
" embed_and_thin'
);
}
...
...
packages/flutter_tools/test/general.shard/ios/ios_project_migration_test.dart
View file @
db94472a
...
...
@@ -72,6 +72,22 @@ void main () {
expect
(
testLogger
.
statusText
,
isEmpty
);
});
testWithoutContext
(
'skips migrating script with embed'
,
()
{
const
String
contents
=
'''
shellScript = "/bin/sh
\"
\
$FLUTTER_ROOT
/packages/flutter_tools/bin/xcode_backend.sh
\\
" embed
\\
n/bin/sh
\"
\
$FLUTTER_ROOT
/packages/flutter_tools/bin/xcode_backend.sh
\\
" thin
\n
";
'''
;
xcodeProjectInfoFile
.
writeAsStringSync
(
contents
);
final
RemoveFrameworkLinkAndEmbeddingMigration
iosProjectMigration
=
RemoveFrameworkLinkAndEmbeddingMigration
(
mockIosProject
,
testLogger
,
mockXcode
,
);
expect
(
iosProjectMigration
.
migrate
(),
isTrue
);
expect
(
xcodeProjectInfoFile
.
readAsStringSync
(),
contents
);
expect
(
testLogger
.
statusText
,
isEmpty
);
});
testWithoutContext
(
'Xcode project is migrated'
,
()
{
xcodeProjectInfoFile
.
writeAsStringSync
(
'''
prefix 3B80C3941E831B6300D905FE
...
...
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