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
a61bff2f
Unverified
Commit
a61bff2f
authored
Mar 19, 2020
by
Jenn Magder
Committed by
GitHub
Mar 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show Xcode workspace clean output with verbose flag (#52860)
parent
f65421aa
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
7 deletions
+23
-7
executable.dart
packages/flutter_tools/lib/executable.dart
+1
-1
clean.dart
packages/flutter_tools/lib/src/commands/clean.dart
+6
-2
xcodeproj.dart
packages/flutter_tools/lib/src/ios/xcodeproj.dart
+3
-2
clean_test.dart
...lutter_tools/test/commands.shard/hermetic/clean_test.dart
+12
-1
context.dart
packages/flutter_tools/test/src/context.dart
+1
-1
No files found.
packages/flutter_tools/lib/executable.dart
View file @
a61bff2f
...
@@ -79,7 +79,7 @@ Future<void> main(List<String> args) async {
...
@@ -79,7 +79,7 @@ Future<void> main(List<String> args) async {
AttachCommand
(
verboseHelp:
verboseHelp
),
AttachCommand
(
verboseHelp:
verboseHelp
),
BuildCommand
(
verboseHelp:
verboseHelp
),
BuildCommand
(
verboseHelp:
verboseHelp
),
ChannelCommand
(
verboseHelp:
verboseHelp
),
ChannelCommand
(
verboseHelp:
verboseHelp
),
CleanCommand
(),
CleanCommand
(
verbose:
verbose
),
ConfigCommand
(
verboseHelp:
verboseHelp
),
ConfigCommand
(
verboseHelp:
verboseHelp
),
CreateCommand
(),
CreateCommand
(),
DaemonCommand
(
hidden:
!
verboseHelp
),
DaemonCommand
(
hidden:
!
verboseHelp
),
...
...
packages/flutter_tools/lib/src/commands/clean.dart
View file @
a61bff2f
...
@@ -15,10 +15,14 @@ import '../project.dart';
...
@@ -15,10 +15,14 @@ import '../project.dart';
import
'../runner/flutter_command.dart'
;
import
'../runner/flutter_command.dart'
;
class
CleanCommand
extends
FlutterCommand
{
class
CleanCommand
extends
FlutterCommand
{
CleanCommand
()
{
CleanCommand
({
bool
verbose
=
false
,
})
:
_verbose
=
verbose
{
requiresPubspecYaml
();
requiresPubspecYaml
();
}
}
final
bool
_verbose
;
@override
@override
final
String
name
=
'clean'
;
final
String
name
=
'clean'
;
...
@@ -69,7 +73,7 @@ class CleanCommand extends FlutterCommand {
...
@@ -69,7 +73,7 @@ class CleanCommand extends FlutterCommand {
final
Directory
xcodeWorkspace
=
xcodeProject
.
xcodeWorkspace
;
final
Directory
xcodeWorkspace
=
xcodeProject
.
xcodeWorkspace
;
final
XcodeProjectInfo
projectInfo
=
await
globals
.
xcodeProjectInterpreter
.
getInfo
(
xcodeWorkspace
.
parent
.
path
);
final
XcodeProjectInfo
projectInfo
=
await
globals
.
xcodeProjectInterpreter
.
getInfo
(
xcodeWorkspace
.
parent
.
path
);
for
(
final
String
scheme
in
projectInfo
.
schemes
)
{
for
(
final
String
scheme
in
projectInfo
.
schemes
)
{
await
globals
.
xcodeProjectInterpreter
.
cleanWorkspace
(
xcodeWorkspace
.
path
,
scheme
);
await
globals
.
xcodeProjectInterpreter
.
cleanWorkspace
(
xcodeWorkspace
.
path
,
scheme
,
verbose:
_verbose
);
}
}
}
on
Exception
catch
(
error
)
{
}
on
Exception
catch
(
error
)
{
globals
.
printTrace
(
'Could not clean Xcode workspace:
$error
'
);
globals
.
printTrace
(
'Could not clean Xcode workspace:
$error
'
);
...
...
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file @
a61bff2f
...
@@ -364,13 +364,14 @@ class XcodeProjectInterpreter {
...
@@ -364,13 +364,14 @@ class XcodeProjectInterpreter {
}
}
}
}
Future
<
void
>
cleanWorkspace
(
String
workspacePath
,
String
scheme
)
async
{
Future
<
void
>
cleanWorkspace
(
String
workspacePath
,
String
scheme
,
{
bool
verbose
=
false
}
)
async
{
await
_processUtils
.
run
(<
String
>[
await
_processUtils
.
run
(<
String
>[
_executable
,
_executable
,
'-workspace'
,
'-workspace'
,
workspacePath
,
workspacePath
,
'-scheme'
,
'-scheme'
,
scheme
,
scheme
,
if
(!
verbose
)
'-quiet'
,
'-quiet'
,
'clean'
,
'clean'
,
...
environmentVariablesAsXcodeBuildSettings
(
_platform
)
...
environmentVariablesAsXcodeBuildSettings
(
_platform
)
...
...
packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
View file @
a61bff2f
...
@@ -72,7 +72,18 @@ void main() {
...
@@ -72,7 +72,18 @@ void main() {
expect
(
projectUnderTest
.
macos
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
macos
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
windows
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
windows
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
verify
(
mockXcodeProjectInterpreter
.
cleanWorkspace
(
any
,
'Runner'
)).
called
(
2
);
verify
(
mockXcodeProjectInterpreter
.
cleanWorkspace
(
any
,
'Runner'
,
verbose:
false
)).
called
(
2
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
Xcode:
()
=>
mockXcode
,
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
});
testUsingContext
(
'
$CleanCommand
cleans Xcode verbosely'
,
()
async
{
when
(
mockXcode
.
isInstalledAndMeetsVersionCheck
).
thenReturn
(
true
);
await
CleanCommand
(
verbose:
true
).
runCommand
();
verify
(
mockXcodeProjectInterpreter
.
cleanWorkspace
(
any
,
'Runner'
,
verbose:
true
)).
called
(
2
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
...
...
packages/flutter_tools/test/src/context.dart
View file @
a61bff2f
...
@@ -401,7 +401,7 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
...
@@ -401,7 +401,7 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
}
}
@override
@override
Future
<
void
>
cleanWorkspace
(
String
workspacePath
,
String
scheme
)
{
Future
<
void
>
cleanWorkspace
(
String
workspacePath
,
String
scheme
,
{
bool
verbose
=
false
}
)
{
return
null
;
return
null
;
}
}
...
...
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