From 06b0304b1c033f3b6dac32fedd07700bb1885442 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Fri, 10 Oct 2025 13:03:47 +0200 Subject: [PATCH] Upgrade dartdoc and pana. --- CHANGELOG.md | 4 ++- app/lib/shared/versions.dart | 4 +-- app/pubspec.yaml | 2 +- app/test/task/end2end_test.dart | 2 +- .../oxygen/1.0.0/oxygen/MainClass-class.html | 2 +- .../oxygen/2.0.0/oxygen/MainClass-class.html | 2 +- .../oxygen/latest/oxygen/MainClass-class.html | 2 +- pkg/pub_worker/lib/src/bin/pana_wrapper.dart | 25 ++----------------- pkg/pub_worker/pubspec.yaml | 2 +- pubspec.lock | 4 +-- 10 files changed, 15 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a145b8ae6..3f7f4206ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ 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) - * Bump runtimeVersion to `2025.10.07`. + * Bump runtimeVersion to `2025.10.10`. * Upgraded stable Dart analysis SDK to `3.9.4` + * Upgraded dartdoc to `9.0.0`. + * Upgraded pana to `0.22.24`. ## `20251002t093000-all` * Bump runtimeVersion to `2025.09.30`. diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart index a4f7cfb45c..6a6f68cbad 100644 --- a/app/lib/shared/versions.dart +++ b/app/lib/shared/versions.dart @@ -24,7 +24,7 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$'); /// when the version switch happens. const _acceptedRuntimeVersions = [ // The current [runtimeVersion]. - '2025.10.07', + '2025.10.10', // Fallback runtime versions. '2025.09.30', '2025.09.22', @@ -76,4 +76,4 @@ final semanticToolStableFlutterSdkVersion = Version.parse( final String panaVersion = pana.packageVersion; // keep in-sync with pkg/pub-worker/lib/src/bin/pana_wrapper.dart -final String dartdocVersion = '8.3.4'; +final String dartdocVersion = '9.0.0'; diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 7830e4ef92..00df2605f0 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -46,7 +46,7 @@ dependencies: watcher: ^1.0.0 yaml: ^3.1.0 # pana version to be pinned - pana: '0.22.23' + pana: '0.22.24' # 3rd-party packages with pinned versions mailer: '6.5.0' postgres: '3.5.8' diff --git a/app/test/task/end2end_test.dart b/app/test/task/end2end_test.dart index e89fe6400b..1c9d4f4479 100644 --- a/app/test/task/end2end_test.dart +++ b/app/test/task/end2end_test.dart @@ -19,7 +19,7 @@ import '../shared/utils.dart'; const String goldenDir = 'test/task/testdata/goldens'; // TODO: generalize golden testing, use env var for regenerating all goldens. -final _regenerateGoldens = false; +final _regenerateGoldens = true; // We use a small test profile without flutter packages, because we have to // run pana+dartdoc for all these package versions, naturally this is slow. diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass-class.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass-class.html index 049a6b70dc..df6cb99950 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass-class.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass-class.html @@ -61,7 +61,7 @@

Constructors

- MainClass.new + MainClass ( diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass-class.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass-class.html index 8044e97d87..b7e65bfc84 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass-class.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass-class.html @@ -61,7 +61,7 @@

Constructors

- MainClass.new + MainClass ( diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass-class.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass-class.html index 8fde1a8aa0..a57a5c5dc4 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass-class.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass-class.html @@ -59,7 +59,7 @@

Constructors

- MainClass.new + MainClass ( diff --git a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart index 5c8985ae03..3be8001697 100644 --- a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart +++ b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart @@ -33,7 +33,7 @@ const _totalTimeout = Duration(minutes: 50); /// The dartdoc version to use. /// keep in-sync with app/lib/shared/versions.dart -const _dartdocVersion = '8.3.4'; +const _dartdocVersion = '9.0.0'; /// Program to be used as subprocess for running pana, ensuring that we capture /// all the output, and only run analysis in a subprocess that can timeout and @@ -131,31 +131,10 @@ Future main(List args) async { ); // sanity check on pana report size - var reportSize = gzip + final reportSize = gzip .encode(utf8.encode(json.encode(summary.toJson()))) .length; - // Note: the new license coverage data seems to generate coverage pairs that - // occupy way too much space. Until that bug is fixed, we should remove - // that data from the summary. - // TODO: remove this block once https://github.com/dart-lang/pana/issues/1481 gets fixed and deployed - if (reportSize > _reportSizeDropThreshold) { - // We are storing the licenses in two fields, removing the fallback/unused one. - // ignore: deprecated_member_use - summary.licenses?.clear(); - - // Remove excessive range data. - for (final l in summary.result?.licenses ?? []) { - final count = l.range?.coverages.length ?? 0; - if (count > 50) { - l.range?.coverages.removeRange(50, count); - } - } - - // re-calculate report size - reportSize = gzip.encode(utf8.encode(json.encode(summary.toJson()))).length; - } - if (reportSize > _reportSizeDropThreshold) { summary = Summary( createdAt: summary.createdAt, diff --git a/pkg/pub_worker/pubspec.yaml b/pkg/pub_worker/pubspec.yaml index 9aa86de454..04f125a951 100644 --- a/pkg/pub_worker/pubspec.yaml +++ b/pkg/pub_worker/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: appengine: ^0.13.6 json_annotation: ^4.3.0 jsontool: ^2.0.0 - pana: ^0.22.23 + pana: ^0.22.24 path: ^1.8.0 lints: ^6.0.0 # required for pana meta: ^1.7.0 diff --git a/pubspec.lock b/pubspec.lock index 47ae927b33..537b47b3f5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -621,10 +621,10 @@ packages: dependency: transitive description: name: pana - sha256: e3bd09f4aa7eb997ac9d19d6df82781a92fb48917ddb2637b4cb7430e25de735 + sha256: bbad5a3e085fcc2475f08fe1240041e25d74482da80d9af00bc17cce99989e29 url: "https://pub.dev" source: hosted - version: "0.22.23" + version: "0.22.24" path: dependency: transitive description: