Skip to content

Commit 8bf6b3e

Browse files
committed
merge
2 parents 5bc590f + 98d03ad commit 8bf6b3e

File tree

112 files changed

+3838
-32854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+3838
-32854
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ lib/resources/docs.dart.js.map merge=theirs
1515
lib/resources/styles.css merge=theirs
1616
lib/src/generator/templates.aot_renderers_for_html.dart merge=theirs
1717
lib/src/generator/templates.aot_renderers_for_md.dart merge=theirs
18-
lib/src/generator/templates.runtime_renderers.dart merge=theirs
1918
web/sig.txt merge=theirs

.github/workflows/scorecards-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout code"
24-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
24+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2525
with:
2626
persist-credentials: false
2727

2828
- name: "Run analysis"
29-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde
29+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a
3030
with:
3131
results_file: results.sarif
3232
results_format: sarif
@@ -49,6 +49,6 @@ jobs:
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b
52+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93
5353
with:
5454
sarif_file: results.sarif

.github/workflows/test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ubuntu-latest]
25-
sdk: [3.8.0, dev]
25+
sdk: [3.9.0, dev]
2626
job: [main, flutter, packages, sdk-docs]
2727
include:
2828
- os: macos-latest
@@ -46,7 +46,7 @@ jobs:
4646
run: echo "name=today::$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
4747
shell: bash
4848
- name: Cache clean flutter
49-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
49+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
5050
if: matrix.job == 'flutter'
5151
env:
5252
# Increment version to invalidate bad/obsolete caches.
@@ -55,7 +55,7 @@ jobs:
5555
path: ~/.dartdoc_grinder
5656
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ steps.date.outputs.today }}
5757
- name: Cache .pub-cache
58-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
58+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
5959
if: matrix.job == 'flutter'
6060
env:
6161
# Increment version to invalidate bad/obsolete caches.
@@ -66,7 +66,7 @@ jobs:
6666
- name: Configure git
6767
if: runner.os == 'Windows'
6868
run: git config --global core.autocrlf input
69-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
69+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
7070
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
7171
with:
7272
sdk: ${{ matrix.sdk }}

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
## 9.0.0-wip
1+
## 9.0.0
22
* Remove the deprecated `missingCodeBlockLanguage` warning.
33
* Remove the deprecated `templates-dir` option.
44
* Remove the deprecated `nodoc` option.
55
* Remove the deprecated `include-external` option.
66
* Refactor 404 error page to use div instead of p for search form.
7+
* Require analyzer 8.1.1 APIs.
8+
* Many internal migrations for analyzer APIs.
79

810
## 8.3.4
911
* The URL for category pages now uses _category name_ instead of

bin/dartdoc.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,5 @@ void main(List<String> arguments) {
2020
final packageConfigProvider = PhysicalPackageConfigProvider();
2121
final packageBuilder =
2222
PubPackageBuilder(config, pubPackageMetaProvider, packageConfigProvider);
23-
final dartdoc = config.generateDocs
24-
? Dartdoc.fromContext(config, packageBuilder)
25-
: Dartdoc.withEmptyGenerator(config, packageBuilder);
26-
dartdoc.executeGuarded();
23+
Dartdoc.fromContext(config, packageBuilder).executeGuarded();
2724
}

dartdoc_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dartdoc:
22
linkToSource:
33
root: '.'
4-
uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v9.0.0-wip/%f%#L%l%'
4+
uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v9.0.0/%f%#L%l%'

lib/dartdoc.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
/// A documentation generator for Dart.
6-
@Deprecated('Will be removed in a later version of DartDoc.')
76
library;
87

98
export 'package:dartdoc/src/dartdoc.dart';

lib/options.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
@Deprecated(
6-
'Will be removed in a later version of DartDoc. Use /src/dartdoc_options.dart.')
75
export 'package:dartdoc/src/dartdoc_options.dart';

0 commit comments

Comments
 (0)