Unverified Commit 66ed64be authored by Sigurd Meldgaard's avatar Sigurd Meldgaard Committed by GitHub

Migrate .packages -> package_config.json (#99677)

parent 02b2c2cd
...@@ -36,7 +36,7 @@ class BuildInfo { ...@@ -36,7 +36,7 @@ class BuildInfo {
List<String>? dartExperiments, List<String>? dartExperiments,
required this.treeShakeIcons, required this.treeShakeIcons,
this.performanceMeasurementFile, 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.nullSafetyMode = NullSafetyMode.sound,
this.codeSizeDirectory, this.codeSizeDirectory,
this.androidGradleDaemon = true, this.androidGradleDaemon = true,
...@@ -67,10 +67,10 @@ class BuildInfo { ...@@ -67,10 +67,10 @@ class BuildInfo {
/// Mode-Flavor (e.g. Release-Paid). /// Mode-Flavor (e.g. Release-Paid).
final String? flavor; 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 /// 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 String packagesPath;
final List<String> fileSystemRoots; final List<String> fileSystemRoots;
......
...@@ -378,8 +378,7 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts { ...@@ -378,8 +378,7 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
collector = CoverageCollector( collector = CoverageCollector(
verbose: !machine, verbose: !machine,
libraryPredicate: (String libraryName) => libraryName.contains(projectName), libraryPredicate: (String libraryName) => libraryName.contains(projectName),
packagesPath: globals.fs.file(buildInfo.packagesPath) packagesPath: buildInfo.packagesPath
.parent.parent.childFile('.packages').path
); );
} }
......
...@@ -3001,8 +3001,9 @@ Future<void> _ensureFlutterToolsSnapshot() async { ...@@ -3001,8 +3001,9 @@ Future<void> _ensureFlutterToolsSnapshot() async {
'cache', 'cache',
'flutter_tools.snapshot', 'flutter_tools.snapshot',
)); ));
final String dotPackages = globals.fs.path.absolute(globals.fs.path.join( final String packageConfig = globals.fs.path.absolute(globals.fs.path.join(
'.packages', '.dart_tool',
'package_config.json'
)); ));
final File snapshotFile = globals.fs.file(flutterToolsSnapshotPath); final File snapshotFile = globals.fs.file(flutterToolsSnapshotPath);
...@@ -3012,7 +3013,7 @@ Future<void> _ensureFlutterToolsSnapshot() async { ...@@ -3012,7 +3013,7 @@ Future<void> _ensureFlutterToolsSnapshot() async {
final List<String> snapshotArgs = <String>[ final List<String> snapshotArgs = <String>[
'--snapshot=$flutterToolsSnapshotPath', '--snapshot=$flutterToolsSnapshotPath',
'--packages=$dotPackages', '--packages=$packageConfig',
flutterToolsPath, flutterToolsPath,
]; ];
final ProcessResult snapshotResult = await Process.run( final ProcessResult snapshotResult = await Process.run(
......
...@@ -106,8 +106,8 @@ void main() { ...@@ -106,8 +106,8 @@ void main() {
); );
} }
const List<String> pubOutput = <String>[ final List<String> pubOutput = <String>[
'.packages', globals.fs.path.join('.dart_tool', 'package_config.json'),
'pubspec.lock', 'pubspec.lock',
]; ];
......
...@@ -117,7 +117,7 @@ void main() { ...@@ -117,7 +117,7 @@ void main() {
extraFrontEndOptions: <String>['--enable-experiment=non-nullable', 'bar'], extraFrontEndOptions: <String>['--enable-experiment=non-nullable', 'bar'],
extraGenSnapshotOptions: <String>['--enable-experiment=non-nullable', 'fizz'], extraGenSnapshotOptions: <String>['--enable-experiment=non-nullable', 'fizz'],
bundleSkSLPath: 'foo/bar/baz.sksl.json', bundleSkSLPath: 'foo/bar/baz.sksl.json',
packagesPath: 'foo/.packages', packagesPath: 'foo/.dart_tool/package_config.json',
codeSizeDirectory: 'foo/code-size', codeSizeDirectory: 'foo/code-size',
fileSystemRoots: <String>['test5', 'test6'], fileSystemRoots: <String>['test5', 'test6'],
fileSystemScheme: 'scheme', fileSystemScheme: 'scheme',
...@@ -149,7 +149,7 @@ void main() { ...@@ -149,7 +149,7 @@ void main() {
extraFrontEndOptions: <String>['--enable-experiment=non-nullable', 'bar'], extraFrontEndOptions: <String>['--enable-experiment=non-nullable', 'bar'],
extraGenSnapshotOptions: <String>['--enable-experiment=non-nullable', 'fizz'], extraGenSnapshotOptions: <String>['--enable-experiment=non-nullable', 'fizz'],
bundleSkSLPath: 'foo/bar/baz.sksl.json', bundleSkSLPath: 'foo/bar/baz.sksl.json',
packagesPath: 'foo/.packages', packagesPath: 'foo/.dart_tool/package_config.json',
codeSizeDirectory: 'foo/code-size', codeSizeDirectory: 'foo/code-size',
// These values are ignored by toEnvironmentConfig // These values are ignored by toEnvironmentConfig
androidProjectArgs: <String>['foo=bar', 'fizz=bazz'] androidProjectArgs: <String>['foo=bar', 'fizz=bazz']
...@@ -164,7 +164,7 @@ void main() { ...@@ -164,7 +164,7 @@ void main() {
'EXTRA_FRONT_END_OPTIONS': '--enable-experiment=non-nullable,bar', 'EXTRA_FRONT_END_OPTIONS': '--enable-experiment=non-nullable,bar',
'EXTRA_GEN_SNAPSHOT_OPTIONS': '--enable-experiment=non-nullable,fizz', 'EXTRA_GEN_SNAPSHOT_OPTIONS': '--enable-experiment=non-nullable,fizz',
'BUNDLE_SKSL_PATH': 'foo/bar/baz.sksl.json', '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', 'CODE_SIZE_DIRECTORY': 'foo/code-size',
}); });
}); });
...@@ -179,7 +179,7 @@ void main() { ...@@ -179,7 +179,7 @@ void main() {
extraFrontEndOptions: <String>['--enable-experiment=non-nullable', 'bar'], extraFrontEndOptions: <String>['--enable-experiment=non-nullable', 'bar'],
extraGenSnapshotOptions: <String>['--enable-experiment=non-nullable', 'fizz'], extraGenSnapshotOptions: <String>['--enable-experiment=non-nullable', 'fizz'],
bundleSkSLPath: 'foo/bar/baz.sksl.json', bundleSkSLPath: 'foo/bar/baz.sksl.json',
packagesPath: 'foo/.packages', packagesPath: 'foo/.dart_tool/package_config.json',
codeSizeDirectory: 'foo/code-size', codeSizeDirectory: 'foo/code-size',
androidProjectArgs: <String>['foo=bar', 'fizz=bazz'] androidProjectArgs: <String>['foo=bar', 'fizz=bazz']
); );
......
...@@ -286,7 +286,6 @@ class TestFlutterTesterDevice extends FlutterTesterTestDevice { ...@@ -286,7 +286,6 @@ class TestFlutterTesterDevice extends FlutterTesterTestDevice {
BuildMode.debug, BuildMode.debug,
'', '',
treeShakeIcons: false, treeShakeIcons: false,
packagesPath: '.dart_tool/package_config.json',
), ),
hostVmServicePort: 1234, hostVmServicePort: 1234,
dartEntrypointArgs: dartEntrypointArgs, dartEntrypointArgs: dartEntrypointArgs,
......
...@@ -147,7 +147,7 @@ void main() { ...@@ -147,7 +147,7 @@ void main() {
'--run-forever', '--run-forever',
'--non-interactive', '--non-interactive',
'--enable-dart-profiling', '--enable-dart-profiling',
'--packages=.packages', '--packages=.dart_tool/package_config.json',
'--flutter-assets-dir=/.tmp_rand0/flutter_tester.rand0', '--flutter-assets-dir=/.tmp_rand0/flutter_tester.rand0',
'/.tmp_rand0/flutter_tester.rand0/flutter-tester-app.dill', '/.tmp_rand0/flutter_tester.rand0/flutter-tester-app.dill',
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment