Skip to content

Update packages and analysis for 3.8 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Created with package:mono_repo v6.6.2
# Created with package:mono_repo v6.6.3
name: Dart CI
on:
push:
Expand Down Expand Up @@ -35,27 +35,27 @@ jobs:
name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: mono_repo self validate
run: dart pub global activate mono_repo 6.6.2
run: dart pub global activate mono_repo 6.6.3
- name: mono_repo self validate
run: dart pub global run mono_repo generate --validate
job_002:
name: "analyzer_and_format; Dart 3.7.0; PKGS: pkgs/analysis_defaults, pkgs/dash_design, pkgs/excerpter, pkgs/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
name: "analyzer_and_format; Dart 3.8.0; PKGS: pkgs/analysis_defaults, pkgs/dash_design, pkgs/excerpter, pkgs/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@5a3ec84eff668545956fd18022155c47e93e2684
with:
path: "~/.pub-cache/hosted"
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad;commands:format-analyze"
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad;commands:format-analyze"
restore-keys: |
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
- name: Setup Dart SDK
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
with:
sdk: "3.7.0"
sdk: "3.8.0"
- id: checkout
name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down Expand Up @@ -185,23 +185,23 @@ jobs:
if: "always() && steps.pkgs_inject_dartpad_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/inject_dartpad
job_004:
name: "unit_test; Dart 3.7.0; PKG: pkgs/excerpter; `dart test`"
name: "unit_test; Dart 3.8.0; PKG: pkgs/excerpter; `dart test`"
runs-on: ubuntu-latest
steps:
- name: Cache Pub hosted dependencies
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
with:
path: "~/.pub-cache/hosted"
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/excerpter;commands:test"
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/excerpter;commands:test"
restore-keys: |
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/excerpter
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/excerpter
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
- name: Setup Dart SDK
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
with:
sdk: "3.7.0"
sdk: "3.8.0"
- id: checkout
name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
8 changes: 4 additions & 4 deletions pkgs/analysis_defaults/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description: Analysis defaults for Dart/Flutter site tools.
publish_to: none

environment:
sdk: ^3.7.0
sdk: ^3.8.0

# NOTE: Code is not allowed in this package.
# Do not add dependencies besides the underlying lints package.
# NOTE: Code isn't allowed in this package.
# Don't add dependencies besides the underlying lints package.
dependencies:
dart_flutter_team_lints: ^3.4.0
dart_flutter_team_lints: ^3.5.2
6 changes: 3 additions & 3 deletions pkgs/dash_design/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ publish_to: none
repository: https://github.com/dart-lang/site-shared/tree/main/pkgs/dash_design

environment:
sdk: ^3.7.0
sdk: ^3.8.0

dev_dependencies:
analysis_defaults:
path: ../analysis_defaults
path: ^1.9.0
sass: ^1.79.4
test: ^1.25.8
sass: ^1.86.0
test: ^1.25.9
87 changes: 42 additions & 45 deletions pkgs/excerpter/bin/excerpter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ Future<void> runExcerpter(final List<String> arguments) async {
}
final updatePath = path.absolute(results.rest.first);

final replaceTransforms =
replaceInstructions == null
? const <ReplaceTransform>[]
: stringToReplaceTransforms(
replaceInstructions,
(e) => _printUsageAndExit(message: e),
);
final replaceTransforms = replaceInstructions == null
? const <ReplaceTransform>[]
: stringToReplaceTransforms(
replaceInstructions,
(e) => _printUsageAndExit(message: e),
);

final updater = Updater(
baseSourcePath: baseSourcePath,
Expand Down Expand Up @@ -85,44 +84,42 @@ Future<void> runExcerpter(final List<String> arguments) async {
}
}

final _argParser =
ArgParser()
..addFlag(
_dryRunFlag,
negatable: false,
help:
'If the updater should only report if excerpts need to be updated.',
)
..addFlag(
_failOnUpdateFlag,
negatable: false,
help:
'Report a non-zero exit code if '
'an excerpt is or needs to be updated.',
)
..addMultiOption(
_excludeOption,
help:
'Regular expressions of paths to exclude when '
'processing a directory recursively.\n'
'Dot files and directories are always excluded.',
)
..addOption(
_baseSourcePathOption,
help:
'The path to the directory containing the source files that '
'excerpt regions should be retrieved from.',
)
..addOption(
_plasterContentOption,
help: 'The default plaster content, such as "..." or "···".',
)
..addOption(
_replaceOption,
help:
'A replacement to run on every excerpt.\n'
'Refer to the package docs for syntax help.',
);
final _argParser = ArgParser()
..addFlag(
_dryRunFlag,
negatable: false,
help: 'If the updater should only report if excerpts need to be updated.',
)
..addFlag(
_failOnUpdateFlag,
negatable: false,
help:
'Report a non-zero exit code if '
'an excerpt is or needs to be updated.',
)
..addMultiOption(
_excludeOption,
help:
'Regular expressions of paths to exclude when '
'processing a directory recursively.\n'
'Dot files and directories are always excluded.',
)
..addOption(
_baseSourcePathOption,
help:
'The path to the directory containing the source files that '
'excerpt regions should be retrieved from.',
)
..addOption(
_plasterContentOption,
help: 'The default plaster content, such as "..." or "···".',
)
..addOption(
_replaceOption,
help:
'A replacement to run on every excerpt.\n'
'Refer to the package docs for syntax help.',
);

/// Print the usage information for this command,
/// optionally with the specified error [message] and [exitCode],
Expand Down
12 changes: 6 additions & 6 deletions pkgs/excerpter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ publish_to: none
repository: https://github.com/dart-lang/site-shared/tree/main/pkgs/excerpter

environment:
sdk: ^3.7.0
sdk: ^3.8.0

dependencies:
args: ^2.4.2
collection: ^1.18.0
args: ^2.6.0
collection: ^1.19.0
file: ^7.0.0
glob: ^2.1.2
meta: ^1.14.0
meta: ^1.15.0
path: ^1.9.0

dev_dependencies:
analysis_defaults:
path: ../analysis_defaults
io: ^1.0.4
test: ^1.25.2
io: ^1.0.5
test: ^1.25.9

executables:
excerpter: excerpter
Loading