Remove final references to grinder (#3473)

dart-lang · Jul 28, 2023 · e8d00c0 · e8d00c0
1 parent 1cf8870
commit e8d00c0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 101 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         sdk: [dev, stable]
-        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
+        job: [main, flutter, packages, sdk-docs]
         include:
           - os: macos-latest
             sdk: dev

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,4 @@
 name: dartdoc
-# Run `dart run grinder build` after updating.
 version: 7.0.0-dev
 description: A non-interactive HTML documentation generator for Dart source code.
 repository: https://github.com/dart-lang/dartdoc
@@ -27,7 +26,6 @@ dependencies:
 dev_dependencies:
   async: ^2.11.0
   dart_style: ^2.3.1
-  grinder: ^0.9.4
   http: ">=0.13.6 <2.0.0"
   js: ^0.6.7
   lints: ^2.1.0

diff --git a/tool/ci.sh b/tool/ci.sh
@@ -21,13 +21,9 @@ elif [ "$DARTDOC_BOT" = "flutter" ]; then
   dart run tool/task.dart doc flutter
 elif [ "$DARTDOC_BOT" = "packages" ]; then
   echo "Running packages dartdoc bot"
-  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
+  dart run tool/task.dart doc package --name=access --version=">=1.0.1+2"
   # 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 run grinder build-pub-package 2>&1 | grep "warning: package:flutter_plugin_tools has no documentable libraries"
-elif [ "$DARTDOC_BOT" = "sdk-analyzer" ]; then
-  echo "Running all tests against the SDK analyzer"
-  dart run grinder test-with-analyzer-sdk
+  dart run tool/task.dart doc package --name=flutter_plugin_tools --version=">=0.0.14+1" 2>&1 | grep "warning: package:flutter_plugin_tools has no documentable libraries"
 else
   echo "Running main dartdoc bot"
   dart run tool/task.dart buildbot

diff --git a/tool/grind.dart b/tool/grind.dart
diff --git a/tool/task.dart b/tool/task.dart
@@ -26,11 +26,14 @@ void main(List<String> args) async {
     ..addCommand('buildbot')
     ..addCommand('clean')
     ..addCommand('compare')
-    ..addCommand('doc')
     ..addCommand('serve')
     ..addCommand('test')
     ..addCommand('try-publish')
     ..addCommand('validate');
+  parser.addCommand('doc')
+    ..addOption('name')
+    ..addOption('version');
+
   var results = parser.parse(args);
   var commandResults = results.command;
   if (commandResults == null) {