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
38a88454
Unverified
Commit
38a88454
authored
Mar 12, 2020
by
Christopher Fujino
Committed by
GitHub
Mar 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move iosworkflow to globals (#52444)
parent
db6e2061
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
13 deletions
+11
-13
doctor.dart
packages/flutter_tools/lib/src/doctor.dart
+3
-4
globals.dart
packages/flutter_tools/lib/src/globals.dart
+2
-0
devices.dart
packages/flutter_tools/lib/src/ios/devices.dart
+1
-2
ios_emulators.dart
packages/flutter_tools/lib/src/ios/ios_emulators.dart
+1
-2
ios_workflow.dart
packages/flutter_tools/lib/src/ios/ios_workflow.dart
+1
-0
simulators.dart
packages/flutter_tools/lib/src/ios/simulators.dart
+1
-2
devices_test.dart
...es/flutter_tools/test/general.shard/ios/devices_test.dart
+2
-3
No files found.
packages/flutter_tools/lib/src/doctor.dart
View file @
38a88454
...
...
@@ -24,7 +24,6 @@ import 'features.dart';
import
'fuchsia/fuchsia_workflow.dart'
;
import
'globals.dart'
as
globals
;
import
'intellij/intellij.dart'
;
import
'ios/ios_workflow.dart'
;
import
'ios/plist_parser.dart'
;
import
'linux/linux_doctor.dart'
;
import
'linux/linux_workflow.dart'
;
...
...
@@ -77,7 +76,7 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider {
FlutterValidator
(),
if
(
androidWorkflow
.
appliesToHostPlatform
)
GroupedValidator
(<
DoctorValidator
>[
androidValidator
,
androidLicenseValidator
]),
if
(
iosWorkflow
.
appliesToHostPlatform
||
macOSWorkflow
.
appliesToHostPlatform
)
if
(
globals
.
iosWorkflow
.
appliesToHostPlatform
||
macOSWorkflow
.
appliesToHostPlatform
)
GroupedValidator
(<
DoctorValidator
>[
xcodeValidator
,
cocoapodsValidator
]),
if
(
webWorkflow
.
appliesToHostPlatform
)
WebValidator
(
...
...
@@ -108,8 +107,8 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider {
if
(
_workflows
==
null
)
{
_workflows
=
<
Workflow
>[];
if
(
iosWorkflow
.
appliesToHostPlatform
)
{
_workflows
.
add
(
iosWorkflow
);
if
(
globals
.
iosWorkflow
.
appliesToHostPlatform
)
{
_workflows
.
add
(
globals
.
iosWorkflow
);
}
if
(
androidWorkflow
.
appliesToHostPlatform
)
{
...
...
packages/flutter_tools/lib/src/globals.dart
View file @
38a88454
...
...
@@ -22,6 +22,7 @@ import 'base/terminal.dart';
import
'base/user_messages.dart'
;
import
'cache.dart'
;
import
'ios/ios_deploy.dart'
;
import
'ios/ios_workflow.dart'
;
import
'ios/mac.dart'
;
import
'ios/plist_parser.dart'
;
import
'ios/simulators.dart'
;
...
...
@@ -71,6 +72,7 @@ FlutterVersion get flutterVersion => context.get<FlutterVersion>();
IMobileDevice
get
iMobileDevice
=>
context
.
get
<
IMobileDevice
>();
IOSDeploy
get
iosDeploy
=>
context
.
get
<
IOSDeploy
>();
IOSSimulatorUtils
get
iosSimulatorUtils
=>
context
.
get
<
IOSSimulatorUtils
>();
IOSWorkflow
get
iosWorkflow
=>
context
.
get
<
IOSWorkflow
>();
SimControl
get
simControl
=>
context
.
get
<
SimControl
>();
UserMessages
get
userMessages
=>
context
.
get
<
UserMessages
>();
Xcode
get
xcode
=>
context
.
get
<
Xcode
>();
...
...
packages/flutter_tools/lib/src/ios/devices.dart
View file @
38a88454
...
...
@@ -26,7 +26,6 @@ import '../protocol_discovery.dart';
import
'../vmservice.dart'
;
import
'fallback_discovery.dart'
;
import
'ios_deploy.dart'
;
import
'ios_workflow.dart'
;
import
'mac.dart'
;
class
IOSDevices
extends
PollingDeviceDiscovery
{
...
...
@@ -36,7 +35,7 @@ class IOSDevices extends PollingDeviceDiscovery {
bool
get
supportsPlatform
=>
globals
.
platform
.
isMacOS
;
@override
bool
get
canListAnything
=>
iosWorkflow
.
canListDevices
;
bool
get
canListAnything
=>
globals
.
iosWorkflow
.
canListDevices
;
@override
Future
<
List
<
Device
>>
pollingGetDevices
()
=>
IOSDevice
.
getAttachedDevices
(
globals
.
platform
,
globals
.
xcdevice
);
...
...
packages/flutter_tools/lib/src/ios/ios_emulators.dart
View file @
38a88454
...
...
@@ -8,7 +8,6 @@ import '../base/process.dart';
import
'../device.dart'
;
import
'../emulator.dart'
;
import
'../globals.dart'
as
globals
;
import
'ios_workflow.dart'
;
import
'simulators.dart'
;
class
IOSEmulators
extends
EmulatorDiscovery
{
...
...
@@ -16,7 +15,7 @@ class IOSEmulators extends EmulatorDiscovery {
bool
get
supportsPlatform
=>
globals
.
platform
.
isMacOS
;
@override
bool
get
canListAnything
=>
iosWorkflow
.
canListEmulators
;
bool
get
canListAnything
=>
globals
.
iosWorkflow
.
canListEmulators
;
@override
Future
<
List
<
Emulator
>>
get
emulators
async
=>
getEmulators
();
...
...
packages/flutter_tools/lib/src/ios/ios_workflow.dart
View file @
38a88454
...
...
@@ -6,6 +6,7 @@ import '../base/context.dart';
import
'../doctor.dart'
;
import
'../globals.dart'
as
globals
;
// TODO(fujino): remove once internal references replaced by `globals.iosWorkflow`
IOSWorkflow
get
iosWorkflow
=>
context
.
get
<
IOSWorkflow
>();
class
IOSWorkflow
implements
Workflow
{
...
...
packages/flutter_tools/lib/src/ios/simulators.dart
View file @
38a88454
...
...
@@ -22,7 +22,6 @@ import '../globals.dart' as globals;
import
'../macos/xcode.dart'
;
import
'../project.dart'
;
import
'../protocol_discovery.dart'
;
import
'ios_workflow.dart'
;
import
'mac.dart'
;
import
'plist_parser.dart'
;
...
...
@@ -41,7 +40,7 @@ class IOSSimulators extends PollingDeviceDiscovery {
bool
get
supportsPlatform
=>
globals
.
platform
.
isMacOS
;
@override
bool
get
canListAnything
=>
iosWorkflow
.
canListDevices
;
bool
get
canListAnything
=>
globals
.
iosWorkflow
.
canListDevices
;
@override
Future
<
List
<
Device
>>
pollingGetDevices
()
async
=>
_iosSimulatorUtils
.
getAttachedDevices
();
...
...
packages/flutter_tools/test/general.shard/ios/devices_test.dart
View file @
38a88454
...
...
@@ -21,7 +21,6 @@ import 'package:flutter_tools/src/doctor.dart';
import
'package:flutter_tools/src/ios/devices.dart'
;
import
'package:flutter_tools/src/ios/mac.dart'
;
import
'package:flutter_tools/src/ios/ios_deploy.dart'
;
import
'package:flutter_tools/src/ios/ios_workflow.dart'
;
import
'package:flutter_tools/src/macos/xcode.dart'
;
import
'package:flutter_tools/src/mdns_discovery.dart'
;
import
'package:flutter_tools/src/project.dart'
;
...
...
@@ -1395,8 +1394,8 @@ class FakeIosDoctorProvider implements DoctorValidatorsProvider {
List
<
Workflow
>
get
workflows
{
if
(
_workflows
==
null
)
{
_workflows
=
<
Workflow
>[];
if
(
iosWorkflow
.
appliesToHostPlatform
)
{
_workflows
.
add
(
iosWorkflow
);
if
(
globals
.
iosWorkflow
.
appliesToHostPlatform
)
{
_workflows
.
add
(
globals
.
iosWorkflow
);
}
}
return
_workflows
;
...
...
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