Skip to content

Commit 1275d4c

Browse files
authored
Bump deps for graphs, html, process, pubspec_parse (#2210)
1 parent 8b9a48c commit 1275d4c

File tree

17 files changed

+328
-395
lines changed

17 files changed

+328
-395
lines changed

.github/workflows/html.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
os: [ubuntu-latest]
48-
sdk: [3.2, stable, dev]
48+
sdk: [3.6, stable, dev]
4949
steps:
5050
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
5151
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c

.github/workflows/pubspec_parse.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
os: [ubuntu-latest]
57-
sdk: [3.6, dev]
57+
sdk: [3.8, dev]
5858
steps:
5959
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
6060
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c

pkgs/graphs/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ dev_dependencies:
1515
test: ^1.21.6
1616

1717
# For examples
18-
analyzer: '>=5.2.0 <8.0.0'
18+
analyzer: '>=5.2.0 <9.0.0'
1919
path: ^1.8.0
2020
pool: ^1.5.0

pkgs/html/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.15.7-wip
2+
3+
- Require Dart `3.6`
4+
15
## 0.15.6
26

37
- Performance improvements.

pkgs/html/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: html
2-
version: 0.15.6
2+
version: 0.15.7-wip
33
description: APIs for parsing and manipulating HTML content outside the browser.
44
repository: https://github.com/dart-lang/tools/tree/main/pkgs/html
55
issue_tracker: https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ahtml
@@ -9,14 +9,14 @@ topics:
99
- web
1010

1111
environment:
12-
sdk: ^3.2.0
12+
sdk: ^3.6.0
1313

1414
dependencies:
1515
csslib: ^1.0.0
1616
source_span: ^1.8.0
1717

1818
dev_dependencies:
1919
dart_flutter_team_lints: ^3.0.0
20-
dart_style: ^2.3.6
20+
dart_style: ^3.0.0
2121
path: ^1.8.0
2222
test: ^1.16.6

pkgs/html/tool/generate_trie.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ void main() {
1717
'''// AUTO GENERATED by 'tool/generate_trie.dart'. DO NOT EDIT!\n'''
1818
'const entitiesTrieRoot = $root;'
1919
.replaceAll('{}', '<int, dynamic>{}');
20-
final formatted = DartFormatter().format(source);
20+
final formatted = DartFormatter(
21+
languageVersion: DartFormatter.latestShortStyleLanguageVersion)
22+
.format(source);
2123
final htmlDir = File(Platform.script.path).parent.parent;
2224
File(join(htmlDir.path, 'lib', 'src', 'trie.dart'))
2325
.writeAsStringSync(formatted);

pkgs/process/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ dependencies:
1616
platform: '^3.0.0'
1717

1818
dev_dependencies:
19-
lints: ^5.0.0
19+
lints: ^6.0.0
2020
test: ^1.16.8

pkgs/pubspec_parse/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.5.1-wip
2+
3+
- Require Dart 3.8
4+
15
## 1.5.0
26

37
- Added fields to `Pubspec`: `executables`, `resolution`, `workspace`.

pkgs/pubspec_parse/lib/src/dependency.dart

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@ Dependency? _fromJson(Object? data, String name) {
4646
}
4747

4848
if (data is Map) {
49-
final matchedKeys =
50-
data.keys.cast<String>().where((key) => key != 'version').toList();
49+
final matchedKeys = data.keys
50+
.cast<String>()
51+
.where((key) => key != 'version')
52+
.toList();
5153

5254
if (data.isEmpty || (matchedKeys.isEmpty && data.containsKey('version'))) {
5355
return _$HostedDependencyFromJson(data);
5456
} else {
55-
final firstUnrecognizedKey =
56-
matchedKeys.firstWhereOrNull((k) => !_sourceKeys.contains(k));
57+
final firstUnrecognizedKey = matchedKeys.firstWhereOrNull(
58+
(k) => !_sourceKeys.contains(k),
59+
);
5760

5861
return $checkedNew<Dependency>('Dependency', data, () {
5962
if (firstUnrecognizedKey != null) {
@@ -78,8 +81,9 @@ Dependency? _fromJson(Object? data, String name) {
7881
'git' => GitDependency.fromData(data[key]),
7982
'path' => PathDependency.fromData(data[key]),
8083
'sdk' => _$SdkDependencyFromJson(data),
81-
'hosted' => _$HostedDependencyFromJson(data)
82-
..hosted?._nameOfPackage = name,
84+
'hosted' => _$HostedDependencyFromJson(
85+
data,
86+
)..hosted?._nameOfPackage = name,
8387
_ => throw StateError('There is a bug in pubspec_parse.'),
8488
};
8589
});
@@ -99,7 +103,7 @@ class SdkDependency extends Dependency {
99103
final VersionConstraint version;
100104

101105
SdkDependency(this.sdk, {VersionConstraint? version})
102-
: version = version ?? VersionConstraint.any;
106+
: version = version ?? VersionConstraint.any;
103107

104108
@override
105109
bool operator ==(Object other) =>
@@ -215,7 +219,7 @@ class HostedDependency extends Dependency {
215219
final HostedDetails? hosted;
216220

217221
HostedDependency({VersionConstraint? version, this.hosted})
218-
: version = version ?? VersionConstraint.any;
222+
: version = version ?? VersionConstraint.any;
219223

220224
@override
221225
bool operator ==(Object other) =>

pkgs/pubspec_parse/lib/src/dependency.g.dart

Lines changed: 52 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)