diff --git a/script/tool/CHANGELOG.md b/script/tool/CHANGELOG.md index 35786f4a8b..7e950352fa 100644 --- a/script/tool/CHANGELOG.md +++ b/script/tool/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +- Switches from deprecated `flutter packages` alias to `flutter pub`. + ## 0.8.1 - Fixes an `analyze` regression in 0.8.0 with packages that have non-`example` diff --git a/script/tool/lib/src/analyze_command.dart b/script/tool/lib/src/analyze_command.dart index 824d766f4e..1cd85af076 100644 --- a/script/tool/lib/src/analyze_command.dart +++ b/script/tool/lib/src/analyze_command.dart @@ -103,7 +103,7 @@ class AnalyzeCommand extends PackageLoopingCommand { @override Future runForPackage(RepositoryPackage package) async { // Analysis runs over the package and all subpackages, so all of them need - // `flutter packages get` run before analyzing. `example` packages can be + // `flutter pub get` run before analyzing. `example` packages can be // skipped since 'flutter packages get' automatically runs `pub get` in // examples as part of handling the parent directory. final List packagesToGet = [ @@ -116,7 +116,7 @@ class AnalyzeCommand extends PackageLoopingCommand { .pubspecFile .existsSync()) { final int exitCode = await processRunner.runAndStream( - flutterCommand, ['packages', 'get'], + flutterCommand, ['pub', 'get'], workingDir: packageToGet.directory); if (exitCode != 0) { return PackageResult.fail(['Unable to get dependencies']); diff --git a/script/tool/test/analyze_command_test.dart b/script/tool/test/analyze_command_test.dart index 56f4ab9576..98fb9382a3 100644 --- a/script/tool/test/analyze_command_test.dart +++ b/script/tool/test/analyze_command_test.dart @@ -45,12 +45,10 @@ void main() { expect( processRunner.recordedCalls, orderedEquals([ - ProcessCall( - 'flutter', const ['packages', 'get'], plugin1Dir.path), + ProcessCall('flutter', const ['pub', 'get'], plugin1Dir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], plugin1Dir.path), - ProcessCall( - 'flutter', const ['packages', 'get'], plugin2Dir.path), + ProcessCall('flutter', const ['pub', 'get'], plugin2Dir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], plugin2Dir.path), ])); @@ -64,8 +62,7 @@ void main() { expect( processRunner.recordedCalls, orderedEquals([ - ProcessCall( - 'flutter', const ['packages', 'get'], plugin1Dir.path), + ProcessCall('flutter', const ['pub', 'get'], plugin1Dir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], plugin1Dir.path), ])); @@ -85,12 +82,12 @@ void main() { expect( processRunner.recordedCalls, orderedEquals([ - ProcessCall('flutter', const ['packages', 'get'], - mainPackageDir.path), ProcessCall( - 'flutter', const ['packages', 'get'], subpackage1.path), + 'flutter', const ['pub', 'get'], mainPackageDir.path), ProcessCall( - 'flutter', const ['packages', 'get'], subpackage2.path), + 'flutter', const ['pub', 'get'], subpackage1.path), + ProcessCall( + 'flutter', const ['pub', 'get'], subpackage2.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], mainPackageDir.path), ])); @@ -105,12 +102,10 @@ void main() { expect( processRunner.recordedCalls, orderedEquals([ - ProcessCall( - 'flutter', const ['packages', 'get'], plugin1Dir.path), + ProcessCall('flutter', const ['pub', 'get'], plugin1Dir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], plugin1Dir.path), - ProcessCall( - 'flutter', const ['packages', 'get'], plugin2Dir.path), + ProcessCall('flutter', const ['pub', 'get'], plugin2Dir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], plugin2Dir.path), ])); @@ -127,7 +122,7 @@ void main() { orderedEquals([ ProcessCall( 'flutter', - const ['packages', 'get'], + const ['pub', 'get'], pluginDir.path, ), ProcessCall( @@ -195,7 +190,7 @@ void main() { processRunner.recordedCalls, orderedEquals([ ProcessCall( - 'flutter', const ['packages', 'get'], pluginDir.path), + 'flutter', const ['pub', 'get'], pluginDir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], pluginDir.path), ])); @@ -214,7 +209,7 @@ void main() { processRunner.recordedCalls, orderedEquals([ ProcessCall( - 'flutter', const ['packages', 'get'], pluginDir.path), + 'flutter', const ['pub', 'get'], pluginDir.path), ProcessCall('dart', const ['analyze', '--fatal-infos'], pluginDir.path), ])); @@ -232,11 +227,11 @@ void main() { }); }); - test('fails if "packages get" fails', () async { + test('fails if "pub get" fails', () async { createFakePlugin('foo', packagesDir); processRunner.mockProcessesForExecutable['flutter'] = [ - MockProcess(exitCode: 1) // flutter packages get + MockProcess(exitCode: 1) // flutter pub get ]; Error? commandError; @@ -304,7 +299,7 @@ void main() { orderedEquals([ ProcessCall( 'flutter', - const ['packages', 'get'], + const ['pub', 'get'], pluginDir.path, ), ProcessCall( diff --git a/script/tool/test/build_examples_command_test.dart b/script/tool/test/build_examples_command_test.dart index 6d8f0b9d64..29a8790716 100644 --- a/script/tool/test/build_examples_command_test.dart +++ b/script/tool/test/build_examples_command_test.dart @@ -63,7 +63,7 @@ void main() { processRunner .mockProcessesForExecutable[getFlutterCommand(mockPlatform)] = [ - MockProcess(exitCode: 1) // flutter packages get + MockProcess(exitCode: 1) // flutter pub get ]; Error? commandError; @@ -92,7 +92,7 @@ void main() { processRunner .mockProcessesForExecutable[getFlutterCommand(mockPlatform)] = [ - MockProcess(exitCode: 1) // flutter packages get + MockProcess(exitCode: 1) // flutter pub get ]; Error? commandError;