From 47a38eb7fdf7a2e43d6844613a5975c343c27de7 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 25 Sep 2018 09:33:32 +0200 Subject: [PATCH 1/2] Upgrade customization tests --- .../dartdoc/golden/pana_0.12.2_index.html | 6 ++--- .../dartdoc/golden/pana_0.12.2_index.out.html | 6 ++--- .../pana_0.12.2_license_file_class.html | 26 +++++++++---------- .../pana_0.12.2_license_file_class.out.html | 26 +++++++++---------- .../golden/pana_0.12.2_pretty_json.html | 2 +- .../golden/pana_0.12.2_pretty_json.out.html | 2 +- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/test/dartdoc/golden/pana_0.12.2_index.html b/app/test/dartdoc/golden/pana_0.12.2_index.html index 7594019e81..1ab782923f 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_index.html +++ b/app/test/dartdoc/golden/pana_0.12.2_index.html @@ -4,7 +4,7 @@ - + pana - Dart API docs @@ -76,12 +76,12 @@

Usage

Libraries

- models + models
- pana + pana
diff --git a/app/test/dartdoc/golden/pana_0.12.2_index.out.html b/app/test/dartdoc/golden/pana_0.12.2_index.out.html index 76adbe4f95..1f0952db8e 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_index.out.html +++ b/app/test/dartdoc/golden/pana_0.12.2_index.out.html @@ -11,7 +11,7 @@ - + pana - Dart API docs @@ -87,12 +87,12 @@

Usage

Libraries

- models + models
- pana + pana
diff --git a/app/test/dartdoc/golden/pana_0.12.2_license_file_class.html b/app/test/dartdoc/golden/pana_0.12.2_license_file_class.html index 77730647a2..5f0a9a3b08 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_license_file_class.html +++ b/app/test/dartdoc/golden/pana_0.12.2_license_file_class.html @@ -125,7 +125,7 @@
pana library
-

LicenseFile class

+

LicenseFile class

@@ -167,7 +167,7 @@

Properties

hashCode - → int + → int
The hash code for this object. [...] @@ -175,7 +175,7 @@

Properties

name - → String + → String
@@ -183,7 +183,7 @@

Properties

path - → String + → String
@@ -191,7 +191,7 @@

Properties

shortFormatted - → String + → String
@@ -199,7 +199,7 @@

Properties

url - → String + → String
@@ -207,7 +207,7 @@

Properties

version - → String + → String
@@ -215,7 +215,7 @@

Properties

runtimeType - → Type + → Type
A representation of the runtime type of the object. @@ -231,7 +231,7 @@

Methods

change({String url }) → LicenseFile - +
@@ -240,7 +240,7 @@

Methods

toString() → String - +
Returns a string representation of this object. @@ -249,7 +249,7 @@

Methods

noSuchMethod(Invocation invocation) → dynamic - +
Invoked when a non-existent method or property is accessed. [...]
inherited
@@ -258,7 +258,7 @@

Methods

toJson() → Map<String, dynamic> - +
inherited
@@ -273,7 +273,7 @@

Operators

operator ==(Object other) → bool - +
The equality operator. [...] diff --git a/app/test/dartdoc/golden/pana_0.12.2_license_file_class.out.html b/app/test/dartdoc/golden/pana_0.12.2_license_file_class.out.html index 1f4553f0fc..f06f6e18fd 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_license_file_class.out.html +++ b/app/test/dartdoc/golden/pana_0.12.2_license_file_class.out.html @@ -135,7 +135,7 @@
pana library
-

LicenseFile class

+

LicenseFile class

@@ -177,7 +177,7 @@

Properties

hashCode - → int + → int
The hash code for this object. [...] @@ -185,7 +185,7 @@

Properties

name - → String + → String
@@ -193,7 +193,7 @@

Properties

path - → String + → String
@@ -201,7 +201,7 @@

Properties

shortFormatted - → String + → String
@@ -209,7 +209,7 @@

Properties

url - → String + → String
@@ -217,7 +217,7 @@

Properties

version - → String + → String
@@ -225,7 +225,7 @@

Properties

runtimeType - → Type + → Type
A representation of the runtime type of the object. @@ -241,7 +241,7 @@

Methods

change({String url }) → LicenseFile - +
@@ -250,7 +250,7 @@

Methods

toString() → String - +
Returns a string representation of this object. @@ -259,7 +259,7 @@

Methods

noSuchMethod(Invocation invocation) → dynamic - +
Invoked when a non-existent method or property is accessed. [...]
inherited
@@ -268,7 +268,7 @@

Methods

toJson() → Map<String, dynamic> - +
inherited
@@ -283,7 +283,7 @@

Operators

operator ==(Object other) → bool - +
The equality operator. [...] diff --git a/app/test/dartdoc/golden/pana_0.12.2_pretty_json.html b/app/test/dartdoc/golden/pana_0.12.2_pretty_json.html index 48e500eb2c..0bfb32d383 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_pretty_json.html +++ b/app/test/dartdoc/golden/pana_0.12.2_pretty_json.html @@ -125,7 +125,7 @@
pana library
-

prettyJson function

+

prettyJson function

String diff --git a/app/test/dartdoc/golden/pana_0.12.2_pretty_json.out.html b/app/test/dartdoc/golden/pana_0.12.2_pretty_json.out.html index 1197f484ec..0c2993ba0b 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_pretty_json.out.html +++ b/app/test/dartdoc/golden/pana_0.12.2_pretty_json.out.html @@ -135,7 +135,7 @@
pana library
-

prettyJson function

+

prettyJson function

String From 0ff9ddb06aacedb2e355ecd6b718fbd051ab4938 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 25 Sep 2018 09:39:26 +0200 Subject: [PATCH 2/2] Upgrade dartdoc to 0.21.1 --- app/lib/shared/versions.dart | 4 ++-- app/test/shared/versions_test.dart | 2 +- pkg/pub_dartdoc/pubspec.lock | 2 +- pkg/pub_dartdoc/pubspec.yaml | 2 +- pkg/pub_dartdoc/test/self_documenting_test.dart | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart index 1db9751917..7f5b8ded9e 100644 --- a/app/lib/shared/versions.dart +++ b/app/lib/shared/versions.dart @@ -16,7 +16,7 @@ final RegExp runtimeVersionPattern = new RegExp(r'\d{4}\.\d{2}\.\d{2}'); /// Increment the version when a change is significant enough to trigger /// reprocessing, including: version change in pana, dartdoc, or the SDKs, /// or when an feature or bugfix should be picked up by the analysis ASAP. -final String runtimeVersion = '2018.09.17'; +final String runtimeVersion = '2018.09.25'; final Version semanticRuntimeVersion = new Version.parse(runtimeVersion); /// The version which marks the earliest version of the data which we'd like to @@ -41,7 +41,7 @@ final Version semanticPanaVersion = new Version.parse(panaVersion); final String flutterVersion = '0.8.4'; final Version semanticFlutterVersion = new Version.parse(flutterVersion); -final String dartdocVersion = '0.20.4'; +final String dartdocVersion = '0.21.1'; final Version semanticDartdocVersion = new Version.parse(dartdocVersion); /// The version of our customization going into the output of the dartdoc static diff --git a/app/test/shared/versions_test.dart b/app/test/shared/versions_test.dart index 3c4e8ec0ca..e6c577fcd7 100644 --- a/app/test/shared/versions_test.dart +++ b/app/test/shared/versions_test.dart @@ -31,7 +31,7 @@ void main() { // This test is a reminder that if pana, the SDK or any of the above // versions change, we should also adjust the [runtimeVersion]. Before // updating the hash value, double-check if it is being updated. - expect(hash, 643525684); + expect(hash, 575265127); }); test('runtime version should be (somewhat) lexicographically ordered', () { diff --git a/pkg/pub_dartdoc/pubspec.lock b/pkg/pub_dartdoc/pubspec.lock index 7f6f796689..941b886434 100644 --- a/pkg/pub_dartdoc/pubspec.lock +++ b/pkg/pub_dartdoc/pubspec.lock @@ -140,7 +140,7 @@ packages: name: dartdoc url: "https://pub.dartlang.org" source: hosted - version: "0.20.4" + version: "0.21.1" fixnum: dependency: transitive description: diff --git a/pkg/pub_dartdoc/pubspec.yaml b/pkg/pub_dartdoc/pubspec.yaml index 2650bfdb86..ee5693d89a 100644 --- a/pkg/pub_dartdoc/pubspec.yaml +++ b/pkg/pub_dartdoc/pubspec.yaml @@ -9,7 +9,7 @@ dependencies: meta: ^1.1.5 path: ^1.6.0 # dartdoc version to be pinned - dartdoc: 0.20.4 + dartdoc: 0.21.1 dev_dependencies: build_runner: '^0.10.0' diff --git a/pkg/pub_dartdoc/test/self_documenting_test.dart b/pkg/pub_dartdoc/test/self_documenting_test.dart index 112dbe2d2a..1c1c9b1a9a 100644 --- a/pkg/pub_dartdoc/test/self_documenting_test.dart +++ b/pkg/pub_dartdoc/test/self_documenting_test.dart @@ -43,6 +43,7 @@ main() { files.sort(); expect(files, [ '__404error.html', + 'categories.json', 'index.html', 'index.json', 'pub-data.json',