diff --git a/CHANGELOG.md b/CHANGELOG.md index b17db197c0..987365aed5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ 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) - * Bumped runtimeVersion to `2023.01.30` + * Bumped runtimeVersion to `2023.01.31` * Upgraded runtime Dart SDK to `2.19.0`. + * Upgraded dartdoc to `6.1.5`. * Upgraded dependencies. ## `20230125t151100-all` diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart index 8871ac31c2..5ff9e46a49 100644 --- a/app/lib/shared/versions.dart +++ b/app/lib/shared/versions.dart @@ -22,7 +22,7 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$'); /// when the version switch happens. const acceptedRuntimeVersions = [ // The current [runtimeVersion]. - '2023.01.30', + '2023.01.31', // Fallback runtime versions. '2023.01.25', '2023.01.24', @@ -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). diff --git a/app/pubspec.lock b/app/pubspec.lock index d9864edceb..6831b983d9 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" url: "https://pub.dev" source: hosted - version: "47.0.0" + version: "52.0.0" _popularity: dependency: "direct main" description: @@ -35,10 +35,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "5.4.0" api_builder: dependency: "direct main" description: 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 d98667af67..59fa8eea7f 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 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 f32e3d23d4..93c2df1648 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 @@ -6,7 +6,7 @@ - + pana - Dart API docs 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 0bfe0bd8c5..50463dd83d 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 @@ -73,6 +73,8 @@

LicenseFile class
  • @JsonSerializable()
    • + + @@ -82,13 +84,13 @@

    Constructors

    - LicenseFile(String path, String name, {String version, String url}) + LicenseFile(String path, String name, {String version, String url})
    - LicenseFile.fromJson(Map<String, dynamic> json) + LicenseFile.fromJson(Map<String, dynamic> json)
    @@ -103,7 +105,7 @@

    Properties

    hashCode - → int + → int
    @@ -114,7 +116,7 @@

    Properties

    name - → String + → String
    @@ -125,7 +127,7 @@

    Properties

    path - → String + → String
    @@ -135,8 +137,8 @@

    Properties

    - runtimeType - → Type + runtimeType + → Type
    @@ -147,7 +149,7 @@

    Properties

    shortFormatted - → String + → String
    @@ -158,23 +160,23 @@

    Properties

    url - → String + → String
    -
    @JsonKey(includeIfNull: false)final
    +
    final
    version - → String + → String
    -
    @JsonKey(includeIfNull: false)final
    +
    final
    @@ -188,7 +190,7 @@

    Properties

    Methods

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

    Methods

    - noSuchMethod(Invocation invocation) + noSuchMethod(Invocation invocation) → dynamic @@ -215,7 +217,7 @@

    Methods

    toJson() - → Map<String, dynamic> + → Map<String, dynamic> @@ -228,7 +230,7 @@

    Methods

    toString() - → String + → String @@ -248,8 +250,8 @@

    Methods

    Operators

    - operator ==(Object other) - → bool + operator ==(Object other) + → bool @@ -333,14 +335,14 @@
    models library
  • hashCode
  • name
  • path
    • -
  • runtimeType
    • +
  • runtimeType
  • shortFormatted
  • url
  • version
  • Methods
  • change
    • -
  • noSuchMethod
    • +
  • noSuchMethod
  • toJson
  • toString
    • 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 d00c6cb769..1e0faa842c 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 @@ -83,14 +83,14 @@

    Constructors

    ( - String + String path , - String + String name , @@ -98,14 +98,14 @@

    Constructors

    { - String + String version , - String + String url } @@ -122,12 +122,12 @@

    Constructors

    ( - Map + Map < - String + String , dynamic @@ -153,7 +153,7 @@

    Properties

     → - int + int
    @@ -169,7 +169,7 @@

    Properties

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

    Properties

    → - String + String
    @@ -193,11 +193,11 @@

    Properties

    - runtimeType + runtimeType → - Type + Type
    @@ -213,7 +213,7 @@

    Properties

    → - String + String
    @@ -227,16 +227,11 @@

    Properties

    → - String + String
    - - @ - JsonKey - (includeIfNull: false) - final
    @@ -246,16 +241,11 @@

    Properties

    → - String + String
    - - @ - JsonKey - (includeIfNull: false) - final
    @@ -274,7 +264,7 @@

    Methods

    { - String + String url } @@ -289,14 +279,14 @@

    Methods

    - noSuchMethod + noSuchMethod ( - Invocation + Invocation invocation @@ -320,12 +310,12 @@

    Methods

    ) → - Map + Map < - String + String , dynamic @@ -349,7 +339,7 @@

    Methods

    ) → - String + String
    @@ -373,14 +363,14 @@

    Operators

    - Object + Object other ) → - bool + bool     @@ -506,7 +496,7 @@
    models library
    path
  • - runtimeType + runtimeType
  • shortFormatted @@ -524,7 +514,7 @@
    models library
    change
  • - noSuchMethod + noSuchMethod
  • toJson diff --git a/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.html b/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.html index 7151440dc4..fdbbda533b 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.html +++ b/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.html @@ -55,10 +55,11 @@

    LicenseFile constructor

    - LicenseFile(
    1. String path,
      2. -
    2. String name,
      3. -
    3. {String version,
      4. -
    4. String url}
      5. + + LicenseFile(
      1. String path,
        2. +
      2. String name,
        3. +
      3. {String version,
        4. +
      4. String url}
      )
    @@ -103,14 +104,14 @@
    LicenseFile class
  • hashCode
  • name
  • path
    • -
  • runtimeType
    • +
  • runtimeType
  • shortFormatted
  • url
  • version
  • Methods
  • change
    • -
  • noSuchMethod
    • +
  • noSuchMethod
  • toJson
  • toString
    • diff --git a/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.out.html b/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.out.html index 7de7ffccdd..b77bb1fb79 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.out.html +++ b/app/test/dartdoc/golden/pana_0.12.2_license_file_constructor.out.html @@ -69,7 +69,7 @@

  • - String + String path , @@ -78,7 +78,7 @@

  • - String + String name , @@ -88,7 +88,7 @@

    { - String + String version , @@ -97,7 +97,7 @@

  • - String + String url } @@ -161,7 +161,7 @@
    LicenseFile class
    path
  • - runtimeType + runtimeType
  • shortFormatted @@ -179,7 +179,7 @@
    LicenseFile class
    change
  • - noSuchMethod + noSuchMethod
  • toJson diff --git a/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.html b/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.html index cf541b7d59..467f8d555c 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.html +++ b/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.html @@ -4,8 +4,8 @@ - - name property - LicenseFile extension - models library - Dart API + + name property - LicenseFile class - models library - Dart API @@ -55,7 +55,8 @@

    name property

    - String + + String name
    final
    @@ -100,14 +101,14 @@
    LicenseFile class
  • hashCode
  • name
  • path
    • -
  • runtimeType
    • +
  • runtimeType
  • shortFormatted
  • url
  • version
  • Methods
  • change
    • -
  • noSuchMethod
    • +
  • noSuchMethod
  • toJson
  • toString
    • diff --git a/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.out.html b/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.out.html index 66101bdf9b..6610cf9f83 100644 --- a/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.out.html +++ b/app/test/dartdoc/golden/pana_0.12.2_license_file_name_field.out.html @@ -6,8 +6,8 @@ - - name property - LicenseFile extension - models library - Dart API + + name property - LicenseFile class - models library - Dart API @@ -62,7 +62,7 @@

    - String + String name
    final @@ -123,7 +123,7 @@
    LicenseFile class
    path
  • - runtimeType + runtimeType
  • shortFormatted @@ -141,7 +141,7 @@
    LicenseFile class
    change
  • - noSuchMethod + noSuchMethod
  • toJson 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 4fba177da8..6a533abee9 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 @@ -57,10 +57,12 @@

    prettyJson function
    -String +String prettyJson(
    1. dynamic obj
    ) + +
    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 8431492c46..6e599211a7 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 @@ -60,7 +60,7 @@

    - String + String prettyJson ( diff --git a/pkg/api_builder/lib/src/api_router_generator.dart b/pkg/api_builder/lib/src/api_router_generator.dart index fcc3f03758..ea15b73871 100644 --- a/pkg/api_builder/lib/src/api_router_generator.dart +++ b/pkg/api_builder/lib/src/api_router_generator.dart @@ -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}: ' diff --git a/pkg/api_builder/lib/src/client_library_generator.dart b/pkg/api_builder/lib/src/client_library_generator.dart index 48d78c231c..354edfd3ee 100644 --- a/pkg/api_builder/lib/src/client_library_generator.dart +++ b/pkg/api_builder/lib/src/client_library_generator.dart @@ -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); diff --git a/pkg/api_builder/pubspec.lock b/pkg/api_builder/pubspec.lock index ccb51047b1..22ddb108bd 100644 --- a/pkg/api_builder/pubspec.lock +++ b/pkg/api_builder/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" url: "https://pub.dev" source: hosted - version: "47.0.0" + version: "52.0.0" analyzer: dependency: "direct main" description: name: analyzer - sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "5.4.0" args: dependency: transitive description: diff --git a/pkg/api_builder/pubspec.yaml b/pkg/api_builder/pubspec.yaml index fa2840ac74..17dfed23f3 100644 --- a/pkg/api_builder/pubspec.yaml +++ b/pkg/api_builder/pubspec.yaml @@ -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 diff --git a/pkg/pub_dartdoc/lib/pub_data_generator.dart b/pkg/pub_dartdoc/lib/pub_data_generator.dart index eeeab82ad5..a976ab4110 100644 --- a/pkg/pub_dartdoc/lib/pub_data_generator.dart +++ b/pkg/pub_dartdoc/lib/pub_data_generator.dart @@ -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'; diff --git a/pkg/pub_dartdoc/pubspec.lock b/pkg/pub_dartdoc/pubspec.lock index 69599383fd..8ae2f9f6f4 100644 --- a/pkg/pub_dartdoc/pubspec.lock +++ b/pkg/pub_dartdoc/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: "direct main" description: name: dartdoc - sha256: f236297ea9d0908e1510cfabbf9cfc318c9834067c1bbddbea0ad9d670cd0b1a + sha256: f9bf2fbf11e5dce3ffd085e1169f6218b632318403cb3f5762619e4d092e1e68 url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.5" file: dependency: transitive description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.0" mime: dependency: transitive description: diff --git a/pkg/pub_dartdoc/pubspec.yaml b/pkg/pub_dartdoc/pubspec.yaml index 48ea0b2d2e..6e03358b1f 100644 --- a/pkg/pub_dartdoc/pubspec.yaml +++ b/pkg/pub_dartdoc/pubspec.yaml @@ -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 diff --git a/pkg/pub_worker/pubspec.lock b/pkg/pub_worker/pubspec.lock index 8ad8e042e3..cc8269be03 100644 --- a/pkg/pub_worker/pubspec.lock +++ b/pkg/pub_worker/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" url: "https://pub.dev" source: hosted - version: "47.0.0" + version: "52.0.0" _pub_shared: dependency: "direct main" description: @@ -20,10 +20,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "5.4.0" api_builder: dependency: "direct main" description: @@ -203,10 +203,10 @@ packages: dependency: transitive description: name: dartdoc - sha256: f236297ea9d0908e1510cfabbf9cfc318c9834067c1bbddbea0ad9d670cd0b1a + sha256: f9bf2fbf11e5dce3ffd085e1169f6218b632318403cb3f5762619e4d092e1e68 url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.5" file: dependency: transitive description: diff --git a/pkg/web_app/pubspec.lock b/pkg/web_app/pubspec.lock index f984ea23b3..3880b2753c 100644 --- a/pkg/web_app/pubspec.lock +++ b/pkg/web_app/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" url: "https://pub.dev" source: hosted - version: "47.0.0" + version: "52.0.0" _pub_shared: dependency: "direct main" description: @@ -20,10 +20,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "5.4.0" api_builder: dependency: "direct main" description: