From 564914cfe64bbb0fd8a82d9ab277f80ba879e77d Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 21 May 2018 10:47:05 -0700 Subject: [PATCH 1/2] Prepare for 0.19.1. --- CHANGELOG.md | 4 ++++ lib/dartdoc.dart | 2 +- pubspec.lock | 21 +++++++-------------- pubspec.yaml | 6 +++--- test/dartdoc_test.dart | 1 - testing/test_package_docs/index.html | 2 +- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3771d56bb2..deb56188ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ ## 0.19.1 * Update `package:markdown` to `2.0.0`, which includes many improvements – especially to the parsing of links. +* Update analyzer to 0.32.0. +* Fix bug where --version didn't do anything (#1692) +* Switch dartdoc_test to an integration test and add basic Dart 2.0 + integration tests ## 0.19.0 * Build documentation through the Package object (#1659) diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart index df2e0bac74..eeaf600fe5 100644 --- a/lib/dartdoc.dart +++ b/lib/dartdoc.dart @@ -37,7 +37,7 @@ export 'package:dartdoc/src/package_meta.dart'; const String name = 'dartdoc'; // Update when pubspec version changes. -const String dartdocVersion = '0.19.1-dev'; +const String dartdocVersion = '0.19.1'; /// Helper class to initialize the default generators since they require /// GeneratorContext. diff --git a/pubspec.lock b/pubspec.lock index 9f4ceba74a..b55d0148fb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.31.2-alpha.2" + version: "0.32.0" args: dependency: "direct main" description: @@ -22,13 +22,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.6" - barback: - dependency: transitive - description: - name: barback - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.2+14" boolean_selector: dependency: transitive description: @@ -91,7 +84,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.0-alpha.12" + version: "0.1.0" glob: dependency: transitive description: @@ -154,7 +147,7 @@ packages: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.0-alpha.12" + version: "0.3.0" logging: dependency: "direct main" description: @@ -175,14 +168,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.1+4" + version: "0.12.2+1" meta: dependency: "direct dev" description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.5" mime: dependency: transitive description: @@ -357,7 +350,7 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "0.12.32+1" + version: "0.12.38+1" tuple: dependency: "direct main" description: @@ -401,4 +394,4 @@ packages: source: hosted version: "2.1.13" sdks: - dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.55.0" + dart: ">=2.0.0-dev.54.0 <=2.0.0-dev.55.0" diff --git a/pubspec.yaml b/pubspec.yaml index ecbab4fcbb..5f698fe161 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,16 +1,16 @@ name: dartdoc # Also update the `version` field in lib/dartdoc.dart. -version: 0.19.1-dev +version: 0.19.1 author: Dart Team description: A documentation generator for Dart. homepage: https://github.com/dart-lang/dartdoc environment: sdk: '>=2.0.0-dev.54.0 <3.0.0' dependencies: - analyzer: '0.31.2-alpha.2' + analyzer: 0.32.0 args: '>=0.13.0 <2.0.0' collection: ^1.2.0 - front_end: ^0.1.0-alpha.12 + front_end: ^0.1.0 html: '>=0.12.1 <0.14.0' # We don't use http_parser directly; this dep exists to ensure that we get at # least version 3.0.3 to work around an issue with 3.0.2. diff --git a/test/dartdoc_test.dart b/test/dartdoc_test.dart index f03f0a676e..fb8810e342 100644 --- a/test/dartdoc_test.dart +++ b/test/dartdoc_test.dart @@ -60,7 +60,6 @@ void main() { contains(stringLink)); }); - test('generate docs for ${pathLib.basename(testPackageDir.path)} works', () async { Dartdoc dartdoc = await Dartdoc.withDefaultGenerators( diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index 21500f6c7d..3dea99d47b 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs From 3fcd637400c3553a8e7ae0a022b97f12df83a327 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 22 May 2018 08:44:14 -0700 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index deb56188ba..86ffc1bdb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ ## 0.19.1 * Update `package:markdown` to `2.0.0`, which includes many improvements – especially to the parsing of links. -* Update analyzer to 0.32.0. -* Fix bug where --version didn't do anything (#1692) +* Update analyzer to 0.32.0, mustache4dart to 2.1.2, and grinder for 0.8.2 for Dart 2 fixes. +* Fix bug where --version printed help instead of the version number. (#1692) * Switch dartdoc_test to an integration test and add basic Dart 2.0 - integration tests + integration tests. +* Do not crash on unversioned packages (#1688). ## 0.19.0 * Build documentation through the Package object (#1659)