From 49ea510546ccce88bd61d1cd1d221a5233c45a69 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 26 Mar 2018 08:30:33 -0700 Subject: [PATCH 1/2] Revert "Pin bots to dev-40.0 (#1642)" This reverts commit b9087d6235423cd85024ff739534f4e2c78bb045. --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 697e1cec02..e61ecd38b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: dart sudo: false dart: - - "dev/raw/2.0.0-dev.40.0" + - "dev/raw/latest" env: - DARTDOC_BOT=main # TODO(devoncarew): add angulardart support diff --git a/appveyor.yml b/appveyor.yml index 1a86e24613..d4bd319f99 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ # BSD-style license that can be found in the LICENSE file. install: - - ps: wget https://storage.googleapis.com/dart-archive/channels/dev/raw/2.0.0-dev.40.0/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip + - ps: wget https://storage.googleapis.com/dart-archive/channels/dev/raw/latest/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip - cmd: echo "Unzipping dart-sdk..." - cmd: 7z x dart-sdk.zip -o"C:\tools" -y > nul - set PATH=%PATH%;C:\tools\dart-sdk\bin From 221bf31f6d09decc580cb3bf4d9e127c84113303 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 26 Mar 2018 08:50:46 -0700 Subject: [PATCH 2/2] Prepare for v0.18.0 --- CHANGELOG.md | 8 ++++++++ lib/dartdoc.dart | 2 +- pubspec.yaml | 2 +- testing/test_package_docs/index.html | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 140cf95f06..40f8add2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.18.0 +* Rename category_order flag to package_order. (#1634, #1636) +* Use Google's CDN for jquery. (#1637) +* Add the beginning of support for a dartdoc_options.yaml file. (#1638) +* Code cleanups and refactoring related to packages (#1639, #1636) +* Enable --preview-dart-2 in analyzer (#1630) +* Add basic categorization for libraries (#1641) + ## 0.17.1+1 * Fix pub warning regarding unnecessary meta import. diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart index bdacf91fd1..9ce398533d 100644 --- a/lib/dartdoc.dart +++ b/lib/dartdoc.dart @@ -36,7 +36,7 @@ export 'src/sdk.dart'; const String name = 'dartdoc'; // Update when pubspec version changes. -const String version = '0.17.1+1'; +const String version = '0.18.0'; final String defaultOutDir = pathLib.join('doc', 'api'); diff --git a/pubspec.yaml b/pubspec.yaml index 8e29392f57..c5215dccb7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dartdoc # Also update the `version` field in lib/dartdoc.dart. -version: 0.17.1+1 +version: 0.18.0 author: Dart Team description: A documentation generator for Dart. homepage: https://github.com/dart-lang/dartdoc diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index d9b6ac4601..c136a93fec 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs