Skip to content

Commit 4d93509

Browse files
parloughparlough
authored
Update packages and analysis for 3.8 (#242)
1 parent 6231834 commit 4d93509

File tree

9 files changed

+388
-460
lines changed

9 files changed

+388
-460
lines changed

‎.github/workflows/dart.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v6.6.2
1+
# Created with package:mono_repo v6.6.3
22
name: Dart CI
33
on:
44
push:
@@ -35,27 +35,27 @@ jobs:
3535
name: Checkout repository
3636
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3737
- name: mono_repo self validate
38-
run: dart pub global activate mono_repo 6.6.2
38+
run: dart pub global activate mono_repo 6.6.3
3939
- name: mono_repo self validate
4040
run: dart pub global run mono_repo generate --validate
4141
job_002:
42-
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 .`"
42+
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 .`"
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Cache Pub hosted dependencies
4646
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
4747
with:
4848
path: "~/.pub-cache/hosted"
49-
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"
49+
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"
5050
restore-keys: |
51-
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
51+
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/analysis_defaults-pkgs/dash_design-pkgs/excerpter-pkgs/inject_dartpad
52+
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
5353
os:ubuntu-latest;pub-cache-hosted
5454
os:ubuntu-latest
5555
- name: Setup Dart SDK
5656
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
5757
with:
58-
sdk: "3.7.0"
58+
sdk: "3.8.0"
5959
- id: checkout
6060
name: Checkout repository
6161
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -185,23 +185,23 @@ jobs:
185185
if: "always() && steps.pkgs_inject_dartpad_pub_upgrade.conclusion == 'success'"
186186
working-directory: pkgs/inject_dartpad
187187
job_004:
188-
name: "unit_test; Dart 3.7.0; PKG: pkgs/excerpter; `dart test`"
188+
name: "unit_test; Dart 3.8.0; PKG: pkgs/excerpter; `dart test`"
189189
runs-on: ubuntu-latest
190190
steps:
191191
- name: Cache Pub hosted dependencies
192192
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
193193
with:
194194
path: "~/.pub-cache/hosted"
195-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/excerpter;commands:test"
195+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/excerpter;commands:test"
196196
restore-keys: |
197-
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/excerpter
198-
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
197+
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:pkgs/excerpter
198+
os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
199199
os:ubuntu-latest;pub-cache-hosted
200200
os:ubuntu-latest
201201
- name: Setup Dart SDK
202202
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
203203
with:
204-
sdk: "3.7.0"
204+
sdk: "3.8.0"
205205
- id: checkout
206206
name: Checkout repository
207207
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

‎pkgs/analysis_defaults/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ description: Analysis defaults for Dart/Flutter site tools.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.7.0
6+
sdk: ^3.8.0
77

8-
# NOTE: Code is not allowed in this package.
9-
# Do not add dependencies besides the underlying lints package.
8+
# NOTE: Code isn't allowed in this package.
9+
# Don't add dependencies besides the underlying lints package.
1010
dependencies:
11-
dart_flutter_team_lints: ^3.4.0
11+
dart_flutter_team_lints: ^3.5.2

‎pkgs/dash_design/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ publish_to: none
55
repository: https://github.com/dart-lang/site-shared/tree/main/pkgs/dash_design
66

77
environment:
8-
sdk: ^3.7.0
8+
sdk: ^3.8.0
99

1010
dev_dependencies:
1111
analysis_defaults:
1212
path: ../analysis_defaults
1313
path: ^1.9.0
14-
sass: ^1.79.4
15-
test: ^1.25.8
14+
sass: ^1.86.0
15+
test: ^1.25.9

‎pkgs/excerpter/bin/excerpter.dart

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ Future<void> runExcerpter(final List<String> arguments) async {
3737
}
3838
final updatePath = path.absolute(results.rest.first);
3939

40-
final replaceTransforms =
41-
replaceInstructions == null
42-
? const <ReplaceTransform>[]
43-
: stringToReplaceTransforms(
44-
replaceInstructions,
45-
(e) => _printUsageAndExit(message: e),
46-
);
40+
final replaceTransforms = replaceInstructions == null
41+
? const <ReplaceTransform>[]
42+
: stringToReplaceTransforms(
43+
replaceInstructions,
44+
(e) => _printUsageAndExit(message: e),
45+
);
4746

4847
final updater = Updater(
4948
baseSourcePath: baseSourcePath,
@@ -85,44 +84,42 @@ Future<void> runExcerpter(final List<String> arguments) async {
8584
}
8685
}
8786

88-
final _argParser =
89-
ArgParser()
90-
..addFlag(
91-
_dryRunFlag,
92-
negatable: false,
93-
help:
94-
'If the updater should only report if excerpts need to be updated.',
95-
)
96-
..addFlag(
97-
_failOnUpdateFlag,
98-
negatable: false,
99-
help:
100-
'Report a non-zero exit code if '
101-
'an excerpt is or needs to be updated.',
102-
)
103-
..addMultiOption(
104-
_excludeOption,
105-
help:
106-
'Regular expressions of paths to exclude when '
107-
'processing a directory recursively.\n'
108-
'Dot files and directories are always excluded.',
109-
)
110-
..addOption(
111-
_baseSourcePathOption,
112-
help:
113-
'The path to the directory containing the source files that '
114-
'excerpt regions should be retrieved from.',
115-
)
116-
..addOption(
117-
_plasterContentOption,
118-
help: 'The default plaster content, such as "..." or "···".',
119-
)
120-
..addOption(
121-
_replaceOption,
122-
help:
123-
'A replacement to run on every excerpt.\n'
124-
'Refer to the package docs for syntax help.',
125-
);
87+
final _argParser = ArgParser()
88+
..addFlag(
89+
_dryRunFlag,
90+
negatable: false,
91+
help: 'If the updater should only report if excerpts need to be updated.',
92+
)
93+
..addFlag(
94+
_failOnUpdateFlag,
95+
negatable: false,
96+
help:
97+
'Report a non-zero exit code if '
98+
'an excerpt is or needs to be updated.',
99+
)
100+
..addMultiOption(
101+
_excludeOption,
102+
help:
103+
'Regular expressions of paths to exclude when '
104+
'processing a directory recursively.\n'
105+
'Dot files and directories are always excluded.',
106+
)
107+
..addOption(
108+
_baseSourcePathOption,
109+
help:
110+
'The path to the directory containing the source files that '
111+
'excerpt regions should be retrieved from.',
112+
)
113+
..addOption(
114+
_plasterContentOption,
115+
help: 'The default plaster content, such as "..." or "···".',
116+
)
117+
..addOption(
118+
_replaceOption,
119+
help:
120+
'A replacement to run on every excerpt.\n'
121+
'Refer to the package docs for syntax help.',
122+
);
126123

127124
/// Print the usage information for this command,
128125
/// optionally with the specified error [message] and [exitCode],

‎pkgs/excerpter/pubspec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ publish_to: none
55
repository: https://github.com/dart-lang/site-shared/tree/main/pkgs/excerpter
66

77
environment:
8-
sdk: ^3.7.0
8+
sdk: ^3.8.0
99

1010
dependencies:
11-
args: ^2.4.2
12-
collection: ^1.18.0
11+
args: ^2.6.0
12+
collection: ^1.19.0
1313
file: ^7.0.0
1414
glob: ^2.1.2
15-
meta: ^1.14.0
15+
meta: ^1.15.0
1616
path: ^1.9.0
1717

1818
dev_dependencies:
1919
analysis_defaults:
2020
path: ../analysis_defaults
21-
io: ^1.0.4
22-
test: ^1.25.2
21+
io: ^1.0.5
22+
test: ^1.25.9
2323

2424
executables:
2525
excerpter: excerpter

0 commit comments

Comments
 (0)