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
66ed64be
Unverified
Commit
66ed64be
authored
Mar 30, 2022
by
Sigurd Meldgaard
Committed by
GitHub
Mar 30, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate .packages -> package_config.json (#99677)
parent
02b2c2cd
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
16 deletions
+15
-16
build_info.dart
packages/flutter_tools/lib/src/build_info.dart
+3
-3
test.dart
packages/flutter_tools/lib/src/commands/test.dart
+1
-2
create_test.dart
...tter_tools/test/commands.shard/permeable/create_test.dart
+4
-3
packages_test.dart
...er_tools/test/commands.shard/permeable/packages_test.dart
+2
-2
build_info_test.dart
...ges/flutter_tools/test/general.shard/build_info_test.dart
+4
-4
flutter_tester_device_test.dart
..._tools/test/general.shard/flutter_tester_device_test.dart
+0
-1
flutter_tester_test.dart
..._tools/test/general.shard/tester/flutter_tester_test.dart
+1
-1
No files found.
packages/flutter_tools/lib/src/build_info.dart
View file @
66ed64be
...
...
@@ -36,7 +36,7 @@ class BuildInfo {
List
<
String
>?
dartExperiments
,
required
this
.
treeShakeIcons
,
this
.
performanceMeasurementFile
,
this
.
packagesPath
=
'.
packages
'
,
// TODO(zanderso): make this required and remove the default.
this
.
packagesPath
=
'.
dart_tool/package_config.json
'
,
// TODO(zanderso): make this required and remove the default.
this
.
nullSafetyMode
=
NullSafetyMode
.
sound
,
this
.
codeSizeDirectory
,
this
.
androidGradleDaemon
=
true
,
...
...
@@ -67,10 +67,10 @@ class BuildInfo {
/// Mode-Flavor (e.g. Release-Paid).
final
String
?
flavor
;
/// The path to the
.packages
file to use for compilation.
/// The path to the
package configuration
file to use for compilation.
///
/// This is used by package:package_config to locate the actual package_config.json
/// file. If not provided, defaults to `.packages`.
/// file. If not provided, defaults to `.
dart_tool/
packages`.
final
String
packagesPath
;
final
List
<
String
>
fileSystemRoots
;
...
...
packages/flutter_tools/lib/src/commands/test.dart
View file @
66ed64be
...
...
@@ -378,8 +378,7 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
collector
=
CoverageCollector
(
verbose:
!
machine
,
libraryPredicate:
(
String
libraryName
)
=>
libraryName
.
contains
(
projectName
),
packagesPath:
globals
.
fs
.
file
(
buildInfo
.
packagesPath
)
.
parent
.
parent
.
childFile
(
'.packages'
).
path
packagesPath:
buildInfo
.
packagesPath
);
}
...
...
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View file @
66ed64be
...
...
@@ -3001,8 +3001,9 @@ Future<void> _ensureFlutterToolsSnapshot() async {
'cache'
,
'flutter_tools.snapshot'
,
));
final
String
dotPackages
=
globals
.
fs
.
path
.
absolute
(
globals
.
fs
.
path
.
join
(
'.packages'
,
final
String
packageConfig
=
globals
.
fs
.
path
.
absolute
(
globals
.
fs
.
path
.
join
(
'.dart_tool'
,
'package_config.json'
));
final
File
snapshotFile
=
globals
.
fs
.
file
(
flutterToolsSnapshotPath
);
...
...
@@ -3012,7 +3013,7 @@ Future<void> _ensureFlutterToolsSnapshot() async {
final
List
<
String
>
snapshotArgs
=
<
String
>[
'--snapshot=
$flutterToolsSnapshotPath
'
,
'--packages=
$
dotPackages
'
,
'--packages=
$
packageConfig
'
,
flutterToolsPath
,
];
final
ProcessResult
snapshotResult
=
await
Process
.
run
(
...
...
packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
View file @
66ed64be
...
...
@@ -106,8 +106,8 @@ void main() {
);
}
const
List
<
String
>
pubOutput
=
<
String
>[
'.packages'
,
final
List
<
String
>
pubOutput
=
<
String
>[
globals
.
fs
.
path
.
join
(
'.dart_tool'
,
'package_config.json'
)
,
'pubspec.lock'
,
];
...
...
packages/flutter_tools/test/general.shard/build_info_test.dart
View file @
66ed64be
...
...
@@ -117,7 +117,7 @@ void main() {
extraFrontEndOptions:
<
String
>[
'--enable-experiment=non-nullable'
,
'bar'
],
extraGenSnapshotOptions:
<
String
>[
'--enable-experiment=non-nullable'
,
'fizz'
],
bundleSkSLPath:
'foo/bar/baz.sksl.json'
,
packagesPath:
'foo/.
packages
'
,
packagesPath:
'foo/.
dart_tool/package_config.json
'
,
codeSizeDirectory:
'foo/code-size'
,
fileSystemRoots:
<
String
>[
'test5'
,
'test6'
],
fileSystemScheme:
'scheme'
,
...
...
@@ -149,7 +149,7 @@ void main() {
extraFrontEndOptions:
<
String
>[
'--enable-experiment=non-nullable'
,
'bar'
],
extraGenSnapshotOptions:
<
String
>[
'--enable-experiment=non-nullable'
,
'fizz'
],
bundleSkSLPath:
'foo/bar/baz.sksl.json'
,
packagesPath:
'foo/.
packages
'
,
packagesPath:
'foo/.
dart_tool/package_config.json
'
,
codeSizeDirectory:
'foo/code-size'
,
// These values are ignored by toEnvironmentConfig
androidProjectArgs:
<
String
>[
'foo=bar'
,
'fizz=bazz'
]
...
...
@@ -164,7 +164,7 @@ void main() {
'EXTRA_FRONT_END_OPTIONS'
:
'--enable-experiment=non-nullable,bar'
,
'EXTRA_GEN_SNAPSHOT_OPTIONS'
:
'--enable-experiment=non-nullable,fizz'
,
'BUNDLE_SKSL_PATH'
:
'foo/bar/baz.sksl.json'
,
'PACKAGE_CONFIG'
:
'foo/.
packages
'
,
'PACKAGE_CONFIG'
:
'foo/.
dart_tool/package_config.json
'
,
'CODE_SIZE_DIRECTORY'
:
'foo/code-size'
,
});
});
...
...
@@ -179,7 +179,7 @@ void main() {
extraFrontEndOptions:
<
String
>[
'--enable-experiment=non-nullable'
,
'bar'
],
extraGenSnapshotOptions:
<
String
>[
'--enable-experiment=non-nullable'
,
'fizz'
],
bundleSkSLPath:
'foo/bar/baz.sksl.json'
,
packagesPath:
'foo/.
packages
'
,
packagesPath:
'foo/.
dart_tool/package_config.json
'
,
codeSizeDirectory:
'foo/code-size'
,
androidProjectArgs:
<
String
>[
'foo=bar'
,
'fizz=bazz'
]
);
...
...
packages/flutter_tools/test/general.shard/flutter_tester_device_test.dart
View file @
66ed64be
...
...
@@ -286,7 +286,6 @@ class TestFlutterTesterDevice extends FlutterTesterTestDevice {
BuildMode
.
debug
,
''
,
treeShakeIcons:
false
,
packagesPath:
'.dart_tool/package_config.json'
,
),
hostVmServicePort:
1234
,
dartEntrypointArgs:
dartEntrypointArgs
,
...
...
packages/flutter_tools/test/general.shard/tester/flutter_tester_test.dart
View file @
66ed64be
...
...
@@ -147,7 +147,7 @@ void main() {
'--run-forever'
,
'--non-interactive'
,
'--enable-dart-profiling'
,
'--packages=.
packages
'
,
'--packages=.
dart_tool/package_config.json
'
,
'--flutter-assets-dir=/.tmp_rand0/flutter_tester.rand0'
,
'/.tmp_rand0/flutter_tester.rand0/flutter-tester-app.dill'
,
],
...
...
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