Skip to content

Commit 496c38f

Browse files
authored
Prepare for 0.20.3 and fork mustache4dart into Dartdoc (#1734)
* Fork mustache4dart into dartdoc * remove accidental submodule * Prepare for 0.20.3 and fork mustache4dart into Dartdoc for 2.0 stable * Fix up tests and tuple dependency in test package * Add sdk dependency * Use flutter repo's Dart when building flutter plugin docs
1 parent ac477e0 commit 496c38f

38 files changed

+2381
-20
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ language: dart
22
sudo: false
33
dart:
44
- "dev/raw/latest"
5+
- stable
56
env:
67
- DARTDOC_BOT=main
78
- DARTDOC_BOT=packages
89
- DARTDOC_BOT=flutter
910
- DARTDOC_BOT=sdk-docs
1011
script: ./tool/travis.sh
12+
1113
branches:
12-
only:
13-
- master
14+
only: [master]
1415
cache:
1516
directories:
1617
- $HOME/.pub-cache

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
## 0.20.3
2+
* Update dependencies and fork mustache4dart into dartdoc so dartdoc can resolve
3+
dependencies on Dart 2.0 stable.
4+
15
## 0.20.2
26
* Fix void problems (#1724)
3-
* Fix crash building Angular docs and problems involving special objects (#1728,
4-
#1554)
7+
* Fix crash building Angular docs and problems involving special objects
8+
(#1728, #1554)
59
* Run pub upgrade to get packages ready for 69.2.
610

711
## 0.20.1

analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ analyzer:
66
- 'doc/**'
77
- 'lib/templates/*.html'
88
- 'pub.dartlang.org/**'
9+
- 'third_party/**'
910
- 'testing/**'
1011
- 'testing/test_package_flutter_plugin/**'
1112
linter:

lib/dartdoc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export 'package:dartdoc/src/package_meta.dart';
3737

3838
const String name = 'dartdoc';
3939
// Update when pubspec version changes.
40-
const String dartdocVersion = '0.20.3-dev';
40+
const String dartdocVersion = '0.20.3';
4141

4242
/// Helper class to initialize the default generators since they require
4343
/// GeneratorContext.

pubspec.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,9 @@ packages:
291291
mustache4dart:
292292
dependency: "direct main"
293293
description:
294-
name: mustache4dart
295-
url: "https://pub.dartlang.org"
296-
source: hosted
294+
path: "third_party/pkg/mustache4dart"
295+
relative: true
296+
source: path
297297
version: "2.1.2"
298298
node_preamble:
299299
dependency: transitive
@@ -499,4 +499,4 @@ packages:
499499
source: hosted
500500
version: "2.1.15"
501501
sdks:
502-
dart: ">=2.0.0-dev.68 <=2.0.0-dev.69.3"
502+
dart: ">=2.0.0-dev.68 <3.0.0"

pubspec.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dartdoc
22
# Also update the `version` field in lib/dartdoc.dart.
3-
version: 0.20.3-dev
3+
version: 0.20.3
44
author: Dart Team <[email protected]>
55
description: A documentation generator for Dart.
66
homepage: https://github.com/dart-lang/dartdoc
@@ -18,7 +18,10 @@ dependencies:
1818
http_parser: '>=3.0.3 <4.0.0'
1919
logging: ^0.11.3+1
2020
markdown: ^2.0.0
21-
mustache4dart: ^2.1.2
21+
# TODO(jcollins-g): return to using dependency when mustache4dart is
22+
# supported on 2.0.
23+
#mustache4dart: ^2.1.2
24+
mustache4dart: {path: 'third_party/pkg/mustache4dart'}
2225
package_config: '>=0.1.5 <2.0.0'
2326
path: ^1.3.0
2427
pub_semver: ^1.3.7

test/compare_output_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void main() {
8383
'--example-path-prefix',
8484
'examples',
8585
'--exclude-packages',
86-
'Dart,meta,tuple,quiver_hashcode',
86+
'Dart,matcher,meta,path,stack_trace,tuple,quiver',
8787
'--hide-sdk-text',
8888
'--no-include-source',
8989
'--output',

test/dartdoc_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void main() {
9090
expect(
9191
useSomethingInAnotherPackage.modelType.linkedName,
9292
startsWith(
93-
'<a href="https://pub.dartlang.org/documentation/tuple/1.0.1/tuple/Tuple2-class.html">Tuple2</a>'));
93+
'<a href="https://pub.dartlang.org/documentation/tuple/1.0.2/tuple/Tuple2-class.html">Tuple2</a>'));
9494
RegExp stringLink = new RegExp(
9595
'https://api.dartlang.org/(dev|stable|edge|be)/${Platform.version.split(' ').first}/dart-core/String-class.html">String</a>');
9696
expect(useSomethingInAnotherPackage.modelType.linkedName,

test/model_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void main() {
227227
});
228228

229229
test('multiple packages, sorted default', () {
230-
expect(ginormousPackageGraph.localPackages, hasLength(6));
230+
expect(ginormousPackageGraph.localPackages, hasLength(9));
231231
expect(ginormousPackageGraph.localPackages.first.name,
232232
equals('test_package'));
233233
});

testing/test_package/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: Best package ever.
44
version: 0.0.1
55
dependencies:
66
meta: ^1.0.0
7-
tuple: 1.0.1
7+
tuple: 1.0.2
88
test_package_imported:
99
path: "../test_package_imported"

0 commit comments

Comments
 (0)