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
db51c6d5
Unverified
Commit
db51c6d5
authored
Apr 08, 2021
by
Lau Ching Jun
Committed by
GitHub
Apr 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose `packagePath` as a getter in FlutterCommand. (#80026)
parent
e8cd4827
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
flutter_command.dart
packages/flutter_tools/lib/src/runner/flutter_command.dart
+7
-3
flutter_command_test.dart
...tools/test/general.shard/runner/flutter_command_test.dart
+7
-0
utils.dart
packages/flutter_tools/test/general.shard/runner/utils.dart
+4
-0
No files found.
packages/flutter_tools/lib/src/runner/flutter_command.dart
View file @
db51c6d5
...
...
@@ -283,6 +283,11 @@ abstract class FlutterCommand extends Command<void> {
return
bundle
.
defaultMainPath
;
}
/// Path to the Dart's package config file.
///
/// This can be overridden by some of its subclasses.
String
get
packagesPath
=>
globalResults
[
'packages'
]
as
String
;
void
usesPubOption
({
bool
hide
=
false
})
{
argParser
.
addFlag
(
'pub'
,
defaultsTo:
true
,
...
...
@@ -845,7 +850,7 @@ abstract class FlutterCommand extends Command<void> {
:
null
;
final
File
packagesFile
=
globals
.
fs
.
file
(
globalResults
[
'packages'
]
as
String
??
globals
.
fs
.
path
.
absolute
(
'.dart_tool'
,
'package_config.json'
));
packagesPath
??
globals
.
fs
.
path
.
absolute
(
'.dart_tool'
,
'package_config.json'
));
final
PackageConfig
packageConfig
=
await
loadPackageConfigWithLogging
(
packagesFile
,
logger:
globals
.
logger
,
throwOnError:
false
);
...
...
@@ -989,8 +994,7 @@ abstract class FlutterCommand extends Command<void> {
bundleSkSLPath:
bundleSkSLPath
,
dartExperiments:
experiments
,
performanceMeasurementFile:
performanceMeasurementFile
,
packagesPath:
globalResults
[
'packages'
]
as
String
??
globals
.
fs
.
path
.
absolute
(
'.dart_tool'
,
'package_config.json'
),
packagesPath:
packagesPath
??
globals
.
fs
.
path
.
absolute
(
'.dart_tool'
,
'package_config.json'
),
nullSafetyMode:
nullSafetyMode
,
codeSizeDirectory:
codeSizeDirectory
,
androidGradleDaemon:
androidGradleDaemon
,
...
...
packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
View file @
db51c6d5
...
...
@@ -15,6 +15,7 @@ import 'package:flutter_tools/src/base/file_system.dart';
import
'package:flutter_tools/src/base/io.dart'
;
import
'package:flutter_tools/src/base/signals.dart'
;
import
'package:flutter_tools/src/base/time.dart'
;
import
'package:flutter_tools/src/build_info.dart'
;
import
'package:flutter_tools/src/cache.dart'
;
import
'package:flutter_tools/src/dart/pub.dart'
;
import
'package:flutter_tools/src/reporting/reporting.dart'
;
...
...
@@ -540,6 +541,12 @@ void main() {
FileSystem:
()
=>
MemoryFileSystem
.
test
(),
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
testUsingContext
(
'use packagesPath to generate BuildInfo'
,
()
async
{
final
DummyFlutterCommand
flutterCommand
=
DummyFlutterCommand
(
packagesPath:
'foo'
);
final
BuildInfo
buildInfo
=
await
flutterCommand
.
getBuildInfo
(
forcedBuildMode:
BuildMode
.
debug
);
expect
(
buildInfo
.
packagesPath
,
'foo'
);
});
});
}
...
...
packages/flutter_tools/test/general.shard/runner/utils.dart
View file @
db51c6d5
...
...
@@ -15,6 +15,7 @@ class DummyFlutterCommand extends FlutterCommand {
this
.
noUsagePath
=
false
,
this
.
name
=
'dummy'
,
this
.
commandFunction
,
this
.
packagesPath
,
});
final
bool
noUsagePath
;
...
...
@@ -36,4 +37,7 @@ class DummyFlutterCommand extends FlutterCommand {
Future
<
FlutterCommandResult
>
runCommand
()
async
{
return
commandFunction
==
null
?
FlutterCommandResult
.
fail
()
:
await
commandFunction
();
}
@override
final
String
packagesPath
;
}
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