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
dcde8163
Unverified
Commit
dcde8163
authored
Mar 31, 2022
by
Michael Goderbauer
Committed by
GitHub
Mar 31, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migrate to super params (#100509)
parent
baa45a17
Changes
46
Show whitespace changes
Inline
Side-by-side
Showing
46 changed files
with
188 additions
and
341 deletions
+188
-341
android_device.dart
packages/flutter_tools/lib/src/android/android_device.dart
+1
-2
application_package.dart
...es/flutter_tools/lib/src/android/application_package.dart
+2
-3
deferred_components_prebuild_validator.dart
...b/src/android/deferred_components_prebuild_validator.dart
+4
-6
io.dart
packages/flutter_tools/lib/src/base/io.dart
+1
-2
logger.dart
packages/flutter_tools/lib/src/base/logger.dart
+23
-46
multi_root_file_system.dart
...es/flutter_tools/lib/src/base/multi_root_file_system.dart
+9
-18
os.dart
packages/flutter_tools/lib/src/base/os.dart
+20
-40
linux.dart
...ges/flutter_tools/lib/src/build_system/targets/linux.dart
+3
-3
cmake_project.dart
packages/flutter_tools/lib/src/cmake_project.dart
+1
-1
analyze_continuously.dart
.../flutter_tools/lib/src/commands/analyze_continuously.dart
+7
-19
analyze_once.dart
packages/flutter_tools/lib/src/commands/analyze_once.dart
+7
-19
build_ios.dart
packages/flutter_tools/lib/src/commands/build_ios.dart
+2
-3
update_packages.dart
packages/flutter_tools/lib/src/commands/update_packages.dart
+4
-5
compile.dart
packages/flutter_tools/lib/src/compile.dart
+7
-7
flutter_adapter.dart
...flutter_tools/lib/src/debug_adapters/flutter_adapter.dart
+6
-12
flutter_adapter_args.dart
...er_tools/lib/src/debug_adapters/flutter_adapter_args.dart
+26
-46
flutter_test_adapter.dart
...er_tools/lib/src/debug_adapters/flutter_test_adapter.dart
+6
-12
desktop_device.dart
packages/flutter_tools/lib/src/desktop_device.dart
+3
-6
doctor_validator.dart
packages/flutter_tools/lib/src/doctor_validator.dart
+1
-1
flutter_cache.dart
packages/flutter_tools/lib/src/flutter_cache.dart
+3
-3
flutter_device_manager.dart
packages/flutter_tools/lib/src/flutter_device_manager.dart
+4
-11
fuchsia_device.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
+1
-2
intellij_validator.dart
...es/flutter_tools/lib/src/intellij/intellij_validator.dart
+2
-3
application_package.dart
packages/flutter_tools/lib/src/ios/application_package.dart
+2
-2
devices.dart
packages/flutter_tools/lib/src/ios/devices.dart
+1
-2
deployment_target_migration.dart
...s/lib/src/ios/migrations/deployment_target_migration.dart
+2
-4
minimum_frame_duration_migration.dart
.../src/ios/migrations/minimum_frame_duration_migration.dart
+2
-4
project_base_configuration_migration.dart
.../ios/migrations/project_base_configuration_migration.dart
+2
-4
project_build_location_migration.dart
.../src/ios/migrations/project_build_location_migration.dart
+2
-4
project_object_version_migration.dart
.../src/ios/migrations/project_object_version_migration.dart
+2
-4
remove_framework_link_and_embedding_migration.dart
...ations/remove_framework_link_and_embedding_migration.dart
+2
-4
xcode_build_system_migration.dart
.../lib/src/ios/migrations/xcode_build_system_migration.dart
+2
-4
simulators.dart
packages/flutter_tools/lib/src/ios/simulators.dart
+1
-2
remove_macos_framework_link_and_embedding_migration.dart
.../remove_macos_framework_link_and_embedding_migration.dart
+2
-4
cmake_custom_command_migration.dart
...ls/lib/src/migrations/cmake_custom_command_migration.dart
+2
-4
events.dart
packages/flutter_tools/lib/src/reporting/events.dart
+2
-2
flutter_tester.dart
packages/flutter_tools/lib/src/tester/flutter_tester.dart
+1
-2
web_device.dart
packages/flutter_tools/lib/src/web/web_device.dart
+4
-8
web_validator.dart
packages/flutter_tools/lib/src/web/web_validator.dart
+1
-1
pubspec.yaml
packages/flutter_tools/pubspec.yaml
+1
-1
terminal_test.dart
.../flutter_tools/test/general.shard/base/terminal_test.dart
+2
-2
device_test.dart
packages/flutter_tools/test/general.shard/device_test.dart
+3
-3
intellij_validator_test.dart
.../test/general.shard/intellij/intellij_validator_test.dart
+2
-2
events_test.dart
...utter_tools/test/general.shard/reporting/events_test.dart
+2
-2
test_driver.dart
...ges/flutter_tools/test/integration.shard/test_driver.dart
+4
-5
fakes.dart
packages/flutter_tools/test/src/fakes.dart
+1
-1
No files found.
packages/flutter_tools/lib/src/android/android_device.dart
View file @
dcde8163
...
@@ -56,7 +56,7 @@ const Map<String, HardwareType> kKnownHardware = <String, HardwareType>{
...
@@ -56,7 +56,7 @@ const Map<String, HardwareType> kKnownHardware = <String, HardwareType>{
/// map to specify that they are actually physical devices.
/// map to specify that they are actually physical devices.
class
AndroidDevice
extends
Device
{
class
AndroidDevice
extends
Device
{
AndroidDevice
(
AndroidDevice
(
String
id
,
{
super
.
id
,
{
this
.
productID
,
this
.
productID
,
required
this
.
modelID
,
required
this
.
modelID
,
this
.
deviceCodeName
,
this
.
deviceCodeName
,
...
@@ -74,7 +74,6 @@ class AndroidDevice extends Device {
...
@@ -74,7 +74,6 @@ class AndroidDevice extends Device {
_androidConsoleSocketFactory
=
androidConsoleSocketFactory
,
_androidConsoleSocketFactory
=
androidConsoleSocketFactory
,
_processUtils
=
ProcessUtils
(
logger:
logger
,
processManager:
processManager
),
_processUtils
=
ProcessUtils
(
logger:
logger
,
processManager:
processManager
),
super
(
super
(
id
,
category:
Category
.
mobile
,
category:
Category
.
mobile
,
platformType:
PlatformType
.
android
,
platformType:
PlatformType
.
android
,
ephemeral:
true
,
ephemeral:
true
,
...
...
packages/flutter_tools/lib/src/android/application_package.dart
View file @
dcde8163
...
@@ -23,13 +23,12 @@ import 'gradle.dart';
...
@@ -23,13 +23,12 @@ import 'gradle.dart';
/// An application package created from an already built Android APK.
/// An application package created from an already built Android APK.
class
AndroidApk
extends
ApplicationPackage
implements
PrebuiltApplicationPackage
{
class
AndroidApk
extends
ApplicationPackage
implements
PrebuiltApplicationPackage
{
AndroidApk
({
AndroidApk
({
required
String
id
,
required
super
.
id
,
required
this
.
applicationPackage
,
required
this
.
applicationPackage
,
required
this
.
versionCode
,
required
this
.
versionCode
,
required
this
.
launchActivity
,
required
this
.
launchActivity
,
})
:
assert
(
applicationPackage
!=
null
),
})
:
assert
(
applicationPackage
!=
null
),
assert
(
launchActivity
!=
null
),
assert
(
launchActivity
!=
null
);
super
(
id:
id
);
/// Creates a new AndroidApk from an existing APK.
/// Creates a new AndroidApk from an existing APK.
///
///
...
...
packages/flutter_tools/lib/src/android/deferred_components_prebuild_validator.dart
View file @
dcde8163
...
@@ -8,7 +8,6 @@ import '../base/deferred_component.dart';
...
@@ -8,7 +8,6 @@ import '../base/deferred_component.dart';
import
'../base/error_handling_io.dart'
;
import
'../base/error_handling_io.dart'
;
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../base/logger.dart'
;
import
'../base/logger.dart'
;
import
'../base/platform.dart'
;
import
'../globals.dart'
as
globals
;
import
'../globals.dart'
as
globals
;
import
'../project.dart'
;
import
'../project.dart'
;
import
'../template.dart'
;
import
'../template.dart'
;
...
@@ -29,12 +28,11 @@ class DeferredComponentsPrebuildValidator extends DeferredComponentsValidator {
...
@@ -29,12 +28,11 @@ class DeferredComponentsPrebuildValidator extends DeferredComponentsValidator {
/// When [exitOnFail] is set to true, the [handleResults] and [attemptToolExit]
/// When [exitOnFail] is set to true, the [handleResults] and [attemptToolExit]
/// methods will exit the tool when this validator detects a recommended
/// methods will exit the tool when this validator detects a recommended
/// change. This defaults to true.
/// change. This defaults to true.
DeferredComponentsPrebuildValidator
(
Directory
projectDir
,
Logger
logger
,
Platform
platform
,
{
DeferredComponentsPrebuildValidator
(
super
.
projectDir
,
super
.
logger
,
super
.
platform
,
{
bool
exitOnFail
=
true
,
super
.
exitOnFail
,
String
?
title
,
super
.
title
,
Directory
?
templatesDir
,
Directory
?
templatesDir
,
})
:
_templatesDir
=
templatesDir
,
})
:
_templatesDir
=
templatesDir
;
super
(
projectDir
,
logger
,
platform
,
exitOnFail:
exitOnFail
,
title:
title
);
final
Directory
?
_templatesDir
;
final
Directory
?
_templatesDir
;
...
...
packages/flutter_tools/lib/src/base/io.dart
View file @
dcde8163
...
@@ -209,8 +209,7 @@ class ProcessSignal {
...
@@ -209,8 +209,7 @@ class ProcessSignal {
@visibleForTesting
@visibleForTesting
class
PosixProcessSignal
extends
ProcessSignal
{
class
PosixProcessSignal
extends
ProcessSignal
{
const
PosixProcessSignal
(
io
.
ProcessSignal
wrappedSignal
,
{
@visibleForTesting
Platform
platform
=
const
LocalPlatform
()})
const
PosixProcessSignal
(
super
.
wrappedSignal
,
{
@visibleForTesting
super
.
platform
});
:
super
(
wrappedSignal
,
platform:
platform
);
@override
@override
Stream
<
ProcessSignal
>
watch
()
{
Stream
<
ProcessSignal
>
watch
()
{
...
...
packages/flutter_tools/lib/src/base/logger.dart
View file @
dcde8163
...
@@ -706,16 +706,11 @@ int _getColumnSize(String line) {
...
@@ -706,16 +706,11 @@ int _getColumnSize(String line) {
/// they will show up as the unrepresentable character symbol '�'.
/// they will show up as the unrepresentable character symbol '�'.
class
WindowsStdoutLogger
extends
StdoutLogger
{
class
WindowsStdoutLogger
extends
StdoutLogger
{
WindowsStdoutLogger
({
WindowsStdoutLogger
({
required
Terminal
terminal
,
required
super
.
terminal
,
required
Stdio
stdio
,
required
super
.
stdio
,
required
OutputPreferences
outputPreferences
,
required
super
.
outputPreferences
,
StopwatchFactory
stopwatchFactory
=
const
StopwatchFactory
(),
super
.
stopwatchFactory
,
})
:
super
(
});
terminal:
terminal
,
stdio:
stdio
,
outputPreferences:
outputPreferences
,
stopwatchFactory:
stopwatchFactory
,
);
@override
@override
void
writeToStdOut
(
String
message
)
{
void
writeToStdOut
(
String
message
)
{
...
@@ -906,11 +901,10 @@ class BufferLogger extends Logger {
...
@@ -906,11 +901,10 @@ class BufferLogger extends Logger {
}
}
class
VerboseLogger
extends
DelegatingLogger
{
class
VerboseLogger
extends
DelegatingLogger
{
VerboseLogger
(
Logger
parent
,
{
VerboseLogger
(
super
.
parent
,
{
StopwatchFactory
stopwatchFactory
=
const
StopwatchFactory
()
StopwatchFactory
stopwatchFactory
=
const
StopwatchFactory
()
})
:
_stopwatch
=
stopwatchFactory
.
createStopwatch
(),
})
:
_stopwatch
=
stopwatchFactory
.
createStopwatch
(),
_stopwatchFactory
=
stopwatchFactory
,
_stopwatchFactory
=
stopwatchFactory
{
super
(
parent
)
{
_stopwatch
.
start
();
_stopwatch
.
start
();
}
}
...
@@ -1081,7 +1075,7 @@ class VerboseLogger extends DelegatingLogger {
...
@@ -1081,7 +1075,7 @@ class VerboseLogger extends DelegatingLogger {
}
}
class
PrefixedErrorLogger
extends
DelegatingLogger
{
class
PrefixedErrorLogger
extends
DelegatingLogger
{
PrefixedErrorLogger
(
Logger
parent
)
:
super
(
parent
);
PrefixedErrorLogger
(
super
.
parent
);
@override
@override
void
printError
(
void
printError
(
...
@@ -1186,12 +1180,9 @@ abstract class Status {
...
@@ -1186,12 +1180,9 @@ abstract class Status {
/// A [Status] that shows nothing.
/// A [Status] that shows nothing.
class
SilentStatus
extends
Status
{
class
SilentStatus
extends
Status
{
SilentStatus
({
SilentStatus
({
required
Stopwatch
stopwatch
,
required
super
.
stopwatch
,
VoidCallback
?
onFinish
,
super
.
onFinish
,
})
:
super
(
});
onFinish:
onFinish
,
stopwatch:
stopwatch
,
);
@override
@override
void
finish
()
{
void
finish
()
{
...
@@ -1206,15 +1197,11 @@ const int _kTimePadding = 8; // should fit "99,999ms"
...
@@ -1206,15 +1197,11 @@ const int _kTimePadding = 8; // should fit "99,999ms"
class
SummaryStatus
extends
Status
{
class
SummaryStatus
extends
Status
{
SummaryStatus
({
SummaryStatus
({
this
.
message
=
''
,
this
.
message
=
''
,
required
Stopwatch
stopwatch
,
required
super
.
stopwatch
,
this
.
padding
=
kDefaultStatusPadding
,
this
.
padding
=
kDefaultStatusPadding
,
VoidCallback
?
onFinish
,
super
.
onFinish
,
required
Stdio
stdio
,
required
Stdio
stdio
,
})
:
_stdio
=
stdio
,
})
:
_stdio
=
stdio
;
super
(
onFinish:
onFinish
,
stopwatch:
stopwatch
,
);
final
String
message
;
final
String
message
;
final
int
padding
;
final
int
padding
;
...
@@ -1270,20 +1257,15 @@ class SummaryStatus extends Status {
...
@@ -1270,20 +1257,15 @@ class SummaryStatus extends Status {
/// Call [pause] before outputting any text while this is running.
/// Call [pause] before outputting any text while this is running.
class
AnonymousSpinnerStatus
extends
Status
{
class
AnonymousSpinnerStatus
extends
Status
{
AnonymousSpinnerStatus
({
AnonymousSpinnerStatus
({
VoidCallback
?
onFinish
,
super
.
onFinish
,
required
Stopwatch
stopwatch
,
required
super
.
stopwatch
,
required
Stdio
stdio
,
required
Stdio
stdio
,
required
Terminal
terminal
,
required
Terminal
terminal
,
this
.
slowWarningCallback
,
this
.
slowWarningCallback
,
Duration
?
timeout
,
super
.
timeout
,
})
:
_stdio
=
stdio
,
})
:
_stdio
=
stdio
,
_terminal
=
terminal
,
_terminal
=
terminal
,
_animation
=
_selectAnimation
(
terminal
),
_animation
=
_selectAnimation
(
terminal
);
super
(
onFinish:
onFinish
,
stopwatch:
stopwatch
,
timeout:
timeout
,
);
final
Stdio
_stdio
;
final
Stdio
_stdio
;
final
Terminal
_terminal
;
final
Terminal
_terminal
;
...
@@ -1425,16 +1407,11 @@ class SpinnerStatus extends AnonymousSpinnerStatus {
...
@@ -1425,16 +1407,11 @@ class SpinnerStatus extends AnonymousSpinnerStatus {
SpinnerStatus
({
SpinnerStatus
({
required
this
.
message
,
required
this
.
message
,
this
.
padding
=
kDefaultStatusPadding
,
this
.
padding
=
kDefaultStatusPadding
,
VoidCallback
?
onFinish
,
super
.
onFinish
,
required
Stopwatch
stopwatch
,
required
super
.
stopwatch
,
required
Stdio
stdio
,
required
super
.
stdio
,
required
Terminal
terminal
,
required
super
.
terminal
,
})
:
super
(
});
onFinish:
onFinish
,
stopwatch:
stopwatch
,
stdio:
stdio
,
terminal:
terminal
,
);
final
String
message
;
final
String
message
;
final
int
padding
;
final
int
padding
;
...
...
packages/flutter_tools/lib/src/base/multi_root_file_system.dart
View file @
dcde8163
...
@@ -212,12 +212,9 @@ abstract class MultiRootFileSystemEntity<T extends FileSystemEntity,
...
@@ -212,12 +212,9 @@ abstract class MultiRootFileSystemEntity<T extends FileSystemEntity,
class
MultiRootFile
extends
MultiRootFileSystemEntity
<
File
,
io
.
File
>
class
MultiRootFile
extends
MultiRootFileSystemEntity
<
File
,
io
.
File
>
with
ForwardingFile
{
with
ForwardingFile
{
MultiRootFile
({
MultiRootFile
({
required
MultiRootFileSystem
fileSystem
,
required
super
.
fileSystem
,
required
io
.
File
delegate
,
required
super
.
delegate
,
})
:
super
(
});
fileSystem:
fileSystem
,
delegate:
delegate
,
);
@override
@override
String
toString
()
=>
String
toString
()
=>
...
@@ -228,12 +225,9 @@ class MultiRootDirectory
...
@@ -228,12 +225,9 @@ class MultiRootDirectory
extends
MultiRootFileSystemEntity
<
Directory
,
io
.
Directory
>
extends
MultiRootFileSystemEntity
<
Directory
,
io
.
Directory
>
with
ForwardingDirectory
<
Directory
>
{
with
ForwardingDirectory
<
Directory
>
{
MultiRootDirectory
({
MultiRootDirectory
({
required
MultiRootFileSystem
fileSystem
,
required
super
.
fileSystem
,
required
io
.
Directory
delegate
,
required
super
.
delegate
,
})
:
super
(
});
fileSystem:
fileSystem
,
delegate:
delegate
,
);
// For the childEntity methods, we first obtain an instance of the entity
// For the childEntity methods, we first obtain an instance of the entity
// from the underlying file system, then invoke childEntity() on it, then
// from the underlying file system, then invoke childEntity() on it, then
...
@@ -258,12 +252,9 @@ class MultiRootDirectory
...
@@ -258,12 +252,9 @@ class MultiRootDirectory
class
MultiRootLink
extends
MultiRootFileSystemEntity
<
Link
,
io
.
Link
>
class
MultiRootLink
extends
MultiRootFileSystemEntity
<
Link
,
io
.
Link
>
with
ForwardingLink
{
with
ForwardingLink
{
MultiRootLink
({
MultiRootLink
({
required
MultiRootFileSystem
fileSystem
,
required
super
.
fileSystem
,
required
io
.
Link
delegate
,
required
super
.
delegate
,
})
:
super
(
});
fileSystem:
fileSystem
,
delegate:
delegate
,
);
@override
@override
String
toString
()
=>
String
toString
()
=>
...
...
packages/flutter_tools/lib/src/base/os.dart
View file @
dcde8163
...
@@ -166,16 +166,11 @@ abstract class OperatingSystemUtils {
...
@@ -166,16 +166,11 @@ abstract class OperatingSystemUtils {
class
_PosixUtils
extends
OperatingSystemUtils
{
class
_PosixUtils
extends
OperatingSystemUtils
{
_PosixUtils
({
_PosixUtils
({
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Logger
logger
,
required
super
.
logger
,
required
Platform
platform
,
required
super
.
platform
,
required
ProcessManager
processManager
,
required
super
.
processManager
,
})
:
super
.
_private
(
})
:
super
.
_private
();
fileSystem:
fileSystem
,
logger:
logger
,
platform:
platform
,
processManager:
processManager
,
);
@override
@override
void
makeExecutable
(
File
file
)
{
void
makeExecutable
(
File
file
)
{
...
@@ -295,16 +290,11 @@ class _PosixUtils extends OperatingSystemUtils {
...
@@ -295,16 +290,11 @@ class _PosixUtils extends OperatingSystemUtils {
class
_LinuxUtils
extends
_PosixUtils
{
class
_LinuxUtils
extends
_PosixUtils
{
_LinuxUtils
({
_LinuxUtils
({
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Logger
logger
,
required
super
.
logger
,
required
Platform
platform
,
required
super
.
platform
,
required
ProcessManager
processManager
,
required
super
.
processManager
,
})
:
super
(
});
fileSystem:
fileSystem
,
logger:
logger
,
platform:
platform
,
processManager:
processManager
,
);
String
?
_name
;
String
?
_name
;
...
@@ -367,16 +357,11 @@ class _LinuxUtils extends _PosixUtils {
...
@@ -367,16 +357,11 @@ class _LinuxUtils extends _PosixUtils {
class
_MacOSUtils
extends
_PosixUtils
{
class
_MacOSUtils
extends
_PosixUtils
{
_MacOSUtils
({
_MacOSUtils
({
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Logger
logger
,
required
super
.
logger
,
required
Platform
platform
,
required
super
.
platform
,
required
ProcessManager
processManager
,
required
super
.
processManager
,
})
:
super
(
});
fileSystem:
fileSystem
,
logger:
logger
,
platform:
platform
,
processManager:
processManager
,
);
String
?
_name
;
String
?
_name
;
...
@@ -475,16 +460,11 @@ class _MacOSUtils extends _PosixUtils {
...
@@ -475,16 +460,11 @@ class _MacOSUtils extends _PosixUtils {
class
_WindowsUtils
extends
OperatingSystemUtils
{
class
_WindowsUtils
extends
OperatingSystemUtils
{
_WindowsUtils
({
_WindowsUtils
({
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Logger
logger
,
required
super
.
logger
,
required
Platform
platform
,
required
super
.
platform
,
required
ProcessManager
processManager
,
required
super
.
processManager
,
})
:
super
.
_private
(
})
:
super
.
_private
();
fileSystem:
fileSystem
,
logger:
logger
,
platform:
platform
,
processManager:
processManager
,
);
@override
@override
HostPlatform
hostPlatform
=
HostPlatform
.
windows_x64
;
HostPlatform
hostPlatform
=
HostPlatform
.
windows_x64
;
...
...
packages/flutter_tools/lib/src/build_system/targets/linux.dart
View file @
dcde8163
...
@@ -193,7 +193,7 @@ class LinuxAotBundle extends Target {
...
@@ -193,7 +193,7 @@ class LinuxAotBundle extends Target {
}
}
class
DebugBundleLinuxAssets
extends
BundleLinuxAssets
{
class
DebugBundleLinuxAssets
extends
BundleLinuxAssets
{
const
DebugBundleLinuxAssets
(
TargetPlatform
targetPlatform
)
:
super
(
targetPlatform
);
const
DebugBundleLinuxAssets
(
super
.
targetPlatform
);
@override
@override
String
get
name
=>
'debug_bundle_
${getNameForTargetPlatform(targetPlatform)}
_assets'
;
String
get
name
=>
'debug_bundle_
${getNameForTargetPlatform(targetPlatform)}
_assets'
;
...
@@ -210,7 +210,7 @@ class DebugBundleLinuxAssets extends BundleLinuxAssets {
...
@@ -210,7 +210,7 @@ class DebugBundleLinuxAssets extends BundleLinuxAssets {
}
}
class
ProfileBundleLinuxAssets
extends
BundleLinuxAssets
{
class
ProfileBundleLinuxAssets
extends
BundleLinuxAssets
{
const
ProfileBundleLinuxAssets
(
TargetPlatform
targetPlatform
)
:
super
(
targetPlatform
);
const
ProfileBundleLinuxAssets
(
super
.
targetPlatform
);
@override
@override
String
get
name
=>
'profile_bundle_
${getNameForTargetPlatform(targetPlatform)}
_assets'
;
String
get
name
=>
'profile_bundle_
${getNameForTargetPlatform(targetPlatform)}
_assets'
;
...
@@ -226,7 +226,7 @@ class ProfileBundleLinuxAssets extends BundleLinuxAssets {
...
@@ -226,7 +226,7 @@ class ProfileBundleLinuxAssets extends BundleLinuxAssets {
}
}
class
ReleaseBundleLinuxAssets
extends
BundleLinuxAssets
{
class
ReleaseBundleLinuxAssets
extends
BundleLinuxAssets
{
const
ReleaseBundleLinuxAssets
(
TargetPlatform
targetPlatform
)
:
super
(
targetPlatform
);
const
ReleaseBundleLinuxAssets
(
super
.
targetPlatform
);
@override
@override
String
get
name
=>
'release_bundle_
${getNameForTargetPlatform(targetPlatform)}
_assets'
;
String
get
name
=>
'release_bundle_
${getNameForTargetPlatform(targetPlatform)}
_assets'
;
...
...
packages/flutter_tools/lib/src/cmake_project.dart
View file @
dcde8163
...
@@ -86,7 +86,7 @@ class WindowsProject extends FlutterProjectPlatform implements CmakeBasedProject
...
@@ -86,7 +86,7 @@ class WindowsProject extends FlutterProjectPlatform implements CmakeBasedProject
/// The Windows UWP version of the Windows project.
/// The Windows UWP version of the Windows project.
class
WindowsUwpProject
extends
WindowsProject
{
class
WindowsUwpProject
extends
WindowsProject
{
WindowsUwpProject
.
fromFlutter
(
FlutterProject
parent
)
:
super
.
fromFlutter
(
parent
);
WindowsUwpProject
.
fromFlutter
(
super
.
parent
)
:
super
.
fromFlutter
(
);
@override
@override
String
get
_childDirectory
=>
'winuwp'
;
String
get
_childDirectory
=>
'winuwp'
;
...
...
packages/flutter_tools/lib/src/commands/analyze_continuously.dart
View file @
dcde8163
...
@@ -2,40 +2,28 @@
...
@@ -2,40 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// found in the LICENSE file.
import
'package:args/args.dart'
;
import
'package:process/process.dart'
;
import
'../artifacts.dart'
;
import
'../base/common.dart'
;
import
'../base/common.dart'
;
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../base/io.dart'
;
import
'../base/io.dart'
;
import
'../base/logger.dart'
;
import
'../base/logger.dart'
;
import
'../base/platform.dart'
;
import
'../base/terminal.dart'
;
import
'../dart/analysis.dart'
;
import
'../dart/analysis.dart'
;
import
'analyze_base.dart'
;
import
'analyze_base.dart'
;
class
AnalyzeContinuously
extends
AnalyzeBase
{
class
AnalyzeContinuously
extends
AnalyzeBase
{
AnalyzeContinuously
(
AnalyzeContinuously
(
ArgResults
argResults
,
super
.
argResults
,
List
<
String
>
repoRoots
,
List
<
String
>
repoRoots
,
List
<
Directory
>
repoPackages
,
{
List
<
Directory
>
repoPackages
,
{
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Logger
logger
,
required
super
.
logger
,
required
Terminal
terminal
,
required
super
.
terminal
,
required
Platform
platform
,
required
super
.
platform
,
required
ProcessManager
processManager
,
required
super
.
processManager
,
required
Artifacts
artifacts
,
required
super
.
artifacts
,
})
:
super
(
})
:
super
(
argResults
,
repoPackages:
repoPackages
,
repoPackages:
repoPackages
,
repoRoots:
repoRoots
,
repoRoots:
repoRoots
,
fileSystem:
fileSystem
,
logger:
logger
,
platform:
platform
,
terminal:
terminal
,
processManager:
processManager
,
artifacts:
artifacts
,
);
);
String
?
analysisTarget
;
String
?
analysisTarget
;
...
...
packages/flutter_tools/lib/src/commands/analyze_once.dart
View file @
dcde8163
...
@@ -4,40 +4,28 @@
...
@@ -4,40 +4,28 @@
import
'dart:async'
;
import
'dart:async'
;
import
'package:args/args.dart'
;
import
'package:process/process.dart'
;
import
'../artifacts.dart'
;
import
'../base/common.dart'
;
import
'../base/common.dart'
;
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../base/logger.dart'
;
import
'../base/logger.dart'
;
import
'../base/platform.dart'
;
import
'../base/terminal.dart'
;
import
'../dart/analysis.dart'
;
import
'../dart/analysis.dart'
;
import
'analyze_base.dart'
;
import
'analyze_base.dart'
;
class
AnalyzeOnce
extends
AnalyzeBase
{
class
AnalyzeOnce
extends
AnalyzeBase
{
AnalyzeOnce
(
AnalyzeOnce
(
ArgResults
argResults
,
super
.
argResults
,
List
<
String
>
repoRoots
,
List
<
String
>
repoRoots
,
List
<
Directory
>
repoPackages
,
{
List
<
Directory
>
repoPackages
,
{
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Logger
logger
,
required
super
.
logger
,
required
Platform
platform
,
required
super
.
platform
,
required
ProcessManager
processManager
,
required
super
.
processManager
,
required
Terminal
terminal
,
required
super
.
terminal
,
required
Artifacts
artifacts
,
required
super
.
artifacts
,
this
.
workingDirectory
,
this
.
workingDirectory
,
})
:
super
(
})
:
super
(
argResults
,
repoRoots:
repoRoots
,
repoRoots:
repoRoots
,
repoPackages:
repoPackages
,
repoPackages:
repoPackages
,
fileSystem:
fileSystem
,
logger:
logger
,
platform:
platform
,
processManager:
processManager
,
terminal:
terminal
,
artifacts:
artifacts
,
);
);
/// The working directory for testing analysis using dartanalyzer.
/// The working directory for testing analysis using dartanalyzer.
...
...
packages/flutter_tools/lib/src/commands/build_ios.dart
View file @
dcde8163
...
@@ -21,7 +21,7 @@ import 'build.dart';
...
@@ -21,7 +21,7 @@ import 'build.dart';
/// Builds an .app for an iOS app to be used for local testing on an iOS device
/// Builds an .app for an iOS app to be used for local testing on an iOS device
/// or simulator. Can only be run on a macOS host.
/// or simulator. Can only be run on a macOS host.
class
BuildIOSCommand
extends
_BuildIOSSubCommand
{
class
BuildIOSCommand
extends
_BuildIOSSubCommand
{
BuildIOSCommand
({
required
bool
verboseHelp
})
:
super
(
verboseHelp:
verboseHelp
)
{
BuildIOSCommand
({
required
super
.
verboseHelp
}
)
{
argParser
argParser
..
addFlag
(
'config-only'
,
..
addFlag
(
'config-only'
,
help:
'Update the project configuration without performing a build. '
help:
'Update the project configuration without performing a build. '
...
@@ -65,8 +65,7 @@ class BuildIOSCommand extends _BuildIOSSubCommand {
...
@@ -65,8 +65,7 @@ class BuildIOSCommand extends _BuildIOSSubCommand {
///
///
/// Can only be run on a macOS host.
/// Can only be run on a macOS host.
class
BuildIOSArchiveCommand
extends
_BuildIOSSubCommand
{
class
BuildIOSArchiveCommand
extends
_BuildIOSSubCommand
{
BuildIOSArchiveCommand
({
required
bool
verboseHelp
})
BuildIOSArchiveCommand
({
required
super
.
verboseHelp
})
{
:
super
(
verboseHelp:
verboseHelp
)
{
argParser
.
addOption
(
argParser
.
addOption
(
'export-method'
,
'export-method'
,
defaultsTo:
'app-store'
,
defaultsTo:
'app-store'
,
...
...
packages/flutter_tools/lib/src/commands/update_packages.dart
View file @
dcde8163
...
@@ -1082,11 +1082,11 @@ class PubspecChecksum extends PubspecLine {
...
@@ -1082,11 +1082,11 @@ class PubspecChecksum extends PubspecLine {
/// A header, e.g. "dependencies:".
/// A header, e.g. "dependencies:".
class
PubspecHeader
extends
PubspecLine
{
class
PubspecHeader
extends
PubspecLine
{
PubspecHeader
(
PubspecHeader
(
String
line
,
super
.
line
,
this
.
section
,
{
this
.
section
,
{
this
.
name
,
this
.
name
,
this
.
value
,
this
.
value
,
})
:
super
(
line
)
;
});
/// The section of the pubspec where the parse [line] appears.
/// The section of the pubspec where the parse [line] appears.
final
Section
section
;
final
Section
section
;
...
@@ -1163,15 +1163,14 @@ class PubspecHeader extends PubspecLine {
...
@@ -1163,15 +1163,14 @@ class PubspecHeader extends PubspecLine {
/// A dependency, as represented by a line (or two) from a pubspec.yaml file.
/// A dependency, as represented by a line (or two) from a pubspec.yaml file.
class
PubspecDependency
extends
PubspecLine
{
class
PubspecDependency
extends
PubspecLine
{
PubspecDependency
(
PubspecDependency
(
String
line
,
super
.
line
,
this
.
name
,
this
.
name
,
this
.
suffix
,
{
this
.
suffix
,
{
required
this
.
isTransitive
,
required
this
.
isTransitive
,
required
DependencyKind
kind
,
required
DependencyKind
kind
,
required
this
.
version
,
required
this
.
version
,
required
this
.
sourcePath
,
required
this
.
sourcePath
,
})
:
_kind
=
kind
,
})
:
_kind
=
kind
;
super
(
line
);
static
PubspecDependency
?
parse
(
String
line
,
{
required
String
filename
})
{
static
PubspecDependency
?
parse
(
String
line
,
{
required
String
filename
})
{
// We recognize any line that:
// We recognize any line that:
...
...
packages/flutter_tools/lib/src/compile.dart
View file @
dcde8163
...
@@ -358,14 +358,14 @@ abstract class _CompilationRequest {
...
@@ -358,14 +358,14 @@ abstract class _CompilationRequest {
class
_RecompileRequest
extends
_CompilationRequest
{
class
_RecompileRequest
extends
_CompilationRequest
{
_RecompileRequest
(
_RecompileRequest
(
Completer
<
CompilerOutput
?>
completer
,
super
.
completer
,
this
.
mainUri
,
this
.
mainUri
,
this
.
invalidatedFiles
,
this
.
invalidatedFiles
,
this
.
outputPath
,
this
.
outputPath
,
this
.
packageConfig
,
this
.
packageConfig
,
this
.
suppressErrors
,
this
.
suppressErrors
,
{
this
.
additionalSource
}
{
this
.
additionalSource
}
)
:
super
(
completer
)
;
);
Uri
mainUri
;
Uri
mainUri
;
List
<
Uri
>?
invalidatedFiles
;
List
<
Uri
>?
invalidatedFiles
;
...
@@ -381,14 +381,14 @@ class _RecompileRequest extends _CompilationRequest {
...
@@ -381,14 +381,14 @@ class _RecompileRequest extends _CompilationRequest {
class
_CompileExpressionRequest
extends
_CompilationRequest
{
class
_CompileExpressionRequest
extends
_CompilationRequest
{
_CompileExpressionRequest
(
_CompileExpressionRequest
(
Completer
<
CompilerOutput
?>
completer
,
super
.
completer
,
this
.
expression
,
this
.
expression
,
this
.
definitions
,
this
.
definitions
,
this
.
typeDefinitions
,
this
.
typeDefinitions
,
this
.
libraryUri
,
this
.
libraryUri
,
this
.
klass
,
this
.
klass
,
this
.
isStatic
,
this
.
isStatic
,
)
:
super
(
completer
)
;
);
String
expression
;
String
expression
;
List
<
String
>?
definitions
;
List
<
String
>?
definitions
;
...
@@ -404,7 +404,7 @@ class _CompileExpressionRequest extends _CompilationRequest {
...
@@ -404,7 +404,7 @@ class _CompileExpressionRequest extends _CompilationRequest {
class
_CompileExpressionToJsRequest
extends
_CompilationRequest
{
class
_CompileExpressionToJsRequest
extends
_CompilationRequest
{
_CompileExpressionToJsRequest
(
_CompileExpressionToJsRequest
(
Completer
<
CompilerOutput
?>
completer
,
super
.
completer
,
this
.
libraryUri
,
this
.
libraryUri
,
this
.
line
,
this
.
line
,
this
.
column
,
this
.
column
,
...
@@ -412,7 +412,7 @@ class _CompileExpressionToJsRequest extends _CompilationRequest {
...
@@ -412,7 +412,7 @@ class _CompileExpressionToJsRequest extends _CompilationRequest {
this
.
jsFrameValues
,
this
.
jsFrameValues
,
this
.
moduleName
,
this
.
moduleName
,
this
.
expression
,
this
.
expression
,
)
:
super
(
completer
)
;
);
final
String
?
libraryUri
;
final
String
?
libraryUri
;
final
int
line
;
final
int
line
;
...
@@ -428,7 +428,7 @@ class _CompileExpressionToJsRequest extends _CompilationRequest {
...
@@ -428,7 +428,7 @@ class _CompileExpressionToJsRequest extends _CompilationRequest {
}
}
class
_RejectRequest
extends
_CompilationRequest
{
class
_RejectRequest
extends
_CompilationRequest
{
_RejectRequest
(
Completer
<
CompilerOutput
?>
completer
)
:
super
(
completer
);
_RejectRequest
(
super
.
completer
);
@override
@override
Future
<
CompilerOutput
?>
_run
(
DefaultResidentCompiler
compiler
)
async
=>
Future
<
CompilerOutput
?>
_run
(
DefaultResidentCompiler
compiler
)
async
=>
...
...
packages/flutter_tools/lib/src/debug_adapters/flutter_adapter.dart
View file @
dcde8163
...
@@ -21,20 +21,14 @@ import 'mixins.dart';
...
@@ -21,20 +21,14 @@ import 'mixins.dart';
class
FlutterDebugAdapter
extends
DartDebugAdapter
<
FlutterLaunchRequestArguments
,
FlutterAttachRequestArguments
>
class
FlutterDebugAdapter
extends
DartDebugAdapter
<
FlutterLaunchRequestArguments
,
FlutterAttachRequestArguments
>
with
PidTracker
{
with
PidTracker
{
FlutterDebugAdapter
(
FlutterDebugAdapter
(
ByteStreamServerChannel
channel
,
{
super
.
channel
,
{
required
this
.
fileSystem
,
required
this
.
fileSystem
,
required
this
.
platform
,
required
this
.
platform
,
bool
ipv6
=
false
,
super
.
ipv6
,
bool
enableDds
=
true
,
super
.
enableDds
,
bool
enableAuthCodes
=
true
,
super
.
enableAuthCodes
,
Logger
?
logger
,
super
.
logger
,
})
:
super
(
});
channel
,
ipv6:
ipv6
,
enableDds:
enableDds
,
enableAuthCodes:
enableAuthCodes
,
logger:
logger
,
);
FileSystem
fileSystem
;
FileSystem
fileSystem
;
Platform
platform
;
Platform
platform
;
...
...
packages/flutter_tools/lib/src/debug_adapters/flutter_adapter_args.dart
View file @
dcde8163
...
@@ -17,33 +17,23 @@ class FlutterAttachRequestArguments
...
@@ -17,33 +17,23 @@ class FlutterAttachRequestArguments
this
.
customTool
,
this
.
customTool
,
this
.
customToolReplacesArgs
,
this
.
customToolReplacesArgs
,
this
.
vmServiceUri
,
this
.
vmServiceUri
,
Object
?
restart
,
super
.
restart
,
String
?
name
,
super
.
name
,
String
?
cwd
,
super
.
cwd
,
List
<
String
>?
additionalProjectPaths
,
super
.
additionalProjectPaths
,
bool
?
debugSdkLibraries
,
super
.
debugSdkLibraries
,
bool
?
debugExternalPackageLibraries
,
super
.
debugExternalPackageLibraries
,
bool
?
evaluateGettersInDebugViews
,
super
.
evaluateGettersInDebugViews
,
bool
?
evaluateToStringInDebugViews
,
super
.
evaluateToStringInDebugViews
,
bool
?
sendLogsToClient
,
super
.
sendLogsToClient
,
})
:
super
(
});
name:
name
,
cwd:
cwd
,
FlutterAttachRequestArguments
.
fromMap
(
super
.
obj
)
restart:
restart
,
additionalProjectPaths:
additionalProjectPaths
,
debugSdkLibraries:
debugSdkLibraries
,
debugExternalPackageLibraries:
debugExternalPackageLibraries
,
evaluateGettersInDebugViews:
evaluateGettersInDebugViews
,
evaluateToStringInDebugViews:
evaluateToStringInDebugViews
,
sendLogsToClient:
sendLogsToClient
,
);
FlutterAttachRequestArguments
.
fromMap
(
Map
<
String
,
Object
?>
obj
)
:
toolArgs
=
(
obj
[
'toolArgs'
]
as
List
<
Object
?>?)?.
cast
<
String
>(),
:
toolArgs
=
(
obj
[
'toolArgs'
]
as
List
<
Object
?>?)?.
cast
<
String
>(),
customTool
=
obj
[
'customTool'
]
as
String
?,
customTool
=
obj
[
'customTool'
]
as
String
?,
customToolReplacesArgs
=
obj
[
'customToolReplacesArgs'
]
as
int
?,
customToolReplacesArgs
=
obj
[
'customToolReplacesArgs'
]
as
int
?,
vmServiceUri
=
obj
[
'vmServiceUri'
]
as
String
?,
vmServiceUri
=
obj
[
'vmServiceUri'
]
as
String
?,
super
.
fromMap
(
obj
);
super
.
fromMap
();
static
FlutterAttachRequestArguments
fromJson
(
Map
<
String
,
Object
?>
obj
)
=>
static
FlutterAttachRequestArguments
fromJson
(
Map
<
String
,
Object
?>
obj
)
=>
FlutterAttachRequestArguments
.
fromMap
(
obj
);
FlutterAttachRequestArguments
.
fromMap
(
obj
);
...
@@ -98,35 +88,25 @@ class FlutterLaunchRequestArguments
...
@@ -98,35 +88,25 @@ class FlutterLaunchRequestArguments
this
.
toolArgs
,
this
.
toolArgs
,
this
.
customTool
,
this
.
customTool
,
this
.
customToolReplacesArgs
,
this
.
customToolReplacesArgs
,
Object
?
restart
,
super
.
restart
,
String
?
name
,
super
.
name
,
String
?
cwd
,
super
.
cwd
,
List
<
String
>?
additionalProjectPaths
,
super
.
additionalProjectPaths
,
bool
?
debugSdkLibraries
,
super
.
debugSdkLibraries
,
bool
?
debugExternalPackageLibraries
,
super
.
debugExternalPackageLibraries
,
bool
?
evaluateGettersInDebugViews
,
super
.
evaluateGettersInDebugViews
,
bool
?
evaluateToStringInDebugViews
,
super
.
evaluateToStringInDebugViews
,
bool
?
sendLogsToClient
,
super
.
sendLogsToClient
,
})
:
super
(
});
restart:
restart
,
name:
name
,
FlutterLaunchRequestArguments
.
fromMap
(
super
.
obj
)
cwd:
cwd
,
additionalProjectPaths:
additionalProjectPaths
,
debugSdkLibraries:
debugSdkLibraries
,
debugExternalPackageLibraries:
debugExternalPackageLibraries
,
evaluateGettersInDebugViews:
evaluateGettersInDebugViews
,
evaluateToStringInDebugViews:
evaluateToStringInDebugViews
,
sendLogsToClient:
sendLogsToClient
,
);
FlutterLaunchRequestArguments
.
fromMap
(
Map
<
String
,
Object
?>
obj
)
:
noDebug
=
obj
[
'noDebug'
]
as
bool
?,
:
noDebug
=
obj
[
'noDebug'
]
as
bool
?,
program
=
obj
[
'program'
]
as
String
?,
program
=
obj
[
'program'
]
as
String
?,
args
=
(
obj
[
'args'
]
as
List
<
Object
?>?)?.
cast
<
String
>(),
args
=
(
obj
[
'args'
]
as
List
<
Object
?>?)?.
cast
<
String
>(),
toolArgs
=
(
obj
[
'toolArgs'
]
as
List
<
Object
?>?)?.
cast
<
String
>(),
toolArgs
=
(
obj
[
'toolArgs'
]
as
List
<
Object
?>?)?.
cast
<
String
>(),
customTool
=
obj
[
'customTool'
]
as
String
?,
customTool
=
obj
[
'customTool'
]
as
String
?,
customToolReplacesArgs
=
obj
[
'customToolReplacesArgs'
]
as
int
?,
customToolReplacesArgs
=
obj
[
'customToolReplacesArgs'
]
as
int
?,
super
.
fromMap
(
obj
);
super
.
fromMap
();
/// If noDebug is true the launch request should launch the program without enabling debugging.
/// If noDebug is true the launch request should launch the program without enabling debugging.
@override
@override
...
...
packages/flutter_tools/lib/src/debug_adapters/flutter_test_adapter.dart
View file @
dcde8163
...
@@ -21,20 +21,14 @@ import 'mixins.dart';
...
@@ -21,20 +21,14 @@ import 'mixins.dart';
class
FlutterTestDebugAdapter
extends
DartDebugAdapter
<
FlutterLaunchRequestArguments
,
FlutterAttachRequestArguments
>
class
FlutterTestDebugAdapter
extends
DartDebugAdapter
<
FlutterLaunchRequestArguments
,
FlutterAttachRequestArguments
>
with
PidTracker
,
TestAdapter
{
with
PidTracker
,
TestAdapter
{
FlutterTestDebugAdapter
(
FlutterTestDebugAdapter
(
ByteStreamServerChannel
channel
,
{
super
.
channel
,
{
required
this
.
fileSystem
,
required
this
.
fileSystem
,
required
this
.
platform
,
required
this
.
platform
,
bool
ipv6
=
false
,
super
.
ipv6
,
bool
enableDds
=
true
,
super
.
enableDds
,
bool
enableAuthCodes
=
true
,
super
.
enableAuthCodes
,
Logger
?
logger
,
super
.
logger
,
})
:
super
(
});
channel
,
ipv6:
ipv6
,
enableDds:
enableDds
,
enableAuthCodes:
enableAuthCodes
,
logger:
logger
,
);
FileSystem
fileSystem
;
FileSystem
fileSystem
;
Platform
platform
;
Platform
platform
;
...
...
packages/flutter_tools/lib/src/desktop_device.dart
View file @
dcde8163
...
@@ -22,9 +22,9 @@ import 'protocol_discovery.dart';
...
@@ -22,9 +22,9 @@ import 'protocol_discovery.dart';
/// A partial implementation of Device for desktop-class devices to inherit
/// A partial implementation of Device for desktop-class devices to inherit
/// from, containing implementations that are common to all desktop devices.
/// from, containing implementations that are common to all desktop devices.
abstract
class
DesktopDevice
extends
Device
{
abstract
class
DesktopDevice
extends
Device
{
DesktopDevice
(
String
identifier
,
{
DesktopDevice
(
super
.
identifier
,
{
required
PlatformType
platformType
,
required
PlatformType
super
.
platformType
,
required
bool
ephemeral
,
required
super
.
ephemeral
,
required
Logger
logger
,
required
Logger
logger
,
required
ProcessManager
processManager
,
required
ProcessManager
processManager
,
required
FileSystem
fileSystem
,
required
FileSystem
fileSystem
,
...
@@ -34,10 +34,7 @@ abstract class DesktopDevice extends Device {
...
@@ -34,10 +34,7 @@ abstract class DesktopDevice extends Device {
_fileSystem
=
fileSystem
,
_fileSystem
=
fileSystem
,
_operatingSystemUtils
=
operatingSystemUtils
,
_operatingSystemUtils
=
operatingSystemUtils
,
super
(
super
(
identifier
,
category:
Category
.
desktop
,
category:
Category
.
desktop
,
platformType:
platformType
,
ephemeral:
ephemeral
,
);
);
final
Logger
_logger
;
final
Logger
_logger
;
...
...
packages/flutter_tools/lib/src/doctor_validator.dart
View file @
dcde8163
...
@@ -304,7 +304,7 @@ class NoIdeValidator extends DoctorValidator {
...
@@ -304,7 +304,7 @@ class NoIdeValidator extends DoctorValidator {
}
}
class
ValidatorWithResult
extends
DoctorValidator
{
class
ValidatorWithResult
extends
DoctorValidator
{
ValidatorWithResult
(
String
title
,
this
.
result
)
:
super
(
title
);
ValidatorWithResult
(
super
.
title
,
this
.
result
);
final
ValidationResult
result
;
final
ValidationResult
result
;
...
...
packages/flutter_tools/lib/src/flutter_cache.dart
View file @
dcde8163
...
@@ -26,10 +26,10 @@ class FlutterCache extends Cache {
...
@@ -26,10 +26,10 @@ class FlutterCache extends Cache {
/// [artifacts] is configurable for testing.
/// [artifacts] is configurable for testing.
FlutterCache
({
FlutterCache
({
required
Logger
logger
,
required
Logger
logger
,
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
Platform
platform
,
required
Platform
platform
,
required
OperatingSystemUtils
osUtils
,
required
super
.
osUtils
,
})
:
super
(
logger:
logger
,
fileSystem:
fileSystem
,
platform:
platform
,
osUtils:
osUtils
,
artifacts:
<
ArtifactSet
>[])
{
})
:
super
(
logger:
logger
,
platform:
platform
,
artifacts:
<
ArtifactSet
>[])
{
registerArtifact
(
MaterialFonts
(
this
));
registerArtifact
(
MaterialFonts
(
this
));
registerArtifact
(
GradleWrapper
(
this
));
registerArtifact
(
GradleWrapper
(
this
));
registerArtifact
(
AndroidGenSnapshotArtifacts
(
this
,
platform:
platform
));
registerArtifact
(
AndroidGenSnapshotArtifacts
(
this
,
platform:
platform
));
...
...
packages/flutter_tools/lib/src/flutter_device_manager.dart
View file @
dcde8163
...
@@ -9,11 +9,8 @@ import 'android/android_sdk.dart';
...
@@ -9,11 +9,8 @@ import 'android/android_sdk.dart';
import
'android/android_workflow.dart'
;
import
'android/android_workflow.dart'
;
import
'artifacts.dart'
;
import
'artifacts.dart'
;
import
'base/file_system.dart'
;
import
'base/file_system.dart'
;
import
'base/logger.dart'
;
import
'base/os.dart'
;
import
'base/os.dart'
;
import
'base/platform.dart'
;
import
'base/platform.dart'
;
import
'base/terminal.dart'
;
import
'base/user_messages.dart'
hide
userMessages
;
import
'custom_devices/custom_device.dart'
;
import
'custom_devices/custom_device.dart'
;
import
'custom_devices/custom_devices_config.dart'
;
import
'custom_devices/custom_devices_config.dart'
;
import
'device.dart'
;
import
'device.dart'
;
...
@@ -39,7 +36,7 @@ import 'windows/windows_workflow.dart';
...
@@ -39,7 +36,7 @@ import 'windows/windows_workflow.dart';
/// A provider for all of the device discovery instances.
/// A provider for all of the device discovery instances.
class
FlutterDeviceManager
extends
DeviceManager
{
class
FlutterDeviceManager
extends
DeviceManager
{
FlutterDeviceManager
({
FlutterDeviceManager
({
required
Logger
logger
,
required
super
.
logger
,
required
Platform
platform
,
required
Platform
platform
,
required
ProcessManager
processManager
,
required
ProcessManager
processManager
,
required
FileSystem
fileSystem
,
required
FileSystem
fileSystem
,
...
@@ -54,10 +51,10 @@ class FlutterDeviceManager extends DeviceManager {
...
@@ -54,10 +51,10 @@ class FlutterDeviceManager extends DeviceManager {
required
Artifacts
artifacts
,
required
Artifacts
artifacts
,
required
MacOSWorkflow
macOSWorkflow
,
required
MacOSWorkflow
macOSWorkflow
,
required
FuchsiaSdk
fuchsiaSdk
,
required
FuchsiaSdk
fuchsiaSdk
,
required
UserMessages
userMessages
,
required
super
.
userMessages
,
required
OperatingSystemUtils
operatingSystemUtils
,
required
OperatingSystemUtils
operatingSystemUtils
,
required
WindowsWorkflow
windowsWorkflow
,
required
WindowsWorkflow
windowsWorkflow
,
required
Terminal
terminal
,
required
super
.
terminal
,
required
CustomDevicesConfig
customDevicesConfig
,
required
CustomDevicesConfig
customDevicesConfig
,
required
UwpTool
uwptool
,
required
UwpTool
uwptool
,
})
:
deviceDiscoverers
=
<
DeviceDiscovery
>[
})
:
deviceDiscoverers
=
<
DeviceDiscovery
>[
...
@@ -139,11 +136,7 @@ class FlutterDeviceManager extends DeviceManager {
...
@@ -139,11 +136,7 @@ class FlutterDeviceManager extends DeviceManager {
logger:
logger
,
logger:
logger
,
config:
customDevicesConfig
config:
customDevicesConfig
),
),
],
super
(
];
logger:
logger
,
terminal:
terminal
,
userMessages:
userMessages
,
);
@override
@override
final
List
<
DeviceDiscovery
>
deviceDiscoverers
;
final
List
<
DeviceDiscovery
>
deviceDiscoverers
;
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
View file @
dcde8163
...
@@ -227,8 +227,7 @@ class FuchsiaDevices extends PollingDeviceDiscovery {
...
@@ -227,8 +227,7 @@ class FuchsiaDevices extends PollingDeviceDiscovery {
class
FuchsiaDevice
extends
Device
{
class
FuchsiaDevice
extends
Device
{
FuchsiaDevice
(
String
id
,
{
required
this
.
name
})
:
super
(
FuchsiaDevice
(
super
.
id
,
{
required
this
.
name
})
:
super
(
id
,
platformType:
PlatformType
.
fuchsia
,
platformType:
PlatformType
.
fuchsia
,
category:
null
,
category:
null
,
ephemeral:
true
,
ephemeral:
true
,
...
...
packages/flutter_tools/lib/src/intellij/intellij_validator.dart
View file @
dcde8163
...
@@ -22,12 +22,11 @@ const String _communityEditionId = 'IdeaIC';
...
@@ -22,12 +22,11 @@ const String _communityEditionId = 'IdeaIC';
/// A doctor validator for both Intellij and Android Studio.
/// A doctor validator for both Intellij and Android Studio.
abstract
class
IntelliJValidator
extends
DoctorValidator
{
abstract
class
IntelliJValidator
extends
DoctorValidator
{
IntelliJValidator
(
String
title
,
this
.
installPath
,
{
IntelliJValidator
(
super
.
title
,
this
.
installPath
,
{
required
FileSystem
fileSystem
,
required
FileSystem
fileSystem
,
required
UserMessages
userMessages
,
required
UserMessages
userMessages
,
})
:
_fileSystem
=
fileSystem
,
})
:
_fileSystem
=
fileSystem
,
_userMessages
=
userMessages
,
_userMessages
=
userMessages
;
super
(
title
);
final
String
installPath
;
final
String
installPath
;
final
FileSystem
_fileSystem
;
final
FileSystem
_fileSystem
;
...
...
packages/flutter_tools/lib/src/ios/application_package.dart
View file @
dcde8163
...
@@ -157,9 +157,9 @@ class PrebuiltIOSApp extends IOSApp implements PrebuiltApplicationPackage {
...
@@ -157,9 +157,9 @@ class PrebuiltIOSApp extends IOSApp implements PrebuiltApplicationPackage {
PrebuiltIOSApp
({
PrebuiltIOSApp
({
required
this
.
uncompressedBundle
,
required
this
.
uncompressedBundle
,
this
.
bundleName
,
this
.
bundleName
,
required
String
projectBundleId
,
required
super
.
projectBundleId
,
required
this
.
applicationPackage
,
required
this
.
applicationPackage
,
})
:
super
(
projectBundleId:
projectBundleId
)
;
});
/// The uncompressed bundle of the application.
/// The uncompressed bundle of the application.
///
///
...
...
packages/flutter_tools/lib/src/ios/devices.dart
View file @
dcde8163
...
@@ -145,7 +145,7 @@ class IOSDevices extends PollingDeviceDiscovery {
...
@@ -145,7 +145,7 @@ class IOSDevices extends PollingDeviceDiscovery {
}
}
class
IOSDevice
extends
Device
{
class
IOSDevice
extends
Device
{
IOSDevice
(
String
id
,
{
IOSDevice
(
super
.
id
,
{
required
FileSystem
fileSystem
,
required
FileSystem
fileSystem
,
required
this
.
name
,
required
this
.
name
,
required
this
.
cpuArchitecture
,
required
this
.
cpuArchitecture
,
...
@@ -165,7 +165,6 @@ class IOSDevice extends Device {
...
@@ -165,7 +165,6 @@ class IOSDevice extends Device {
_logger
=
logger
,
_logger
=
logger
,
_platform
=
platform
,
_platform
=
platform
,
super
(
super
(
id
,
category:
Category
.
mobile
,
category:
Category
.
mobile
,
platformType:
PlatformType
.
ios
,
platformType:
PlatformType
.
ios
,
ephemeral:
true
,
ephemeral:
true
,
...
...
packages/flutter_tools/lib/src/ios/migrations/deployment_target_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -11,10 +10,9 @@ import '../../xcode_project.dart';
...
@@ -11,10 +10,9 @@ import '../../xcode_project.dart';
class
DeploymentTargetMigration
extends
ProjectMigrator
{
class
DeploymentTargetMigration
extends
ProjectMigrator
{
DeploymentTargetMigration
(
DeploymentTargetMigration
(
IosProject
project
,
IosProject
project
,
Logger
logger
,
super
.
logger
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
_appFrameworkInfoPlist
=
project
.
appFrameworkInfoPlist
,
_appFrameworkInfoPlist
=
project
.
appFrameworkInfoPlist
;
super
(
logger
);
final
File
_xcodeProjectInfoFile
;
final
File
_xcodeProjectInfoFile
;
final
File
_appFrameworkInfoPlist
;
final
File
_appFrameworkInfoPlist
;
...
...
packages/flutter_tools/lib/src/ios/migrations/minimum_frame_duration_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -13,9 +12,8 @@ const String _kDisableMinimumFrameDurationKey = 'CADisableMinimumFrameDurationOn
...
@@ -13,9 +12,8 @@ const String _kDisableMinimumFrameDurationKey = 'CADisableMinimumFrameDurationOn
class
MinimumFrameDurationMigration
extends
ProjectMigrator
{
class
MinimumFrameDurationMigration
extends
ProjectMigrator
{
MinimumFrameDurationMigration
(
MinimumFrameDurationMigration
(
IosProject
project
,
IosProject
project
,
Logger
logger
,
super
.
logger
,
)
:
_infoPlist
=
project
.
defaultHostInfoPlist
,
)
:
_infoPlist
=
project
.
defaultHostInfoPlist
;
super
(
logger
);
final
File
_infoPlist
;
final
File
_infoPlist
;
...
...
packages/flutter_tools/lib/src/ios/migrations/project_base_configuration_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -11,9 +10,8 @@ import '../../xcode_project.dart';
...
@@ -11,9 +10,8 @@ import '../../xcode_project.dart';
// However the top-level Runner project should not inherit any build configuration so
// However the top-level Runner project should not inherit any build configuration so
// the Flutter build settings do not stomp on non-Flutter targets.
// the Flutter build settings do not stomp on non-Flutter targets.
class
ProjectBaseConfigurationMigration
extends
ProjectMigrator
{
class
ProjectBaseConfigurationMigration
extends
ProjectMigrator
{
ProjectBaseConfigurationMigration
(
IosProject
project
,
Logger
logger
)
ProjectBaseConfigurationMigration
(
IosProject
project
,
super
.
logger
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
;
super
(
logger
);
final
File
_xcodeProjectInfoFile
;
final
File
_xcodeProjectInfoFile
;
...
...
packages/flutter_tools/lib/src/ios/migrations/project_build_location_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -11,9 +10,8 @@ import '../../xcode_project.dart';
...
@@ -11,9 +10,8 @@ import '../../xcode_project.dart';
class
ProjectBuildLocationMigration
extends
ProjectMigrator
{
class
ProjectBuildLocationMigration
extends
ProjectMigrator
{
ProjectBuildLocationMigration
(
ProjectBuildLocationMigration
(
IosProject
project
,
IosProject
project
,
Logger
logger
,
super
.
logger
,
)
:
_xcodeProjectWorkspaceData
=
project
.
xcodeProjectWorkspaceData
,
)
:
_xcodeProjectWorkspaceData
=
project
.
xcodeProjectWorkspaceData
;
super
(
logger
);
final
File
_xcodeProjectWorkspaceData
;
final
File
_xcodeProjectWorkspaceData
;
...
...
packages/flutter_tools/lib/src/ios/migrations/project_object_version_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -11,10 +10,9 @@ import '../../xcode_project.dart';
...
@@ -11,10 +10,9 @@ import '../../xcode_project.dart';
class
ProjectObjectVersionMigration
extends
ProjectMigrator
{
class
ProjectObjectVersionMigration
extends
ProjectMigrator
{
ProjectObjectVersionMigration
(
ProjectObjectVersionMigration
(
IosProject
project
,
IosProject
project
,
Logger
logger
,
super
.
logger
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
_xcodeProjectSchemeFile
=
project
.
xcodeProjectSchemeFile
,
_xcodeProjectSchemeFile
=
project
.
xcodeProjectSchemeFile
;
super
(
logger
);
final
File
_xcodeProjectInfoFile
;
final
File
_xcodeProjectInfoFile
;
final
File
_xcodeProjectSchemeFile
;
final
File
_xcodeProjectSchemeFile
;
...
...
packages/flutter_tools/lib/src/ios/migrations/remove_framework_link_and_embedding_migration.dart
View file @
dcde8163
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
import
'../../base/common.dart'
;
import
'../../base/common.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../reporting/reporting.dart'
;
import
'../../reporting/reporting.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -15,11 +14,10 @@ import '../../xcode_project.dart';
...
@@ -15,11 +14,10 @@ import '../../xcode_project.dart';
class
RemoveFrameworkLinkAndEmbeddingMigration
extends
ProjectMigrator
{
class
RemoveFrameworkLinkAndEmbeddingMigration
extends
ProjectMigrator
{
RemoveFrameworkLinkAndEmbeddingMigration
(
RemoveFrameworkLinkAndEmbeddingMigration
(
IosProject
project
,
IosProject
project
,
Logger
logger
,
super
.
logger
,
Usage
usage
,
Usage
usage
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
_usage
=
usage
,
_usage
=
usage
;
super
(
logger
);
final
File
_xcodeProjectInfoFile
;
final
File
_xcodeProjectInfoFile
;
final
Usage
_usage
;
final
Usage
_usage
;
...
...
packages/flutter_tools/lib/src/ios/migrations/xcode_build_system_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -13,9 +12,8 @@ import '../../xcode_project.dart';
...
@@ -13,9 +12,8 @@ import '../../xcode_project.dart';
class
XcodeBuildSystemMigration
extends
ProjectMigrator
{
class
XcodeBuildSystemMigration
extends
ProjectMigrator
{
XcodeBuildSystemMigration
(
XcodeBuildSystemMigration
(
IosProject
project
,
IosProject
project
,
Logger
logger
,
super
.
logger
,
)
:
_xcodeWorkspaceSharedSettings
=
project
.
xcodeWorkspaceSharedSettings
,
)
:
_xcodeWorkspaceSharedSettings
=
project
.
xcodeWorkspaceSharedSettings
;
super
(
logger
);
final
File
_xcodeWorkspaceSharedSettings
;
final
File
_xcodeWorkspaceSharedSettings
;
...
...
packages/flutter_tools/lib/src/ios/simulators.dart
View file @
dcde8163
...
@@ -319,13 +319,12 @@ class SimDevice {
...
@@ -319,13 +319,12 @@ class SimDevice {
class
IOSSimulator
extends
Device
{
class
IOSSimulator
extends
Device
{
IOSSimulator
(
IOSSimulator
(
String
id
,
{
super
.
id
,
{
required
this
.
name
,
required
this
.
name
,
required
this
.
simulatorCategory
,
required
this
.
simulatorCategory
,
required
SimControl
simControl
,
required
SimControl
simControl
,
})
:
_simControl
=
simControl
,
})
:
_simControl
=
simControl
,
super
(
super
(
id
,
category:
Category
.
mobile
,
category:
Category
.
mobile
,
platformType:
PlatformType
.
ios
,
platformType:
PlatformType
.
ios
,
ephemeral:
true
,
ephemeral:
true
,
...
...
packages/flutter_tools/lib/src/macos/migrations/remove_macos_framework_link_and_embedding_migration.dart
View file @
dcde8163
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
import
'../../base/common.dart'
;
import
'../../base/common.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../base/project_migrator.dart'
;
import
'../../reporting/reporting.dart'
;
import
'../../reporting/reporting.dart'
;
import
'../../xcode_project.dart'
;
import
'../../xcode_project.dart'
;
...
@@ -13,11 +12,10 @@ import '../../xcode_project.dart';
...
@@ -13,11 +12,10 @@ import '../../xcode_project.dart';
class
RemoveMacOSFrameworkLinkAndEmbeddingMigration
extends
ProjectMigrator
{
class
RemoveMacOSFrameworkLinkAndEmbeddingMigration
extends
ProjectMigrator
{
RemoveMacOSFrameworkLinkAndEmbeddingMigration
(
RemoveMacOSFrameworkLinkAndEmbeddingMigration
(
MacOSProject
project
,
MacOSProject
project
,
Logger
logger
,
super
.
logger
,
Usage
usage
,
Usage
usage
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
)
:
_xcodeProjectInfoFile
=
project
.
xcodeProjectInfoFile
,
_usage
=
usage
,
_usage
=
usage
;
super
(
logger
);
final
File
_xcodeProjectInfoFile
;
final
File
_xcodeProjectInfoFile
;
final
Usage
_usage
;
final
Usage
_usage
;
...
...
packages/flutter_tools/lib/src/migrations/cmake_custom_command_migration.dart
View file @
dcde8163
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../base/logger.dart'
;
import
'../base/project_migrator.dart'
;
import
'../base/project_migrator.dart'
;
import
'../cmake_project.dart'
;
import
'../cmake_project.dart'
;
...
@@ -11,9 +10,8 @@ import '../cmake_project.dart';
...
@@ -11,9 +10,8 @@ import '../cmake_project.dart';
// and special characters correctly.
// and special characters correctly.
// See https://github.com/flutter/flutter/issues/67270.
// See https://github.com/flutter/flutter/issues/67270.
class
CmakeCustomCommandMigration
extends
ProjectMigrator
{
class
CmakeCustomCommandMigration
extends
ProjectMigrator
{
CmakeCustomCommandMigration
(
CmakeBasedProject
project
,
Logger
logger
)
CmakeCustomCommandMigration
(
CmakeBasedProject
project
,
super
.
logger
)
:
_cmakeFile
=
project
.
managedCmakeFile
,
:
_cmakeFile
=
project
.
managedCmakeFile
;
super
(
logger
);
final
File
_cmakeFile
;
final
File
_cmakeFile
;
...
...
packages/flutter_tools/lib/src/reporting/events.dart
View file @
dcde8163
...
@@ -190,10 +190,10 @@ class BuildEvent extends UsageEvent {
...
@@ -190,10 +190,10 @@ class BuildEvent extends UsageEvent {
/// An event that reports the result of a top-level command.
/// An event that reports the result of a top-level command.
class
CommandResultEvent
extends
UsageEvent
{
class
CommandResultEvent
extends
UsageEvent
{
CommandResultEvent
(
String
commandPath
,
String
result
)
CommandResultEvent
(
super
.
commandPath
,
super
.
result
)
:
assert
(
commandPath
!=
null
),
:
assert
(
commandPath
!=
null
),
assert
(
result
!=
null
),
assert
(
result
!=
null
),
super
(
commandPath
,
result
,
flutterUsage:
globals
.
flutterUsage
);
super
(
flutterUsage:
globals
.
flutterUsage
);
@override
@override
void
send
()
{
void
send
()
{
...
...
packages/flutter_tools/lib/src/tester/flutter_tester.dart
View file @
dcde8163
...
@@ -44,7 +44,7 @@ class FlutterTesterApp extends ApplicationPackage {
...
@@ -44,7 +44,7 @@ class FlutterTesterApp extends ApplicationPackage {
/// also be used as a regular device when `--show-test-device` is provided
/// also be used as a regular device when `--show-test-device` is provided
/// to the flutter command.
/// to the flutter command.
class
FlutterTesterDevice
extends
Device
{
class
FlutterTesterDevice
extends
Device
{
FlutterTesterDevice
(
String
deviceId
,
{
FlutterTesterDevice
(
super
.
deviceId
,
{
required
ProcessManager
processManager
,
required
ProcessManager
processManager
,
required
FlutterVersion
flutterVersion
,
required
FlutterVersion
flutterVersion
,
required
Logger
logger
,
required
Logger
logger
,
...
@@ -58,7 +58,6 @@ class FlutterTesterDevice extends Device {
...
@@ -58,7 +58,6 @@ class FlutterTesterDevice extends Device {
_artifacts
=
artifacts
,
_artifacts
=
artifacts
,
_operatingSystemUtils
=
operatingSystemUtils
,
_operatingSystemUtils
=
operatingSystemUtils
,
super
(
super
(
deviceId
,
platformType:
null
,
platformType:
null
,
category:
null
,
category:
null
,
ephemeral:
false
,
ephemeral:
false
,
...
...
packages/flutter_tools/lib/src/web/web_device.dart
View file @
dcde8163
...
@@ -191,15 +191,13 @@ class GoogleChromeDevice extends ChromiumDevice {
...
@@ -191,15 +191,13 @@ class GoogleChromeDevice extends ChromiumDevice {
required
Platform
platform
,
required
Platform
platform
,
required
ProcessManager
processManager
,
required
ProcessManager
processManager
,
required
ChromiumLauncher
chromiumLauncher
,
required
ChromiumLauncher
chromiumLauncher
,
required
Logger
logger
,
required
super
.
logger
,
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
})
:
_platform
=
platform
,
})
:
_platform
=
platform
,
_processManager
=
processManager
,
_processManager
=
processManager
,
super
(
super
(
name:
'chrome'
,
name:
'chrome'
,
chromeLauncher:
chromiumLauncher
,
chromeLauncher:
chromiumLauncher
,
logger:
logger
,
fileSystem:
fileSystem
,
);
);
final
Platform
_platform
;
final
Platform
_platform
;
...
@@ -247,15 +245,13 @@ class GoogleChromeDevice extends ChromiumDevice {
...
@@ -247,15 +245,13 @@ class GoogleChromeDevice extends ChromiumDevice {
class
MicrosoftEdgeDevice
extends
ChromiumDevice
{
class
MicrosoftEdgeDevice
extends
ChromiumDevice
{
MicrosoftEdgeDevice
({
MicrosoftEdgeDevice
({
required
ChromiumLauncher
chromiumLauncher
,
required
ChromiumLauncher
chromiumLauncher
,
required
Logger
logger
,
required
super
.
logger
,
required
FileSystem
fileSystem
,
required
super
.
fileSystem
,
required
ProcessManager
processManager
,
required
ProcessManager
processManager
,
})
:
_processManager
=
processManager
,
})
:
_processManager
=
processManager
,
super
(
super
(
name:
'edge'
,
name:
'edge'
,
chromeLauncher:
chromiumLauncher
,
chromeLauncher:
chromiumLauncher
,
logger:
logger
,
fileSystem:
fileSystem
,
);
);
final
ProcessManager
_processManager
;
final
ProcessManager
_processManager
;
...
...
packages/flutter_tools/lib/src/web/web_validator.dart
View file @
dcde8163
...
@@ -8,7 +8,7 @@ import 'chrome.dart';
...
@@ -8,7 +8,7 @@ import 'chrome.dart';
/// A validator for Chromium-based browsers.
/// A validator for Chromium-based browsers.
abstract
class
ChromiumValidator
extends
DoctorValidator
{
abstract
class
ChromiumValidator
extends
DoctorValidator
{
const
ChromiumValidator
(
String
title
)
:
super
(
title
);
const
ChromiumValidator
(
super
.
title
);
Platform
get
_platform
;
Platform
get
_platform
;
ChromiumLauncher
get
_chromiumLauncher
;
ChromiumLauncher
get
_chromiumLauncher
;
...
...
packages/flutter_tools/pubspec.yaml
View file @
dcde8163
...
@@ -3,7 +3,7 @@ description: Tools for building Flutter applications
...
@@ -3,7 +3,7 @@ description: Tools for building Flutter applications
homepage
:
https://flutter.dev
homepage
:
https://flutter.dev
environment
:
environment
:
sdk
:
"
>=2.1
2
.0-0
<3.0.0"
sdk
:
"
>=2.1
7
.0-0
<3.0.0"
dependencies
:
dependencies
:
# To update these, use "flutter update-packages --force-upgrade".
# To update these, use "flutter update-packages --force-upgrade".
...
...
packages/flutter_tools/test/general.shard/base/terminal_test.dart
View file @
dcde8163
...
@@ -227,9 +227,9 @@ late Stream<String> mockStdInStream;
...
@@ -227,9 +227,9 @@ late Stream<String> mockStdInStream;
class
TestTerminal
extends
AnsiTerminal
{
class
TestTerminal
extends
AnsiTerminal
{
TestTerminal
({
TestTerminal
({
Stdio
?
stdio
,
Stdio
?
stdio
,
Platform
platform
=
const
LocalPlatform
(),
super
.
platform
=
const
LocalPlatform
(),
DateTime
?
now
,
DateTime
?
now
,
})
:
super
(
stdio:
stdio
??
Stdio
(),
platform:
platform
,
now:
now
??
DateTime
(
2018
));
})
:
super
(
stdio:
stdio
??
Stdio
(),
now:
now
??
DateTime
(
2018
));
@override
@override
Stream
<
String
>
get
keystrokes
{
Stream
<
String
>
get
keystrokes
{
...
...
packages/flutter_tools/test/general.shard/device_test.dart
View file @
dcde8163
...
@@ -541,12 +541,12 @@ class TestDeviceManager extends DeviceManager {
...
@@ -541,12 +541,12 @@ class TestDeviceManager extends DeviceManager {
TestDeviceManager
(
TestDeviceManager
(
List
<
Device
>
allDevices
,
{
List
<
Device
>
allDevices
,
{
List
<
DeviceDiscovery
>?
deviceDiscoveryOverrides
,
List
<
DeviceDiscovery
>?
deviceDiscoveryOverrides
,
required
Logger
logger
,
required
super
.
logger
,
required
Terminal
terminal
,
required
super
.
terminal
,
String
?
wellKnownId
,
String
?
wellKnownId
,
})
:
_fakeDeviceDiscoverer
=
FakePollingDeviceDiscovery
(),
})
:
_fakeDeviceDiscoverer
=
FakePollingDeviceDiscovery
(),
_deviceDiscoverers
=
<
DeviceDiscovery
>[],
_deviceDiscoverers
=
<
DeviceDiscovery
>[],
super
(
logger:
logger
,
terminal:
terminal
,
userMessages:
UserMessages
())
{
super
(
userMessages:
UserMessages
())
{
if
(
wellKnownId
!=
null
)
{
if
(
wellKnownId
!=
null
)
{
_fakeDeviceDiscoverer
.
wellKnownIds
.
add
(
wellKnownId
);
_fakeDeviceDiscoverer
.
wellKnownIds
.
add
(
wellKnownId
);
}
}
...
...
packages/flutter_tools/test/general.shard/intellij/intellij_validator_test.dart
View file @
dcde8163
...
@@ -374,8 +374,8 @@ void main() {
...
@@ -374,8 +374,8 @@ void main() {
}
}
class
IntelliJValidatorTestTarget
extends
IntelliJValidator
{
class
IntelliJValidatorTestTarget
extends
IntelliJValidator
{
IntelliJValidatorTestTarget
(
String
title
,
String
installPath
,
FileSystem
fileSystem
)
IntelliJValidatorTestTarget
(
super
.
title
,
super
.
installPath
,
FileSystem
fileSystem
)
:
super
(
title
,
installPath
,
fileSystem:
fileSystem
,
userMessages:
UserMessages
());
:
super
(
fileSystem:
fileSystem
,
userMessages:
UserMessages
());
@override
@override
String
get
pluginsPath
=>
'plugins'
;
String
get
pluginsPath
=>
'plugins'
;
...
...
packages/flutter_tools/test/general.shard/reporting/events_test.dart
View file @
dcde8163
...
@@ -127,11 +127,11 @@ void main() {
...
@@ -127,11 +127,11 @@ void main() {
}
}
class
FakeGroupedValidator
extends
GroupedValidator
{
class
FakeGroupedValidator
extends
GroupedValidator
{
FakeGroupedValidator
(
List
<
DoctorValidator
>
subValidators
)
:
super
(
subValidators
);
FakeGroupedValidator
(
super
.
subValidators
);
}
}
class
FakeDoctorValidator
extends
DoctorValidator
{
class
FakeDoctorValidator
extends
DoctorValidator
{
FakeDoctorValidator
(
String
title
)
:
super
(
title
);
FakeDoctorValidator
(
super
.
title
);
@override
@override
Future
<
ValidationResult
>
validate
()
async
{
Future
<
ValidationResult
>
validate
()
async
{
...
...
packages/flutter_tools/test/integration.shard/test_driver.dart
View file @
dcde8163
...
@@ -489,10 +489,10 @@ abstract class FlutterTestDriver {
...
@@ -489,10 +489,10 @@ abstract class FlutterTestDriver {
class
FlutterRunTestDriver
extends
FlutterTestDriver
{
class
FlutterRunTestDriver
extends
FlutterTestDriver
{
FlutterRunTestDriver
(
FlutterRunTestDriver
(
Directory
projectFolder
,
{
super
.
projectFolder
,
{
String
?
logPrefix
,
super
.
logPrefix
,
this
.
spawnDdsInstance
=
true
,
this
.
spawnDdsInstance
=
true
,
})
:
super
(
projectFolder
,
logPrefix:
logPrefix
)
;
});
String
?
_currentRunningAppId
;
String
?
_currentRunningAppId
;
...
@@ -760,8 +760,7 @@ class FlutterRunTestDriver extends FlutterTestDriver {
...
@@ -760,8 +760,7 @@ class FlutterRunTestDriver extends FlutterTestDriver {
}
}
class
FlutterTestTestDriver
extends
FlutterTestDriver
{
class
FlutterTestTestDriver
extends
FlutterTestDriver
{
FlutterTestTestDriver
(
Directory
projectFolder
,
{
String
?
logPrefix
})
FlutterTestTestDriver
(
super
.
projectFolder
,
{
super
.
logPrefix
});
:
super
(
projectFolder
,
logPrefix:
logPrefix
);
Future
<
void
>
test
({
Future
<
void
>
test
({
String
testFile
=
'test/test.dart'
,
String
testFile
=
'test/test.dart'
,
...
...
packages/flutter_tools/test/src/fakes.dart
View file @
dcde8163
...
@@ -487,7 +487,7 @@ class TestFeatureFlags implements FeatureFlags {
...
@@ -487,7 +487,7 @@ class TestFeatureFlags implements FeatureFlags {
}
}
class
FakeStatusLogger
extends
DelegatingLogger
{
class
FakeStatusLogger
extends
DelegatingLogger
{
FakeStatusLogger
(
Logger
delegate
)
:
super
(
delegate
);
FakeStatusLogger
(
super
.
delegate
);
late
Status
status
;
late
Status
status
;
...
...
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