Revert "Deprecate --resources-dir option. (dart-lang#3696)"

This reverts commit cec45fb.
srawlins · Jun 7, 2024 · 86fce5e · 86fce5e
1 parent 3decf1e
commit 86fce5e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 8.0.10-dev
+
+* Un-deprecate the `--resources-dir` option.
+
 ## 8.0.9
 
 * Deprecate the `missingCodeBlockLanguage` warning. This is replaced with the

diff --git a/dartdoc_options.yaml b/dartdoc_options.yaml
@@ -1,4 +1,4 @@
 dartdoc:
   linkToSource:
     root: '.'
-    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.0.9/%f%#L%l%'
+    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.0.10-dev/%f%#L%l%'
diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
@@ -1669,11 +1669,8 @@ List<DartdocOption> createDartdocOptions(
         help:
             'A list of package names to place first when grouping libraries in '
             'packages. Unmentioned packages are placed after these.'),
-    // Deprecated. Use of this option is reported.
-    // TODO(kallentu): Remove this option.
     DartdocOptionArgOnly<String?>('resourcesDir', null, resourceProvider,
-        help: "(deprecated) An absolute path to dartdoc's resources directory.",
-        hide: true),
+        help: "An absolute path to dartdoc's resources directory.", hide: true),
     DartdocOptionArgOnly<bool>('sdkDocs', false, resourceProvider,
         help: 'Generate ONLY the docs for the Dart SDK.'),
     DartdocOptionArgSynth<String?>('sdkDir',

diff --git a/lib/src/generator/generator_frontend.dart b/lib/src/generator/generator_frontend.dart
@@ -27,13 +27,6 @@ class GeneratorFrontEnd implements Generator {
             'longer be supported.',
       );
     }
-    if (_generatorBackend.options.resourcesDir != null) {
-      packageGraph?.defaultPackage.warn(
-        PackageWarning.deprecated,
-        message: "The '--resources-dir' option is deprecated, and will soon be "
-            'removed.',
-      );
-    }
 
     await _generatorBackend.generateAdditionalFiles();
 

diff --git a/lib/src/version.dart b/lib/src/version.dart
@@ -1 +1 @@
-const packageVersion = '8.0.9';
+const packageVersion = '8.0.10-dev';
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dartdoc
-version: 8.0.9
+version: 8.0.10-dev
 description: A non-interactive HTML documentation generator for Dart source code.
 repository: https://github.com/dart-lang/dartdoc