Update to Dart 3.3 to match repo

Author: parlough

.github/workflows/dart.yml

@@ -39,50 +39,16 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyzer_and_format; Dart 3.2.0; PKG: packages/excerpter; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    name: "analyzer_and_format; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter, packages/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter;commands:format-analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter-packages/inject_dartpad;commands:format-analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
-        with:
-          sdk: "3.2.0"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - id: packages_excerpter_pub_upgrade
-        name: packages/excerpter; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/excerpter
-      - name: "packages/excerpter; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/excerpter
-      - name: "packages/excerpter; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/excerpter
-  job_003:
-    name: "analyzer_and_format; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/inject_dartpad;commands:format-analyze"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/inject_dartpad
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter-packages/inject_dartpad
             os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -119,6 +85,19 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.packages_code_excerpter_pub_upgrade.conclusion == 'success'"
         working-directory: packages/code_excerpter
+      - id: packages_excerpter_pub_upgrade
+        name: packages/excerpter; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/excerpter
+      - name: "packages/excerpter; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/excerpter
+      - name: "packages/excerpter; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/excerpter
       - id: packages_inject_dartpad_pub_upgrade
         name: packages/inject_dartpad; dart pub upgrade
         run: dart pub upgrade
@@ -132,7 +111,7 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.packages_inject_dartpad_pub_upgrade.conclusion == 'success'"
         working-directory: packages/inject_dartpad
-  job_004:
+  job_003:
     name: "analyzer_and_format; Dart dev; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter, packages/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -205,52 +184,17 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.packages_inject_dartpad_pub_upgrade.conclusion == 'success'"
         working-directory: packages/inject_dartpad
-  job_005:
-    name: "unit_test; Dart 3.2.0; PKG: packages/excerpter; `dart test`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter;commands:test"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
-        with:
-          sdk: "3.2.0"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - id: packages_excerpter_pub_upgrade
-        name: packages/excerpter; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/excerpter
-      - name: packages/excerpter; dart test
-        run: dart test
-        if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/excerpter
-    needs:
-      - job_001
-      - job_002
-      - job_003
-      - job_004
-  job_006:
-    name: "unit_test; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter; `dart test`"
+  job_004:
+    name: "unit_test; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter;commands:test"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter;commands:test"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter
             os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -279,12 +223,20 @@ jobs:
         run: dart test
         if: "always() && steps.packages_code_excerpter_pub_upgrade.conclusion == 'success'"
         working-directory: packages/code_excerpter
+      - id: packages_excerpter_pub_upgrade
+        name: packages/excerpter; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/excerpter
+      - name: packages/excerpter; dart test
+        run: dart test
+        if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/excerpter
     needs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_007:
+  job_005:
     name: "unit_test; Dart dev; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -336,4 +288,3 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004

packages/excerpter/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: none
 repository: https://github.com/dart-lang/site-shared/tree/main/packages/excerpter
 
 environment:
-  sdk: ^3.2.0
+  sdk: ^3.3.0
 
 dependencies:
   args: ^2.4.2
@@ -19,7 +19,7 @@ dev_dependencies:
   analysis_defaults:
     path: ../analysis_defaults
   io: ^1.0.4
-  test: ^1.24.9
+  test: ^1.25.2
 
 executables:
   excerpter: excerpter