From 0a6a7b43dcba99a09d08ca3c5bcece0ba5167ab2 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Sun, 18 Feb 2024 21:21:12 -0600 Subject: [PATCH] Tighten package and SDK version constraints as of 3.3 --- .github/workflows/dart.yml | 49 ++++++---------------- packages/analysis_defaults/pubspec.yaml | 2 +- packages/code_excerpt_updater/pubspec.yaml | 8 ++-- packages/code_excerpter/pubspec.yaml | 8 ++-- packages/inject_dartpad/pubspec.yaml | 4 +- 5 files changed, 24 insertions(+), 47 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index f4a5b50..27b1e72 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -39,23 +39,23 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyzer_and_format; Dart 3.1.0; PKGS: packages/code_excerpt_updater, packages/code_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/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@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:packages/code_excerpt_updater-packages/code_excerpter;commands:format-analyze" + 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.1.0;packages:packages/code_excerpt_updater-packages/code_excerpter - os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0 + 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 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: - sdk: "3.1.0" + sdk: "3.3.0" - id: checkout name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -85,27 +85,6 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.packages_code_excerpter_pub_upgrade.conclusion == 'success'" working-directory: packages/code_excerpter - job_003: - name: "analyzer_and_format; Dart 3.2.0; PKG: 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@13aacd865c20de90d75de3b17ebe84f7a17d57d2 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/inject_dartpad;commands:format-analyze" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/inject_dartpad - 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_inject_dartpad_pub_upgrade name: packages/inject_dartpad; dart pub upgrade run: dart pub upgrade @@ -119,7 +98,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/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -179,24 +158,24 @@ 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.1.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; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.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;commands:test" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:packages/code_excerpt_updater-packages/code_excerpter - os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0 + 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 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: - sdk: "3.1.0" + sdk: "3.3.0" - id: checkout name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -222,8 +201,7 @@ jobs: - job_001 - job_002 - job_003 - - job_004 - job_006: + job_005: name: "unit_test; Dart dev; PKGS: packages/code_excerpt_updater, packages/code_excerpter; `dart test`" runs-on: ubuntu-latest steps: @@ -266,4 +244,3 @@ jobs: - job_001 - job_002 - job_003 - - job_004 diff --git a/packages/analysis_defaults/pubspec.yaml b/packages/analysis_defaults/pubspec.yaml index bb73427..59e39b4 100644 --- a/packages/analysis_defaults/pubspec.yaml +++ b/packages/analysis_defaults/pubspec.yaml @@ -3,7 +3,7 @@ description: Analysis defaults for Dart/Flutter site tools. publish_to: none environment: - sdk: ^3.1.0 + sdk: ^3.2.0 # NOTE: Code is not allowed in this package. # Do not add dependencies besides the underlying lints package. diff --git a/packages/code_excerpt_updater/pubspec.yaml b/packages/code_excerpt_updater/pubspec.yaml index 505f2dc..254430a 100644 --- a/packages/code_excerpt_updater/pubspec.yaml +++ b/packages/code_excerpt_updater/pubspec.yaml @@ -2,17 +2,17 @@ name: code_excerpt_updater publish_to: none environment: - sdk: ^3.1.0 + sdk: ^3.3.0 dependencies: args: ^2.4.2 collection: ^1.18.0 logging: ^1.2.0 - path: ^1.8.3 + path: ^1.9.0 yaml: ^3.1.2 dev_dependencies: analysis_defaults: path: ../analysis_defaults - mockito: ^5.4.2 - test: ^1.24.8 + mockito: ^5.4.4 + test: ^1.25.2 diff --git a/packages/code_excerpter/pubspec.yaml b/packages/code_excerpter/pubspec.yaml index 4384c44..998359f 100644 --- a/packages/code_excerpter/pubspec.yaml +++ b/packages/code_excerpter/pubspec.yaml @@ -2,16 +2,16 @@ name: code_excerpter publish_to: none environment: - sdk: ^3.1.0 + sdk: ^3.3.0 dependencies: build: ^2.4.1 logging: ^1.2.0 - path: ^1.8.3 + path: ^1.9.0 yaml: ^3.1.2 dev_dependencies: analysis_defaults: path: ../analysis_defaults - build_runner: ^2.4.6 - test: ^1.24.8 + build_runner: ^2.4.8 + test: ^1.25.2 diff --git a/packages/inject_dartpad/pubspec.yaml b/packages/inject_dartpad/pubspec.yaml index 24837df..76ad400 100644 --- a/packages/inject_dartpad/pubspec.yaml +++ b/packages/inject_dartpad/pubspec.yaml @@ -2,7 +2,7 @@ name: inject_dartpad publish_to: none environment: - sdk: ^3.2.0 + sdk: ^3.3.0 dependencies: html_unescape: ^2.0.0 @@ -14,5 +14,5 @@ dev_dependencies: build_runner: ^2.4.8 build_web_compilers: ^4.0.9 path: ^1.9.0 - test: ^1.25.1 + test: ^1.25.2 webdev: any