Skip to content

Commit 8d438cb

Browse files
authored
Update to use and analyze with 3.5 language version (#8041)
* Update to 3.5 language version * Revert runtime SDK change
1 parent 94a74a3 commit 8d438cb

File tree

35 files changed

+43
-46
lines changed

35 files changed

+43
-46
lines changed

.github/workflows/dart.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v6.6.1
1+
# Created with package:mono_repo v6.6.2
22
name: Dart CI
33
on:
44
push:
@@ -36,7 +36,7 @@ jobs:
3636
name: Checkout repository
3737
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
3838
- name: mono_repo self validate
39-
run: dart pub global activate mono_repo 6.6.1
39+
run: dart pub global activate mono_repo 6.6.2
4040
- name: mono_repo self validate
4141
run: dart pub global run mono_repo generate --validate
4242
job_002:

analysis_options.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ analyzer:
99
linter:
1010
rules:
1111
- always_declare_return_types
12-
- always_require_non_null_named_parameters
1312
- annotate_overrides
1413
- avoid_empty_else
1514
- avoid_init_to_null
@@ -50,7 +49,6 @@ linter:
5049
- prefer_collection_literals
5150
- prefer_conditional_assignment
5251
- prefer_contains
53-
- prefer_equal_for_default_values
5452
- prefer_final_fields
5553
- prefer_final_locals
5654
- prefer_for_elements_to_map_fromIterable

app/lib/fake/backend/fake_email_sender.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class FakeEmailSender implements EmailSender {
3636
sentMessages.add(message);
3737
if (_outputDir != null) {
3838
final uuid = message.localMessageId ?? Ulid().toCanonical();
39-
final file = File(p.join(_outputDir!, '$uuid.json'));
39+
final file = File(p.join(_outputDir, '$uuid.json'));
4040
await file.parent.create(recursive: true);
4141
await file.writeAsString(json.encode(message.toJson()));
4242
}

app/lib/frontend/dom/dom.dart

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,19 +1036,18 @@ class _StringElement extends _StringNode {
10361036
final Map<String, String>? _attributes;
10371037
final Object? _children;
10381038

1039-
_StringElement(this._tag, this._attributes, this._children) {
1040-
assert(_children == null ||
1041-
_children is _StringNode ||
1042-
(_children is Iterable<Node> &&
1043-
(_children as Iterable<Node>).every((c) => c is _StringNode)));
1044-
}
1039+
_StringElement(this._tag, this._attributes, this._children)
1040+
: assert(_children == null ||
1041+
_children is _StringNode ||
1042+
(_children is Iterable<Node> &&
1043+
(_children).every((c) => c is _StringNode)));
10451044

10461045
@override
10471046
void writeHtml(StringSink sink) {
10481047
sink.write('<');
10491048
sink.write(_tag);
10501049
if (_attributes != null) {
1051-
for (final e in _attributes!.entries) {
1050+
for (final e in _attributes.entries) {
10521051
sink.write(' ');
10531052
sink.write(e.key);
10541053
sink.write('="');

app/lib/package/model_properties.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class Pubspec {
121121
return (minDartVersion != null &&
122122
minDartVersion.value.compareTo(dartSdkVersion) > 0) ||
123123
(_minFlutterSdkVersion != null &&
124-
_minFlutterSdkVersion!.value.compareTo(flutterSdkVersion) > 0);
124+
_minFlutterSdkVersion.value.compareTo(flutterSdkVersion) > 0);
125125
}
126126

127127
/// True if either the Dart or the Flutter SDK constraint is higher than the
@@ -144,8 +144,8 @@ class Pubspec {
144144
late final _dartSdkConstraint = _inner.environment?['sdk'];
145145
late final _flutterSdkConstraint = _inner.environment?['flutter'];
146146
late final _hasDartSdkConstraint = _dartSdkConstraint != null &&
147-
!_dartSdkConstraint!.isAny &&
148-
!_dartSdkConstraint!.isEmpty;
147+
!_dartSdkConstraint.isAny &&
148+
!_dartSdkConstraint.isEmpty;
149149

150150
SdkConstraintStatus get _sdkConstraintStatus =>
151151
SdkConstraintStatus.fromSdkVersion(_dartSdkConstraint, name);

app/lib/package/name_tracker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class NameTracker {
158158
await for (final p in _db!.query<Package>().run()) {
159159
data.add(TrackedPackage.fromPackage(p));
160160
}
161-
await for (final p in _db!.query<ModeratedPackage>().run()) {
161+
await for (final p in _db.query<ModeratedPackage>().run()) {
162162
data.addModeratedName(p.name!);
163163
}
164164
_data = data;
@@ -185,7 +185,7 @@ class NameTracker {
185185
_data.add(TrackedPackage.fromPackage(p));
186186
}
187187

188-
final moderatedPkgQuery = _db!.query<ModeratedPackage>()
188+
final moderatedPkgQuery = _db.query<ModeratedPackage>()
189189
..order('moderated')
190190
..filter('moderated >', ts);
191191

app/lib/tool/utils/http.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class _AuthenticatedClient extends http.BaseClient {
5353
}
5454
final currentCookies = request.headers['cookie'];
5555
final providedCookies =
56-
_cookieProvider == null ? null : await _cookieProvider!();
56+
_cookieProvider == null ? null : await _cookieProvider();
5757

5858
final sessionId = await _sessionIdProvider();
5959
request.headers['cookie'] = [

app/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,4 +937,4 @@ packages:
937937
source: hosted
938938
version: "2.2.1"
939939
sdks:
940-
dart: ">=3.5.0-259.0.dev <4.0.0"
940+
dart: ">=3.5.0 <4.0.0"

app/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: pub_dev
22
description: The pub.dartlang.org website.
33
environment:
4-
sdk: '^3.0.0'
4+
sdk: ^3.5.0
55
dependencies:
66
_popularity:
77
path: ../pkg/_popularity

pkg/_popularity/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,4 +559,4 @@ packages:
559559
source: hosted
560560
version: "3.1.2"
561561
sdks:
562-
dart: ">=3.5.0-259.0.dev <4.0.0"
562+
dart: ">=3.5.0 <4.0.0"

0 commit comments

Comments
 (0)