Skip to content

Commit e9ac9c8

Browse files
authored
Use dart run instead of deprecated dart pub run (#3038)
1 parent aca373a commit e9ac9c8

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tool/ci.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ if [ "$DARTDOC_BOT" = "sdk-docs" ]; then
1818
# silence stdout but echo stderr
1919
echo ""
2020
echo "Building and validating SDK docs..."
21-
dart pub run grinder validate-sdk-docs
21+
dart run grinder validate-sdk-docs
2222
echo "SDK docs process finished"
2323
elif [ "$DARTDOC_BOT" = "flutter" ]; then
2424
echo "Running flutter dartdoc bot"
25-
dart pub run grinder validate-flutter-docs
25+
dart run grinder validate-flutter-docs
2626
elif [ "$DARTDOC_BOT" = "packages" ]; then
2727
echo "Running packages dartdoc bot"
28-
PACKAGE_NAME=angular PACKAGE_VERSION=">=7.0.0" DARTDOC_PARAMS="--include=angular" dart pub run grinder build-pub-package
29-
PACKAGE_NAME=access PACKAGE_VERSION=">=1.0.1+2" dart pub run grinder build-pub-package
28+
PACKAGE_NAME=angular PACKAGE_VERSION=">=7.0.0" DARTDOC_PARAMS="--include=angular" dart run grinder build-pub-package
29+
PACKAGE_NAME=access PACKAGE_VERSION=">=1.0.1+2" dart run grinder build-pub-package
3030
# Negative test for flutter_plugin_tools, make sure right error message is displayed.
31-
PACKAGE_NAME=flutter_plugin_tools PACKAGE_VERSION=">=0.0.14+1" dart pub run grinder build-pub-package 2>&1 | grep "warning: package:flutter_plugin_tools has no documentable libraries"
32-
PACKAGE_NAME=shelf_exception_handler PACKAGE_VERSION=">=0.2.0" dart pub run grinder build-pub-package
31+
PACKAGE_NAME=flutter_plugin_tools PACKAGE_VERSION=">=0.0.14+1" dart run grinder build-pub-package 2>&1 | grep "warning: package:flutter_plugin_tools has no documentable libraries"
32+
PACKAGE_NAME=shelf_exception_handler PACKAGE_VERSION=">=0.2.0" dart run grinder build-pub-package
3333
elif [ "$DARTDOC_BOT" = "sdk-analyzer" ]; then
3434
echo "Running all tests against the SDK analyzer"
3535
unset COVERAGE_TOKEN
36-
dart pub run grinder test-with-analyzer-sdk
36+
dart run grinder test-with-analyzer-sdk
3737
else
3838
echo "Running main dartdoc bot"
39-
dart pub run grinder buildbot
39+
dart run grinder buildbot
4040
fi

tool/grind.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ String _getPackageVersion() {
10121012
Future<void> build() async {
10131013
var launcher = SubprocessLauncher('build');
10141014
await launcher.runStreamed(Platform.resolvedExecutable,
1015-
['pub', 'run', 'build_runner', 'build', '--delete-conflicting-outputs']);
1015+
['run', 'build_runner', 'build', '--delete-conflicting-outputs']);
10161016

10171017
// TODO(jcollins-g): port to build system?
10181018
var version = _getPackageVersion();

0 commit comments

Comments
 (0)