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

Author: jcollins-g

.travis.yml

@@ -2,15 +2,16 @@ language: dart
 sudo: false
 dart:
   - "dev/raw/latest"
+  - stable
 env:
   - DARTDOC_BOT=main
   - DARTDOC_BOT=packages
   - DARTDOC_BOT=flutter
   - DARTDOC_BOT=sdk-docs
 script: ./tool/travis.sh
+
 branches:
-  only:
-    - master
+  only: [master]
 cache:
   directories:
   - $HOME/.pub-cache

CHANGELOG.md

@@ -1,7 +1,11 @@
+## 0.20.3
+* Update dependencies and fork mustache4dart into dartdoc so dartdoc can resolve
+  dependencies on Dart 2.0 stable.
+
 ## 0.20.2
 * Fix void problems (#1724)
-* Fix crash building Angular docs and problems involving special objects (#1728,
-  #1554)
+* Fix crash building Angular docs and problems involving special objects
+  (#1728, #1554)
 * Run pub upgrade to get packages ready for 69.2.
 
 ## 0.20.1

analysis_options.yaml

@@ -6,6 +6,7 @@ analyzer:
     - 'doc/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
+    - 'third_party/**'
     - 'testing/**'
     - 'testing/test_package_flutter_plugin/**'
 linter:

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.20.3-dev';
+const String dartdocVersion = '0.20.3';
 
 /// Helper class to initialize the default generators since they require
 /// GeneratorContext.

pubspec.lock

@@ -291,9 +291,9 @@ packages:
   mustache4dart:
     dependency: "direct main"
     description:
-      name: mustache4dart
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "third_party/pkg/mustache4dart"
+      relative: true
+    source: path
     version: "2.1.2"
   node_preamble:
     dependency: transitive
@@ -499,4 +499,4 @@ packages:
     source: hosted
     version: "2.1.15"
 sdks:
-  dart: ">=2.0.0-dev.68 <=2.0.0-dev.69.3"
+  dart: ">=2.0.0-dev.68 <3.0.0"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.20.3-dev
+version: 0.20.3
 author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
@@ -18,7 +18,10 @@ dependencies:
   http_parser: '>=3.0.3 <4.0.0'
   logging: ^0.11.3+1
   markdown: ^2.0.0
-  mustache4dart: ^2.1.2
+  # TODO(jcollins-g): return to using dependency when mustache4dart is
+  # supported on 2.0.
+  #mustache4dart: ^2.1.2
+  mustache4dart: {path: 'third_party/pkg/mustache4dart'}
   package_config: '>=0.1.5 <2.0.0'
   path: ^1.3.0
   pub_semver: ^1.3.7

test/compare_output_test.dart

@@ -83,7 +83,7 @@ void main() {
         '--example-path-prefix',
         'examples',
         '--exclude-packages',
-        'Dart,meta,tuple,quiver_hashcode',
+        'Dart,matcher,meta,path,stack_trace,tuple,quiver',
         '--hide-sdk-text',
         '--no-include-source',
         '--output',

test/dartdoc_test.dart

@@ -90,7 +90,7 @@ void main() {
       expect(
           useSomethingInAnotherPackage.modelType.linkedName,
           startsWith(
-              '<a href="https://pub.dartlang.org/documentation/tuple/1.0.1/tuple/Tuple2-class.html">Tuple2</a>'));
+              '<a href="https://pub.dartlang.org/documentation/tuple/1.0.2/tuple/Tuple2-class.html">Tuple2</a>'));
       RegExp stringLink = new RegExp(
           'https://api.dartlang.org/(dev|stable|edge|be)/${Platform.version.split(' ').first}/dart-core/String-class.html">String</a>');
       expect(useSomethingInAnotherPackage.modelType.linkedName,

test/model_test.dart

@@ -227,7 +227,7 @@ void main() {
       });
 
       test('multiple packages, sorted default', () {
-        expect(ginormousPackageGraph.localPackages, hasLength(6));
+        expect(ginormousPackageGraph.localPackages, hasLength(9));
         expect(ginormousPackageGraph.localPackages.first.name,
             equals('test_package'));
       });

testing/test_package/pubspec.yaml

@@ -4,6 +4,6 @@ description: Best package ever.
 version: 0.0.1
 dependencies:
   meta: ^1.0.0
-  tuple: 1.0.1
+  tuple: 1.0.2
   test_package_imported:
     path: "../test_package_imported"