diff --git a/.cirrus.yml b/.cirrus.yml index 4b72c2f09f..c7f84bba02 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -115,10 +115,10 @@ task: MEMORY: 10G SHOULD_UPDATE_PACKAGES: "FALSE" script: - - (cd packages/flutter_tools; dart __deprecated_pub get) - - (cd packages/flutter_tools/test/data/asset_test/main; dart __deprecated_pub get) - - (cd packages/flutter_tools/test/data/asset_test/font; dart __deprecated_pub get) - - (cd dev/bots; dart __deprecated_pub get) + - (cd packages/flutter_tools; dart pub get) + - (cd packages/flutter_tools/test/data/asset_test/main; dart pub get) + - (cd packages/flutter_tools/test/data/asset_test/font; dart pub get) + - (cd dev/bots; dart pub get) - dart --enable-asserts ./dev/bots/test.dart - name: tool_tests-commands-linux @@ -131,8 +131,8 @@ task: MEMORY: 10G SHOULD_UPDATE_PACKAGES: "FALSE" script: - - (cd packages/flutter_tools; dart __deprecated_pub get) - - (cd dev/bots; dart __deprecated_pub get) + - (cd packages/flutter_tools; dart pub get) + - (cd dev/bots; dart pub get) - dart --enable-asserts ./dev/bots/test.dart - name: docs-linux # linux-only diff --git a/bin/internal/shared.bat b/bin/internal/shared.bat index ae1b2296fe..ca372a4897 100644 --- a/bin/internal/shared.bat +++ b/bin/internal/shared.bat @@ -136,7 +136,6 @@ GOTO :after_subroutine REM Makes changes to PUB_ENVIRONMENT only visible to commands within SETLOCAL/ENDLOCAL SETLOCAL - SET VERBOSITY=--verbosity=error IF "%CI%" == "true" GOTO on_bot IF "%BOT%" == "true" GOTO on_bot IF "%CONTINUOUS_INTEGRATION%" == "true" GOTO on_bot @@ -144,8 +143,8 @@ GOTO :after_subroutine GOTO not_on_bot :on_bot SET PUB_ENVIRONMENT=%PUB_ENVIRONMENT%:flutter_bot - SET VERBOSITY=--verbosity=normal :not_on_bot + SET PUB_SUMMARY_ONLY=1 SET PUB_ENVIRONMENT=%PUB_ENVIRONMENT%:flutter_install IF "%PUB_CACHE%" == "" ( IF EXIST "%pub_cache_path%" SET PUB_CACHE=%pub_cache_path% @@ -155,7 +154,7 @@ GOTO :after_subroutine SET /A remaining_tries=%total_tries%-1 :retry_pub_upgrade ECHO Running pub upgrade... 1>&2 - "%dart%" __deprecated_pub upgrade "%VERBOSITY%" --no-precompile + "%dart%" --no-analytics pub upgrade IF "%ERRORLEVEL%" EQU "0" goto :upgrade_succeeded ECHO Error (%ERRORLEVEL%): Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left) 1>&2 timeout /t 5 /nobreak 2>NUL diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh index 4a4d6534e7..c509934d6f 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh @@ -21,7 +21,7 @@ function pub_upgrade_with_retry { local total_tries="10" local remaining_tries=$((total_tries - 1)) while [[ "$remaining_tries" -gt 0 ]]; do - (cd "$FLUTTER_TOOLS_DIR" && "$DART" __deprecated_pub upgrade "$VERBOSITY" --no-precompile) && break + (cd "$FLUTTER_TOOLS_DIR" && "$DART" --no-analytics pub upgrade) && break >&2 echo "Error: Unable to 'pub upgrade' flutter tool. Retrying in five seconds... ($remaining_tries tries left)" remaining_tries=$((remaining_tries - 1)) sleep 5 @@ -143,10 +143,10 @@ function upgrade_flutter () ( >&2 echo Building flutter tool... # Prepare packages... - VERBOSITY="--verbosity=error" if [[ "$CI" == "true" || "$BOT" == "true" || "$CONTINUOUS_INTEGRATION" == "true" || "$CHROME_HEADLESS" == "1" ]]; then PUB_ENVIRONMENT="$PUB_ENVIRONMENT:flutter_bot" - VERBOSITY="--verbosity=normal" + else + export PUB_SUMMARY_ONLY=1 fi export PUB_ENVIRONMENT="$PUB_ENVIRONMENT:flutter_install" if [[ -d "$FLUTTER_ROOT/.pub-cache" ]]; then diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart index 3bba942a3a..06d4000201 100644 --- a/packages/flutter_tools/lib/src/dart/pub.dart +++ b/packages/flutter_tools/lib/src/dart/pub.dart @@ -607,7 +607,7 @@ class _DefaultPub implements Pub { 'permissions for the current user.' ); } - return [sdkPath, '__deprecated_pub', ...arguments]; + return [sdkPath, '--no-analytics', 'pub', ...arguments]; } // Returns the environment value that should be used when running pub. diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart index 0a4a94cfcd..e07f1a5149 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart @@ -1950,14 +1950,14 @@ void main() { await runner.run(['create', '--pub', projectDir.path]); final RegExp dartCommand = RegExp(r'dart-sdk[\\/]bin[\\/]dart'); expect(loggingProcessManager.commands, contains(predicate( - (List c) => dartCommand.hasMatch(c[0]) && c[1].contains('pub') && !c.contains('--offline') + (List c) => dartCommand.hasMatch(c[0]) && c[2].contains('pub') && !c.contains('--offline') ))); // Run pub offline. loggingProcessManager.clear(); await runner.run(['create', '--pub', '--offline', projectDir.path]); expect(loggingProcessManager.commands, contains(predicate( - (List c) => dartCommand.hasMatch(c[0]) && c[1].contains('pub') && c.contains('--offline') + (List c) => dartCommand.hasMatch(c[0]) && c[2].contains('pub') && c.contains('--offline') ))); }, overrides: { diff --git a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart index 4bd4f811aa..6410c8c6f3 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart @@ -488,7 +488,7 @@ void main() { globals.fs.directory('/packages/flutter_tools').createSync(recursive: true); globals.fs.file('pubspec.yaml').createSync(); processManager.addCommand( - const FakeCommand(command: ['/bin/cache/dart-sdk/bin/dart', '__deprecated_pub', 'run', 'test']), + const FakeCommand(command: ['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', 'test']), ); await createTestCommandRunner(PackagesCommand()).run(['packages', 'test']); @@ -514,7 +514,7 @@ void main() { Cache.flutterRoot = ''; globals.fs.file('pubspec.yaml').createSync(); processManager.addCommand( - const FakeCommand(command: ['/bin/cache/dart-sdk/bin/dart', '__deprecated_pub', '--trace', 'run', 'test']), + const FakeCommand(command: ['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', '--trace', 'run', 'test']), ); await createTestCommandRunner(PackagesCommand()).run(['packages', 'test']); @@ -543,7 +543,7 @@ void main() { processManager.addCommand( FakeCommand( command: const [ - '/bin/cache/dart-sdk/bin/dart', '__deprecated_pub', 'run', '--foo', 'bar', + '/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', '--foo', 'bar', ], stdin: stdin, ), @@ -574,7 +574,7 @@ void main() { processManager.addCommand( FakeCommand( command: const [ - '/bin/cache/dart-sdk/bin/dart', '__deprecated_pub', 'token', 'list', + '/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'token', 'list', ], stdin: stdin, ), @@ -603,7 +603,7 @@ void main() { processManager.addCommand( FakeCommand( command: const [ - '/bin/cache/dart-sdk/bin/dart', '__deprecated_pub', 'upgrade', '-h', + '/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'upgrade', '-h', ], stdin: IOSink(StreamController>().sink), ), diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart index de36261149..fb42718ae0 100644 --- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart @@ -55,7 +55,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -105,7 +106,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -155,7 +157,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -272,7 +275,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -313,7 +317,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -353,7 +358,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ FakeCommand(command: const [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -393,7 +399,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -431,7 +438,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -472,7 +480,8 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand(command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -519,7 +528,8 @@ void main() { const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -543,7 +553,7 @@ void main() { ); const String toolExitMessage = ''' pub get failed -command: "bin/cache/dart-sdk/bin/dart __deprecated_pub --directory . get --example" +command: "bin/cache/dart-sdk/bin/dart --no-analytics pub --directory . get --example" pub env: { "FLUTTER_ROOT": "", "PUB_ENVIRONMENT": "flutter_cli:flutter_tests", @@ -582,7 +592,8 @@ exit code: 66 FakeCommand( command: const [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -592,7 +603,8 @@ exit code: 66 throw const ProcessException( 'bin/cache/dart-sdk/bin/dart', [ - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -649,7 +661,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -699,7 +712,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -769,7 +783,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -822,7 +837,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -957,7 +973,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -1002,7 +1019,8 @@ exit code: 66 FakeCommand( command: const [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -1016,7 +1034,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -1026,7 +1045,8 @@ exit code: 66 FakeCommand( command: const [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get', @@ -1040,7 +1060,8 @@ exit code: 66 const FakeCommand( command: [ 'bin/cache/dart-sdk/bin/dart', - '__deprecated_pub', + '--no-analytics', + 'pub', '--directory', '.', 'get',