Skip to content

Upgrade dartdoc to 6.1.5 #6264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ Important changes to data models, configuration, and migrations between each
AppEngine version, listed here to ease deployment and troubleshooting.

## Next Release (replace with git tag when deployed)

## `20221208t112900-all`
* Bumped runtimeVersion to `2022.12.12`.
* Bumped runtimeVersion to `2022.12.13`.
* Upgraded stable Dart analysis SDK to `2.18.5`.
* Upgraded preview Dart analysis SDK to `2.19.0-444.1.beta`.
* Upgraded preview Flutter analysis SDK to `3.7.0-1.1.pre`.
* Upgraded dartdoc to `6.1.5`.

## `20221208t112900-all`
* Bumped runtimeVersion to `2022.12.07`.
* Upgraded pana to `0.21.22`.
* Check valid (well-formatted) dependency names at upload.
* Check that dependencies exist at upload.
Expand Down
6 changes: 3 additions & 3 deletions app/lib/shared/versions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
/// when the version switch happens.
const acceptedRuntimeVersions = <String>[
// The current [runtimeVersion].
'2022.12.12',
'2022.12.13',
// Fallback runtime versions.
'2022.12.07',
'2022.11.23',
'2022.11.10',
];

/// Represents a combined version of the overall toolchain and processing,
Expand Down Expand Up @@ -68,7 +68,7 @@ final semanticToolStableFlutterSdkVersion =
final String panaVersion = pana.packageVersion;

// keep in-sync with pkg/pub_dartdoc/pubspec.yaml
final String dartdocVersion = '6.1.1';
final String dartdocVersion = '6.1.5';

/// Whether the given runtime version (stored with the dartdoc entry) should
/// be displayed on the live site (or a coordinated upgrade is in progress).
Expand Down
6 changes: 3 additions & 3 deletions app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "47.0.0"
version: "51.0.0"
_popularity:
dependency: "direct main"
description:
Expand All @@ -35,7 +35,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "4.7.0"
version: "5.3.1"
api_builder:
dependency: "direct main"
description:
Expand Down Expand Up @@ -602,7 +602,7 @@ packages:
name: shelf_router_generator
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "1.0.5"
shelf_static:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion app/test/dartdoc/golden/pana_0.12.2_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no">
<meta name="generator" content="made with love by dartdoc 6.1.1">
<meta name="generator" content="made with love by dartdoc 6.1.5">
<meta name="description" content="pana API docs, for the Dart programming language.">
<title>pana - Dart API docs</title>
<link rel="canonical" href="https://pub.dev/documentation/pana/0.12.2/">
Expand Down
2 changes: 1 addition & 1 deletion app/test/dartdoc/golden/pana_0.12.2_index.out.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no"/>
<meta name="generator" content="made with love by dartdoc 6.1.1"/>
<meta name="generator" content="made with love by dartdoc 6.1.5"/>
<meta name="description" content="pana API docs, for the Dart programming language."/>
<title>pana - Dart API docs</title>
<link rel="alternate" href="/documentation/pana/latest/"/>
Expand Down
6 changes: 4 additions & 2 deletions app/test/dartdoc/golden/pana_0.12.2_license_file_class.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ <h1><span class="kind-class">LicenseFile</span> class
<li>@<a href="https://pub.dev/documentation/json_annotation/1.2.0/json_annotation/JsonSerializable-class.html">JsonSerializable</a>()</li>
</ul>
</dd>


</dl>
</section>

Expand Down Expand Up @@ -163,7 +165,7 @@ <h2>Properties</h2>
</dt>
<dd>

<div class="features"><span class="">@<a href="https://pub.dev/documentation/json_annotation/1.2.0/json_annotation/JsonKey-class.html">JsonKey</a>(includeIfNull: false)</span><span class="feature">final</span></div>
<div class="features"><span class="feature">final</span></div>

</dd>

Expand All @@ -174,7 +176,7 @@ <h2>Properties</h2>
</dt>
<dd>

<div class="features"><span class="">@<a href="https://pub.dev/documentation/json_annotation/1.2.0/json_annotation/JsonKey-class.html">JsonKey</a>(includeIfNull: false)</span><span class="feature">final</span></div>
<div class="features"><span class="feature">final</span></div>

</dd>

Expand Down
10 changes: 0 additions & 10 deletions app/test/dartdoc/golden/pana_0.12.2_license_file_class.out.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,6 @@ <h2>Properties</h2>
</dt>
<dd>
<div class="features">
<span class="">
@
<a href="https://pub.dev/documentation/json_annotation/1.2.0/json_annotation/JsonKey-class.html">JsonKey</a>
(includeIfNull: false)
</span>
<span class="feature">final</span>
</div>
</dd>
Expand All @@ -249,11 +244,6 @@ <h2>Properties</h2>
</dt>
<dd>
<div class="features">
<span class="">
@
<a href="https://pub.dev/documentation/json_annotation/1.2.0/json_annotation/JsonKey-class.html">JsonKey</a>
(includeIfNull: false)
</span>
<span class="feature">final</span>
</div>
</dd>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ <h1><span class="kind-constructor">LicenseFile</span> constructor
</h1></div>

<section class="multi-line-signature">

<span class="name ">LicenseFile</span>(<wbr><ol class="parameter-list"><li><span class="parameter" id="-param-path"><span class="type-annotation"><a href="https://api.dart.dev/stable/2.18.0/dart-core/String-class.html">String</a></span> <span class="parameter-name">path</span>, </span></li>
<li><span class="parameter" id="-param-name"><span class="type-annotation"><a href="https://api.dart.dev/stable/2.18.0/dart-core/String-class.html">String</a></span> <span class="parameter-name">name</span>, </span></li>
<li><span class="parameter" id="-param-version">{<span class="type-annotation"><a href="https://api.dart.dev/stable/2.18.0/dart-core/String-class.html">String</a></span> <span class="parameter-name">version</span>, </span></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no">
<meta name="description" content="API docs for the name property from the LicenseFile extension, for the Dart programming language.">
<title>name property - LicenseFile extension - models library - Dart API</title>
<meta name="description" content="API docs for the name property from the LicenseFile class, for the Dart programming language.">
<title>name property - LicenseFile class - models library - Dart API</title>
<link rel="canonical" href="https://pub.dev/documentation/pana/0.12.2/models/LicenseFile/name.html">


Expand Down Expand Up @@ -55,6 +55,7 @@ <h1><span class="kind-property">name</span> property
</h1></div>

<section class="multi-line-signature">

<a href="https://api.dart.dev/stable/2.18.0/dart-core/String-class.html">String</a>
<span class="name ">name</span>
<div class="features"><span class="feature">final</span></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no"/>
<meta name="description" content="API docs for the name property from the LicenseFile extension, for the Dart programming language."/>
<title>name property - LicenseFile extension - models library - Dart API</title>
<meta name="description" content="API docs for the name property from the LicenseFile class, for the Dart programming language."/>
<title>name property - LicenseFile class - models library - Dart API</title>
<link rel="alternate" href="/documentation/pana/latest/"/>
<link rel="canonical" href="https://pub.dev/documentation/pana/0.12.2/models/LicenseFile/name.html"/>
<link rel="preconnect" href="https://fonts.gstatic.com"/>
Expand Down
2 changes: 2 additions & 0 deletions app/test/dartdoc/golden/pana_0.12.2_pretty_json.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ <h1><span class="kind-function">prettyJson</span> function
<span class="name ">prettyJson</span>(<wbr><ol class="parameter-list"><li><span class="parameter" id="prettyJson-param-obj"><span class="type-annotation">dynamic</span> <span class="parameter-name">obj</span></span></li>
</ol>)



</section>


Expand Down
2 changes: 1 addition & 1 deletion pkg/api_builder/lib/src/api_router_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ code.Code _buildAddHandlerCode({
for (final param in handler.routeParameters) Code('$param,'),
if (handler.hasPayload)
Code(
'await \$utilities.decodeJson<${handler.payloadType!.element2!.name}>(request, (o) => ${handler.payloadType!.element2!.name}.fromJson(o)),'),
'await \$utilities.decodeJson<${handler.payloadType!.element!.name}>(request, (o) => ${handler.payloadType!.element!.name}.fromJson(o)),'),
for (final param in handler.queryParameters)
Code(
'${param.name}: '
Expand Down
2 changes: 1 addition & 1 deletion pkg/api_builder/lib/src/client_library_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import 'package:source_gen/source_gen.dart' as g;
import 'shared.dart' show EndPointGenerator, Handler;

code.Reference _referToType(DartType type) =>
code.refer(type.element2!.name!, type.element2!.source!.uri.toString());
code.refer(type.element!.name!, type.element!.source!.uri.toString());

final _responseType = g.TypeChecker.fromRuntime(shelf.Response);

Expand Down
4 changes: 2 additions & 2 deletions pkg/api_builder/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "47.0.0"
version: "51.0.0"
analyzer:
dependency: "direct main"
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "4.7.0"
version: "5.3.1"
args:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pkg/api_builder/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
build: ^2.0.0
build_config: ^1.0.0
source_gen: ^1.0.0
analyzer: ^4.0.0
analyzer: ^5.0.0
shelf_router: ^1.0.0
code_builder: ^4.0.0
shelf: ^1.0.0
Expand Down
2 changes: 2 additions & 0 deletions pkg/pub_dartdoc/lib/pub_data_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

// ignore_for_file: deprecated_export_use

import 'dart:convert' as convert;

import 'package:analyzer/file_system/file_system.dart';
Expand Down
22 changes: 11 additions & 11 deletions pkg/pub_dartdoc/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "50.0.0"
version: "51.0.0"
analyzer:
dependency: "direct main"
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "5.2.0"
version: "5.3.1"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -84,7 +84,7 @@ packages:
name: dartdoc
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.1"
version: "6.1.5"
file:
dependency: transitive
description:
Expand All @@ -98,14 +98,14 @@ packages:
name: frontend_server_client
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "3.2.0"
glob:
dependency: transitive
description:
name: glob
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
html:
dependency: transitive
description:
Expand Down Expand Up @@ -189,7 +189,7 @@ packages:
name: mime
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.3"
node_preamble:
dependency: transitive
description:
Expand All @@ -210,7 +210,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.2"
version: "1.8.3"
pool:
dependency: transitive
description:
Expand All @@ -231,7 +231,7 @@ packages:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
version: "2.1.3"
shelf:
dependency: transitive
description:
Expand Down Expand Up @@ -322,21 +322,21 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.22.0"
version: "1.22.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.16"
version: "0.4.17"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.20"
version: "0.4.21"
typed_data:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pkg/pub_dartdoc/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
pub_dartdoc_data:
path: ../pub_dartdoc_data
# dartdoc version to be pinned, keep in-sync with app/lib/shared/versions.dart
dartdoc: 6.1.1
dartdoc: 6.1.5

dev_dependencies:
coverage: any # test already depends on it
Expand Down
6 changes: 3 additions & 3 deletions pkg/pub_worker/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "47.0.0"
version: "51.0.0"
_pub_shared:
dependency: "direct main"
description:
Expand All @@ -21,7 +21,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "4.7.0"
version: "5.3.1"
api_builder:
dependency: "direct main"
description:
Expand Down Expand Up @@ -182,7 +182,7 @@ packages:
name: dartdoc
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.1"
version: "6.1.4"
file:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions pkg/web_app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "47.0.0"
version: "51.0.0"
_pub_shared:
dependency: "direct main"
description:
Expand All @@ -21,7 +21,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "4.7.0"
version: "5.3.1"
api_builder:
dependency: "direct main"
description:
Expand Down