diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a1a9c8650..71df667392 100644 --- 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 index 0e9fb7968c..66ebd86225 100644 --- 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 index dd7ad6c0ab..5b47f2c6cf 100644 --- a/lib/src/dartdoc_options.dart +++ b/lib/src/dartdoc_options.dart @@ -1669,11 +1669,8 @@ List 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('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('sdkDocs', false, resourceProvider, help: 'Generate ONLY the docs for the Dart SDK.'), DartdocOptionArgSynth('sdkDir', diff --git a/lib/src/generator/generator_frontend.dart b/lib/src/generator/generator_frontend.dart index 53d3a662d8..37143b2b7f 100644 --- 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 index 57ce5ec075..1834fdd686 100644 --- 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 index 16dc577ca3..ffd41acc3c 100644 --- 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