commit e9ac9c84432ea06635e8b353070c34ed01e8dd73
author Sam Rawlins <srawlins@google.com> Tue May 17 12:43:02 2022 -0700
committer GitHub <noreply@github.com> Tue May 17 12:43:02 2022 -0700
tree 7e183a91c133db38734936f55edba3b89ce4c385
parent aca373a2d9c64ddb55c54d5c2241e2175effa582

Use dart run instead of deprecated dart pub run (#3038)

tool/ci.sh

diff --git a/tool/ci.sh b/tool/ci.sh
index 0d91351..001c71e 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -18,23 +18,23 @@
   # silence stdout but echo stderr
   echo ""
   echo "Building and validating SDK docs..."
-  dart pub run grinder validate-sdk-docs
+  dart run grinder validate-sdk-docs
   echo "SDK docs process finished"
 elif [ "$DARTDOC_BOT" = "flutter" ]; then
   echo "Running flutter dartdoc bot"
-  dart pub run grinder validate-flutter-docs
+  dart run grinder validate-flutter-docs
 elif [ "$DARTDOC_BOT" = "packages" ]; then
   echo "Running packages dartdoc bot"
-  PACKAGE_NAME=angular PACKAGE_VERSION=">=7.0.0" DARTDOC_PARAMS="--include=angular" dart pub run grinder build-pub-package
-  PACKAGE_NAME=access PACKAGE_VERSION=">=1.0.1+2" dart pub run grinder build-pub-package
+  PACKAGE_NAME=angular PACKAGE_VERSION=">=7.0.0" DARTDOC_PARAMS="--include=angular" dart run grinder build-pub-package
+  PACKAGE_NAME=access PACKAGE_VERSION=">=1.0.1+2" dart run grinder build-pub-package
   # Negative test for flutter_plugin_tools, make sure right error message is displayed.
-  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"
-  PACKAGE_NAME=shelf_exception_handler PACKAGE_VERSION=">=0.2.0" dart pub run grinder build-pub-package
+  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"
+  PACKAGE_NAME=shelf_exception_handler PACKAGE_VERSION=">=0.2.0" dart run grinder build-pub-package
 elif [ "$DARTDOC_BOT" = "sdk-analyzer" ]; then
   echo "Running all tests against the SDK analyzer"
   unset COVERAGE_TOKEN
-  dart pub run grinder test-with-analyzer-sdk
+  dart run grinder test-with-analyzer-sdk
 else
   echo "Running main dartdoc bot"
-  dart pub run grinder buildbot
+  dart run grinder buildbot
 fi

tool/grind.dart

diff --git a/tool/grind.dart b/tool/grind.dart
index ddc1ca6..7c26ad1 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -1012,7 +1012,7 @@
 Future<void> build() async {
   var launcher = SubprocessLauncher('build');
   await launcher.runStreamed(Platform.resolvedExecutable,
-      ['pub', 'run', 'build_runner', 'build', '--delete-conflicting-outputs']);
+      ['run', 'build_runner', 'build', '--delete-conflicting-outputs']);
 
   // TODO(jcollins-g): port to build system?
   var version = _getPackageVersion();