From b31707e223ce45724b76d38fcdf04bb606328a10 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Thu, 12 Dec 2024 16:48:55 +0100 Subject: [PATCH 1/5] Upgrade runtime SDK --- CHANGELOG.md | 2 + app/lib/shared/versions.dart | 5 +- app/test/task/end2end_test.dart | 13 ++- .../documentation/oxygen/1.0.0/index.html | 4 +- .../oxygen/1.0.0/oxygen/MainClass-class.html | 4 +- .../1.0.0/oxygen/MainClass/MainClass.html | 4 +- .../oxygen/1.0.0/oxygen/MainClass/text.html | 4 +- .../1.0.0/oxygen/MainClass/toLowerCase.html | 4 +- .../1.0.0/oxygen/MainClass/toString.html | 4 +- .../oxygen/1.0.0/oxygen/TypeEnum.html | 28 ++++- .../1.0.0/oxygen/TypeEnum/TypeEnum.html | 105 ------------------ .../oxygen/TypeEnum/values-constant.html | 4 +- .../{oxygen-library.html => index.html} | 4 +- .../oxygen/1.0.0/oxygen/main.html | 4 +- .../documentation/oxygen/2.0.0/index.html | 4 +- .../oxygen/2.0.0/oxygen/MainClass-class.html | 4 +- .../2.0.0/oxygen/MainClass/MainClass.html | 4 +- .../oxygen/2.0.0/oxygen/MainClass/text.html | 4 +- .../2.0.0/oxygen/MainClass/toLowerCase.html | 4 +- .../2.0.0/oxygen/MainClass/toString.html | 4 +- .../oxygen/2.0.0/oxygen/TypeEnum.html | 28 ++++- .../2.0.0/oxygen/TypeEnum/TypeEnum.html | 104 ----------------- .../oxygen/TypeEnum/values-constant.html | 4 +- .../{oxygen-library.html => index.html} | 4 +- .../oxygen/2.0.0/oxygen/main.html | 4 +- .../documentation/oxygen/latest/index.html | 4 +- .../oxygen/latest/oxygen/MainClass-class.html | 4 +- .../latest/oxygen/MainClass/MainClass.html | 4 +- .../oxygen/latest/oxygen/MainClass/text.html | 4 +- .../latest/oxygen/MainClass/toLowerCase.html | 4 +- .../latest/oxygen/MainClass/toString.html | 4 +- .../oxygen/latest/oxygen/TypeEnum.html | 28 ++++- .../latest/oxygen/TypeEnum/TypeEnum.html | 104 ----------------- .../oxygen/TypeEnum/values-constant.html | 4 +- .../{oxygen-library.html => index.html} | 4 +- .../oxygen/latest/oxygen/main.html | 4 +- .../test/dartdoc_search_test.dart | 9 +- .../test/publish_rejection_test.dart | 2 +- pkg/pub_worker/lib/src/bin/pana_wrapper.dart | 23 +--- pubspec.lock | 14 +-- 40 files changed, 158 insertions(+), 415 deletions(-) delete mode 100644 app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/TypeEnum.html rename app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/{oxygen-library.html => index.html} (98%) delete mode 100644 app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/TypeEnum.html rename app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/{oxygen-library.html => index.html} (98%) delete mode 100644 app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/TypeEnum.html rename app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/{oxygen-library.html => index.html} (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c628ee0b1b..d254f870bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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 `2024.12.12`. + * Upgraded runtime Dart SDK to `3.6.0`. ## `20241212t111200-all` * Bump runtimeVersion to `2024.12.11`. diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart index 889f225059..f7ebb78b2e 100644 --- a/app/lib/shared/versions.dart +++ b/app/lib/shared/versions.dart @@ -24,8 +24,9 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$'); /// when the version switch happens. const _acceptedRuntimeVersions = [ // The current [runtimeVersion]. - '2024.12.11', + '2024.12.12', // Fallback runtime versions. + '2024.12.11', '2024.12.09', '2024.12.04', ]; @@ -61,7 +62,7 @@ bool shouldGCVersion(String version) => version.compareTo(gcBeforeRuntimeVersion) < 0; // keep in-sync with SDK version in .mono_repo.yml and Dockerfile -final String runtimeSdkVersion = '3.5.0'; +final String runtimeSdkVersion = '3.6.0'; final String toolStableDartSdkVersion = '3.6.0'; final String toolStableFlutterSdkVersion = '3.27.0'; diff --git a/app/test/task/end2end_test.dart b/app/test/task/end2end_test.dart index bdc3890c8c..c46ab7664e 100644 --- a/app/test/task/end2end_test.dart +++ b/app/test/task/end2end_test.dart @@ -12,13 +12,14 @@ import 'package:pub_dev/tool/test_profile/models.dart'; import 'package:test/test.dart'; import '../frontend/handlers/_utils.dart'; +import '../shared/handlers_test_utils.dart'; import '../shared/test_services.dart'; 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. @@ -44,9 +45,8 @@ void main() { testWithProfile('output of oxygen', testProfile: _testProfile, fn: () async { await processTasksLocallyWithPubWorker(); // Make assertions about generated documentation - final doc = await _fetchHtmlDocument( - '/documentation/oxygen/latest/oxygen/oxygen-library.html', - ); + final doc = + await _fetchHtmlDocument('/documentation/oxygen/latest/oxygen/'); // Check that .self-crumb made it through expect(doc.querySelector('.self-crumb')!.text, contains('oxygen')); // Check that we don't have noindex on /latest/ @@ -56,6 +56,11 @@ void main() { m.attributes['content'] == 'noindex'), isEmpty, ); + // check old library file redirect + await expectRedirectResponse( + await issueGet('/documentation/oxygen/latest/oxygen/oxygen-library.html'), + '/documentation/oxygen/latest/oxygen/', + ); // Traverse all package pages and generated documentation, // create golden files and check for dead links and assets diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/index.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/index.html index e951a08a04..246e6c1be5 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/index.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/index.html @@ -55,7 +55,7 @@

Libraries

- oxygen + oxygen
@@ -82,7 +82,7 @@

Operators

documentation
  • - oxygen + oxygen
  • MainClass class
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/MainClass.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/MainClass.html index dde483ac6b..ce53b9b7be 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/MainClass.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/MainClass.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -100,7 +100,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/text.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/text.html index 146f76b125..76be52dd56 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/text.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/text.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -91,7 +91,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toLowerCase.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toLowerCase.html index 15ec9ef7c8..eda72549ca 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toLowerCase.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toLowerCase.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -100,7 +100,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toString.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toString.html index 04dc8c5071..98f701b43a 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toString.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toString.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -119,7 +119,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum.html index 16d4718124..4bd4d43393 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • TypeEnum enum
    • @@ -138,6 +138,30 @@

    Properties

    inherited +
    + + name + + + → + String + +
    +
    +

    + + Available on + Enum + , provided by the + EnumName + extension + +

    + The name of the enum value. +
    + no setter +
    +
    runtimeType @@ -273,7 +297,7 @@

    Constants

    documentation
  • - oxygen + oxygen
  • TypeEnum enum
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/TypeEnum.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/TypeEnum.html deleted file mode 100644 index 615400ef2a..0000000000 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/TypeEnum.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - TypeEnum constructor - TypeEnum - oxygen library - Dart API - - - - - - - - - - -
    -
    - menu - - -
    TypeEnum const constructor
    - -
    - -
    -
    -
    -
    -
    -

    - TypeEnum - constructor -

    -
    -
    - const - TypeEnum - ( - - ) -
    -
    - - -
    -
    - oxygen 1.0.0 -
    - - - - diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/values-constant.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/values-constant.html index 98a5100446..2262770e3a 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/values-constant.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/values-constant.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • TypeEnum @@ -92,7 +92,7 @@

    documentation

  • - oxygen + oxygen
  • TypeEnum diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/oxygen-library.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/index.html similarity index 98% rename from app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/oxygen-library.html rename to app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/index.html index a9dbb852ef..5dfae3b652 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/oxygen-library.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/index.html @@ -10,7 +10,7 @@ oxygen library - Dart API - + @@ -118,7 +118,7 @@
    1. Libraries
    2. - oxygen + oxygen
    diff --git a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/main.html b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/main.html index 7a8c14861d..651c062ebb 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/main.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/main.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • main function
    • @@ -88,7 +88,7 @@

    documentation
  • - oxygen + oxygen
  • main function
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/index.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/index.html index d1c1b10046..0f6c747824 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/index.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/index.html @@ -55,7 +55,7 @@

    Libraries

    - oxygen + oxygen
    @@ -82,7 +82,7 @@

    Operators

    documentation
  • - oxygen + oxygen
  • MainClass class
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/MainClass.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/MainClass.html index 7a975e3b10..c9a34720d0 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/MainClass.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/MainClass.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -100,7 +100,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/text.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/text.html index 5e7d8be118..2e9409134d 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/text.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/text.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -91,7 +91,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toLowerCase.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toLowerCase.html index 77d57f6609..db5a4aee81 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toLowerCase.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toLowerCase.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -100,7 +100,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toString.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toString.html index 18acda3502..31b579447a 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toString.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toString.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -119,7 +119,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum.html index 9d632f186b..cf80c43f8d 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • TypeEnum enum
    • @@ -138,6 +138,30 @@

    Properties

    inherited +
    + + name + + + → + String + +
    +
    +

    + + Available on + Enum + , provided by the + EnumName + extension + +

    + The name of the enum value. +
    + no setter +
    +
    runtimeType @@ -273,7 +297,7 @@

    Constants

    documentation
  • - oxygen + oxygen
  • TypeEnum enum
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/TypeEnum.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/TypeEnum.html deleted file mode 100644 index 7f9cf4a555..0000000000 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/TypeEnum.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - TypeEnum constructor - TypeEnum - oxygen library - Dart API - - - - - - - - - -
    -
    - menu - - -
    TypeEnum const constructor
    - -
    - -
    -
    -
    -
    -
    -

    - TypeEnum - constructor -

    -
    -
    - const - TypeEnum - ( - - ) -
    -
    - - -
    -
    - oxygen 2.0.0 -
    - - - - diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/values-constant.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/values-constant.html index d26924ad9f..8132e8213b 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/values-constant.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/TypeEnum/values-constant.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • TypeEnum @@ -92,7 +92,7 @@

    documentation

  • - oxygen + oxygen
  • TypeEnum diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/oxygen-library.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/index.html similarity index 98% rename from app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/oxygen-library.html rename to app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/index.html index 7fb00de77d..f57bf80583 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/oxygen-library.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/index.html @@ -10,7 +10,7 @@ oxygen library - Dart API - + @@ -118,7 +118,7 @@
    1. Libraries
    2. - oxygen + oxygen
    diff --git a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/main.html b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/main.html index 509f1d13e6..d4ac2197cd 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/main.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/main.html @@ -34,7 +34,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • main function
    • @@ -88,7 +88,7 @@

    documentation
  • - oxygen + oxygen
  • main function
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/index.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/index.html index 581c8a041b..77e18a6eab 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/index.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/index.html @@ -53,7 +53,7 @@

    Libraries

    - oxygen + oxygen
    @@ -80,7 +80,7 @@

    Operators

    documentation
  • - oxygen + oxygen
  • MainClass class
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/MainClass.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/MainClass.html index 77e23c56b6..31e65411b2 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/MainClass.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/MainClass.html @@ -33,7 +33,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -99,7 +99,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/text.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/text.html index 9239bfd928..3c45733239 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/text.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/text.html @@ -33,7 +33,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -90,7 +90,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toLowerCase.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toLowerCase.html index 3da02812ec..2f7877d66d 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toLowerCase.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toLowerCase.html @@ -33,7 +33,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -99,7 +99,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toString.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toString.html index d5eb1c94f3..beed0d22ed 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toString.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/MainClass/toString.html @@ -33,7 +33,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • MainClass @@ -118,7 +118,7 @@

    documentation

  • - oxygen + oxygen
  • MainClass diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum.html index 00843aeb34..a31d0890f8 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum.html @@ -32,7 +32,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • TypeEnum enum
    • @@ -136,6 +136,30 @@

    Properties

    inherited +
    + + name + + + → + String + +
    +
    +

    + + Available on + Enum + , provided by the + EnumName + extension + +

    + The name of the enum value. +
    + no setter +
    +
    runtimeType @@ -271,7 +295,7 @@

    Constants

    documentation
  • - oxygen + oxygen
  • TypeEnum enum
    • diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/TypeEnum.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/TypeEnum.html deleted file mode 100644 index e44f01e4d5..0000000000 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/TypeEnum.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - TypeEnum constructor - TypeEnum - oxygen library - Dart API - - - - - - - - - -
    -
    - menu - - -
    TypeEnum const constructor
    - -
    - -
    -
    -
    -
    -
    -

    - TypeEnum - constructor -

    -
    -
    - const - TypeEnum - ( - - ) -
    -
    - - -
    -
    - oxygen 2.0.0 -
    - - - - diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/values-constant.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/values-constant.html index 017ec24347..1667e58b10 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/values-constant.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/TypeEnum/values-constant.html @@ -33,7 +33,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • TypeEnum @@ -91,7 +91,7 @@

    documentation

  • - oxygen + oxygen
  • TypeEnum diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/oxygen-library.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/index.html similarity index 98% rename from app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/oxygen-library.html rename to app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/index.html index c3909f548d..7c3f2a6b24 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/oxygen-library.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/index.html @@ -9,7 +9,7 @@ oxygen library - Dart API - + @@ -116,7 +116,7 @@
    1. Libraries
    2. - oxygen + oxygen
    diff --git a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/main.html b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/main.html index d2c4c8f77b..687a19f8cb 100644 --- a/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/main.html +++ b/app/test/task/testdata/goldens/documentation/oxygen/latest/oxygen/main.html @@ -32,7 +32,7 @@ documentation
  • - oxygen.dart + oxygen.dart
  • main function
    • @@ -86,7 +86,7 @@

    documentation
  • - oxygen + oxygen
  • main function
    • diff --git a/pkg/pub_integration/test/dartdoc_search_test.dart b/pkg/pub_integration/test/dartdoc_search_test.dart index 16dfb04b00..625ecd86dc 100644 --- a/pkg/pub_integration/test/dartdoc_search_test.dart +++ b/pkg/pub_integration/test/dartdoc_search_test.dart @@ -59,18 +59,15 @@ void main() { expect(page.url, startsWith('$origin/documentation/oxygen/latest/oxygen/')); expect(page.url, endsWith('.html')); + expect(await page.content, contains('TypeEnum')); }); - // test library page (future redirect) + // test library page redirect await user.withBrowserPage((page) async { await page.gotoOrigin( '/documentation/oxygen/latest/oxygen/oxygen-library.html'); await Future.delayed(Duration(milliseconds: 200)); - // NOTE: This test does nothing substantial right now, but once we migrate - // to dartdoc 8.3, this will test the redirect handler. - expect(page.url, - '$origin/documentation/oxygen/latest/oxygen/oxygen-library.html'); - expect(await page.content, contains('TypeEnum')); + expect(page.url, '$origin/documentation/oxygen/latest/oxygen/'); }); }); }, timeout: Timeout.factor(testTimeoutFactor)); diff --git a/pkg/pub_integration/test/publish_rejection_test.dart b/pkg/pub_integration/test/publish_rejection_test.dart index 156e7de6ad..da0d4b5928 100644 --- a/pkg/pub_integration/test/publish_rejection_test.dart +++ b/pkg/pub_integration/test/publish_rejection_test.dart @@ -37,7 +37,7 @@ void main() { final tempDir = await Directory.systemTemp.createTemp(); try { final dependentPackages = { - 'lints': '4.0.0', + 'lints': '5.0.0', 'test': '1.99.0', }; for (final d in dependentPackages.keys) { diff --git a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart index b9ad975777..35b5660599 100644 --- a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart +++ b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart @@ -99,11 +99,6 @@ Future main(List args) async { final pkgDir = Directory(p.join(pkgDownloadDir.path, '$package-$version')); final detected = await _detectSdks(pkgDir.path); - // Fallback for CI tests. - // TODO: remove after runtime SDK is migrated to 3.6 SDK - final dartdocVersion = - Platform.version.startsWith('3.5.') ? '8.1.0' : _dartdocVersion; - final toolEnv = await ToolEnvironment.create( dartSdkConfig: SdkConfig( rootPath: detected.dartSdkPath, @@ -114,7 +109,7 @@ Future main(List args) async { configHomePath: _configHomePath('flutter', detected.configKind), ), pubCacheDir: pubCache, - dartdocVersion: dartdocVersion, + dartdocVersion: _dartdocVersion, ); //final dartdocOutputDir = @@ -256,20 +251,6 @@ Future<({String configKind, String? dartSdkPath, String? flutterSdkPath})> return false; } - // temporary exception for macros on 3.5 SDK - // TODO: remove after 3.6 SDK gets released - if (minMacrosVersion != null && - minMacrosVersion.compareTo(Version.parse('0.1.3-main.0')) >= 0) { - if (dart != null && dart.major == 3 && dart.minor == 5) { - return false; - } - if (flutterDartSdk != null && - flutterDartSdk.major == 3 && - flutterDartSdk.minor == 5) { - return false; - } - } - // Otherwise accepting the analysis SDK bundle. return true; } @@ -410,8 +391,6 @@ Future> _detectSdkBundles() async { return [ if (latestStableDartSdkVersion != null && - // TODO: remove after 3.6 SDK is released - !latestStableDartSdkVersion.startsWith('3.5.') && latestStableFlutterSdkVersion != null) _SdkBundle( channel: 'stable', diff --git a/pubspec.lock b/pubspec.lock index 2c2874f906..c62d98b48c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,23 +13,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "73.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.11.0" appengine: dependency: transitive description: @@ -498,10 +498,10 @@ packages: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" mailer: dependency: transitive description: From 852c9d445106a185afe9b44f4126d697a6fb1ed1 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Thu, 12 Dec 2024 16:54:06 +0100 Subject: [PATCH 2/5] Upgrade CI --- .github/workflows/dart.yml | 232 +++++++++++++-------------- app/mono_pkg.yaml | 2 +- pkg/_popularity/mono_pkg.yaml | 2 +- pkg/_pub_shared/mono_pkg.yaml | 2 +- pkg/api_builder/mono_pkg.yaml | 2 +- pkg/fake_gcloud/mono_pkg.yaml | 2 +- pkg/indexed_blob/mono_pkg.yaml | 2 +- pkg/pub_integration/mono_pkg.yaml | 2 +- pkg/pub_package_reader/mono_pkg.yaml | 2 +- pkg/pub_worker/mono_pkg.yaml | 2 +- pkg/web_app/mono_pkg.yaml | 2 +- pkg/web_css/mono_pkg.yaml | 2 +- 12 files changed, 127 insertions(+), 127 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index afdf340659..e710126e91 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -47,16 +47,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app-pkg/_popularity-pkg/_pub_shared-pkg/api_builder-pkg/fake_gcloud-pkg/pub_package_reader-pkg/web_app-pkg/web_css;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app-pkg/_popularity-pkg/_pub_shared-pkg/api_builder-pkg/fake_gcloud-pkg/pub_package_reader-pkg/web_app-pkg/web_css;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app-pkg/_popularity-pkg/_pub_shared-pkg/api_builder-pkg/fake_gcloud-pkg/pub_package_reader-pkg/web_app-pkg/web_css - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app-pkg/_popularity-pkg/_pub_shared-pkg/api_builder-pkg/fake_gcloud-pkg/pub_package_reader-pkg/web_app-pkg/web_css + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -172,16 +172,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/indexed_blob;commands:format-analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/indexed_blob;commands:format-analyze_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/indexed_blob - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/indexed_blob + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -206,16 +206,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration;commands:format-analyze_2-analyze_3" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration;commands:format-analyze_2-analyze_3" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -244,16 +244,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker;commands:format-analyze_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker;commands:format-analyze_4" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -278,16 +278,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_app;commands:command_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_app;commands:command_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -314,16 +314,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_css;commands:command_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_css;commands:command_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_css - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_css + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -350,16 +350,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_00" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_00" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -392,16 +392,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_01" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -435,16 +435,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_02" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_02" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -478,16 +478,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_03" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_03" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -521,16 +521,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -564,16 +564,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_05" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_05" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -607,16 +607,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_06" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_06" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -650,16 +650,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_07" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_07" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -693,16 +693,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app;commands:command_0-test_08" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app;commands:command_0-test_08" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -736,16 +736,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/_popularity;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/_popularity;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/_popularity - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/_popularity + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -775,16 +775,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/_pub_shared;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/_pub_shared;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/_pub_shared - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/_pub_shared + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -814,16 +814,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/fake_gcloud;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/fake_gcloud;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/fake_gcloud - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/fake_gcloud + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -853,16 +853,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/indexed_blob;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/indexed_blob;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/indexed_blob - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/indexed_blob + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -892,16 +892,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_package_reader;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_package_reader;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_package_reader - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_package_reader + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -931,16 +931,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_app;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_app;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_app - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_app + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -970,16 +970,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_css;commands:test_09" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_css;commands:test_09" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/web_css - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/web_css + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1009,16 +1009,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration;commands:test_10" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration;commands:test_10" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1048,16 +1048,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration;commands:test_11" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration;commands:test_11" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1087,16 +1087,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration;commands:test_12" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration;commands:test_12" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1126,16 +1126,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration;commands:test_13" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration;commands:test_13" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_integration - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_integration + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1165,16 +1165,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker;commands:test_14" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker;commands:test_14" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1204,16 +1204,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker;commands:test_15" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker;commands:test_15" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -1243,16 +1243,16 @@ jobs: uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker;commands:test_16" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker;commands:test_16" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkg/pub_worker - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:pkg/pub_worker + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c diff --git a/app/mono_pkg.yaml b/app/mono_pkg.yaml index 28d892f8fa..0fa3921444 100644 --- a/app/mono_pkg.yaml +++ b/app/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://github.com/dart-lang/mono_repo for details sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/_popularity/mono_pkg.yaml b/pkg/_popularity/mono_pkg.yaml index f17c8aa09a..dbe06f875d 100644 --- a/pkg/_popularity/mono_pkg.yaml +++ b/pkg/_popularity/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://github.com/dart-lang/mono_repo for details sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/_pub_shared/mono_pkg.yaml b/pkg/_pub_shared/mono_pkg.yaml index f17c8aa09a..dbe06f875d 100644 --- a/pkg/_pub_shared/mono_pkg.yaml +++ b/pkg/_pub_shared/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://github.com/dart-lang/mono_repo for details sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/api_builder/mono_pkg.yaml b/pkg/api_builder/mono_pkg.yaml index 87bc7a4f6b..c6c717d3d6 100644 --- a/pkg/api_builder/mono_pkg.yaml +++ b/pkg/api_builder/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://github.com/dart-lang/mono_repo for details sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/fake_gcloud/mono_pkg.yaml b/pkg/fake_gcloud/mono_pkg.yaml index bb984fdc89..f3dda8db35 100644 --- a/pkg/fake_gcloud/mono_pkg.yaml +++ b/pkg/fake_gcloud/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/indexed_blob/mono_pkg.yaml b/pkg/indexed_blob/mono_pkg.yaml index 97f0a127da..a9f75fd170 100644 --- a/pkg/indexed_blob/mono_pkg.yaml +++ b/pkg/indexed_blob/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/pub_integration/mono_pkg.yaml b/pkg/pub_integration/mono_pkg.yaml index b982397504..f66f131b55 100644 --- a/pkg/pub_integration/mono_pkg.yaml +++ b/pkg/pub_integration/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/pub_package_reader/mono_pkg.yaml b/pkg/pub_package_reader/mono_pkg.yaml index bb984fdc89..f3dda8db35 100644 --- a/pkg/pub_package_reader/mono_pkg.yaml +++ b/pkg/pub_package_reader/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/pub_worker/mono_pkg.yaml b/pkg/pub_worker/mono_pkg.yaml index ef67130160..26e85cf8df 100644 --- a/pkg/pub_worker/mono_pkg.yaml +++ b/pkg/pub_worker/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/web_app/mono_pkg.yaml b/pkg/web_app/mono_pkg.yaml index 9e9bf0eebd..51f2e7ecf3 100644 --- a/pkg/web_app/mono_pkg.yaml +++ b/pkg/web_app/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: diff --git a/pkg/web_css/mono_pkg.yaml b/pkg/web_css/mono_pkg.yaml index 9e9bf0eebd..51f2e7ecf3 100644 --- a/pkg/web_css/mono_pkg.yaml +++ b/pkg/web_css/mono_pkg.yaml @@ -1,6 +1,6 @@ # See https://pub.dev/packages/mono_repo for details on this file sdk: - - 3.5.0 + - 3.6.0 stages: - smoke_test: From c856835c5c1c7ed20d1b490621aa3efca94930ab Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Thu, 12 Dec 2024 17:01:02 +0100 Subject: [PATCH 3/5] Remove unused variable --- pkg/pub_worker/lib/src/bin/pana_wrapper.dart | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart index 35b5660599..25743e3c09 100644 --- a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart +++ b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart @@ -17,7 +17,6 @@ import 'package:pub_semver/pub_semver.dart'; import 'package:pub_worker/src/bin/dartdoc_wrapper.dart'; import 'package:pub_worker/src/sdks.dart'; import 'package:pub_worker/src/utils.dart'; -import 'package:pubspec_parse/pubspec_parse.dart' as pubspek; import 'package:retry/retry.dart'; final _log = Logger('pana'); @@ -219,8 +218,6 @@ Future<({String configKind, String? dartSdkPath, String? flutterSdkPath})> flutterSdks.firstWhereOrNull((sdk) => !sdk.version.isPreRelease) ?? flutterSdks.firstOrNull; - final minMacrosVersion = pubspec.getDependencyContraintRangeMin('macros'); - bool matchesSdks({ required Version? dart, required Version? flutter, @@ -418,17 +415,3 @@ Future> _detectSdkBundles() async { ), ]; } - -extension on Pubspec { - Version? getDependencyContraintRangeMin(String package) { - final dep = dependencies[package] ?? devDependencies[package]; - if (dep is! pubspek.HostedDependency) { - return null; - } - final vc = dep.version; - if (vc is! VersionRange) { - return null; - } - return vc.min; - } -} From 09a220255c2323c17d6935a699c1d319e64fd6c6 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Thu, 12 Dec 2024 17:14:51 +0100 Subject: [PATCH 4/5] Dockerfile.app --- Dockerfile.app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.app b/Dockerfile.app index e03f4869e4..fc481f07ef 100644 --- a/Dockerfile.app +++ b/Dockerfile.app @@ -1,5 +1,5 @@ # Keep version in-sync with .mono_repo.yml and app/lib/shared/versions.dart -FROM dart:3.5.0 +FROM dart:3.6.0 # After install we remove the apt-index again to keep the docker image diff small. RUN apt-get update && \ From 8be05f7b278c84b5d69dec170308ede07d4f3255 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Thu, 12 Dec 2024 17:44:33 +0100 Subject: [PATCH 5/5] Updated dartdoc page test. --- app/test/dartdoc/dartdoc_page_test.dart | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/test/dartdoc/dartdoc_page_test.dart b/app/test/dartdoc/dartdoc_page_test.dart index a056a459e8..23e52b1312 100644 --- a/app/test/dartdoc/dartdoc_page_test.dart +++ b/app/test/dartdoc/dartdoc_page_test.dart @@ -67,9 +67,7 @@ void main() { } await Directory(pubCacheDir).create(recursive: true); toolEnv = await ToolEnvironment.create( - dartdocVersion: - // TODO: clean up after 3.6 SDK is released - Platform.version.startsWith('3.5.') ? '8.1.0' : dartdocVersion, + dartdocVersion: dartdocVersion, pubCacheDir: pubCacheDir, ); await toolEnv.runUpgrade(pkgDir, false); @@ -95,6 +93,9 @@ void main() { if (file.path.endsWith('-sidebar.html')) { continue; } + if (file.path.endsWith('-library.html')) { + continue; + } if (file.path.endsWith('/search.html')) { continue; } @@ -171,7 +172,8 @@ void main() { renderedHead.childElements .firstWhereOrNull((e) => e.getAttribute('content') == 'noindex') ?.remove(); - expect(renderedHead.children, hasLength(6)); + // TODO: review if all of these can be ignored + expect(renderedHead.children, hasLength(lessThanOrEqualTo(14))); for (final c in [...renderedHead.childElements]) { c.remove(); } @@ -267,9 +269,9 @@ void main() { } } expect(processedFiles, { - 'oxygen/Oxygen-class.html', - 'oxygen/oxygen-library.html', + 'oxygen/index.html', 'oxygen/multiply.html', + 'oxygen/Oxygen-class.html', 'oxygen/Oxygen/x.html', 'oxygen/Oxygen/Oxygen.html', 'index.html',