Skip to content

Commit 14e884e

Browse files
kevmookevmoo
committed
update lints dependency
Bump min Dart SDK
1 parent d9f82bf commit 14e884e

File tree

22 files changed

+54
-48
lines changed

22 files changed

+54
-48
lines changed

‎.github/workflows/dart.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ jobs:
4040
- name: mono_repo self validate
4141
run: dart pub global run mono_repo generate --validate
4242
job_002:
43-
name: "analyze_and_format; linux; Dart 3.0.0; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`"
43+
name: "analyze_and_format; linux; Dart 3.3.0; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`"
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Cache Pub hosted dependencies
4747
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
4848
with:
4949
path: "~/.pub-cache/hosted"
50-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze"
50+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze"
5151
restore-keys: |
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket
53-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
52+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket
53+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
5454
os:ubuntu-latest;pub-cache-hosted
5555
os:ubuntu-latest
5656
- name: Setup Dart SDK
5757
uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
5858
with:
59-
sdk: "3.0.0"
59+
sdk: "3.3.0"
6060
- id: checkout
6161
name: Checkout repository
6262
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
@@ -319,23 +319,23 @@ jobs:
319319
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
320320
working-directory: pkgs/shelf_web_socket
321321
job_005:
322-
name: "unit_test; linux; Dart 3.0.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
322+
name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
323323
runs-on: ubuntu-latest
324324
steps:
325325
- name: Cache Pub hosted dependencies
326326
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
327327
with:
328328
path: "~/.pub-cache/hosted"
329-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1"
329+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1"
330330
restore-keys: |
331-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_test_handler
332-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
331+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf-pkgs/shelf_test_handler
332+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
333333
os:ubuntu-latest;pub-cache-hosted
334334
os:ubuntu-latest
335335
- name: Setup Dart SDK
336336
uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
337337
with:
338-
sdk: "3.0.0"
338+
sdk: "3.3.0"
339339
- id: checkout
340340
name: Checkout repository
341341
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
@@ -363,23 +363,23 @@ jobs:
363363
- job_003
364364
- job_004
365365
job_006:
366-
name: "unit_test; linux; Dart 3.0.0; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
366+
name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
367367
runs-on: ubuntu-latest
368368
steps:
369369
- name: Cache Pub hosted dependencies
370370
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
371371
with:
372372
path: "~/.pub-cache/hosted"
373-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0"
373+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0"
374374
restore-keys: |
375-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket
376-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
375+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket
376+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
377377
os:ubuntu-latest;pub-cache-hosted
378378
os:ubuntu-latest
379379
- name: Setup Dart SDK
380380
uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
381381
with:
382-
sdk: "3.0.0"
382+
sdk: "3.3.0"
383383
- id: checkout
384384
name: Checkout repository
385385
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
@@ -682,13 +682,13 @@ jobs:
682682
- job_003
683683
- job_004
684684
job_011:
685-
name: "unit_test; windows; Dart 3.0.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
685+
name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
686686
runs-on: windows-latest
687687
steps:
688688
- name: Setup Dart SDK
689689
uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
690690
with:
691-
sdk: "3.0.0"
691+
sdk: "3.3.0"
692692
- id: checkout
693693
name: Checkout repository
694694
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
@@ -716,13 +716,13 @@ jobs:
716716
- job_003
717717
- job_004
718718
job_012:
719-
name: "unit_test; windows; Dart 3.0.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
719+
name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
720720
runs-on: windows-latest
721721
steps:
722722
- name: Setup Dart SDK
723723
uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
724724
with:
725-
sdk: "3.0.0"
725+
sdk: "3.3.0"
726726
- id: checkout
727727
name: Checkout repository
728728
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b

‎pkgs/shelf/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 1.4.2-wip
22

3-
* Require Dart ^3.0.0
3+
* Require Dart `^3.3.0`.
44

55
## 1.4.1
66

‎pkgs/shelf/lib/src/cascade.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Cascade {
7373

7474
return (request) {
7575
if (_parent!._handler == null) return handler(request);
76-
return Future.sync(() => _parent!.handler(request)).then((response) {
76+
return Future.sync(() => _parent.handler(request)).then((response) {
7777
if (_shouldCascade(response)) return handler(request);
7878
return response;
7979
});

‎pkgs/shelf/lib/src/request.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Request extends Message {
6060
///
6161
/// This will be `false` either if the adapter doesn't support hijacking, or
6262
/// if the request has already been hijacked.
63-
bool get canHijack => _onHijack != null && !_onHijack!.called;
63+
bool get canHijack => _onHijack != null && !_onHijack.called;
6464

6565
/// If this is non-`null` and the requested resource hasn't been modified
6666
/// since this date and time, the server should return a 304 Not Modified
@@ -280,7 +280,7 @@ class Request extends Message {
280280
throw StateError("This request can't be hijacked.");
281281
}
282282

283-
_onHijack!.run(callback);
283+
_onHijack.run(callback);
284284

285285
throw const HijackException();
286286
}

‎pkgs/shelf/lib/src/server_handler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class _HandlerServer implements Server {
8989

9090
@override
9191
Future<void> close() => _closeMemo.runOnce(() {
92-
return _onClose == null ? null : _onClose!();
92+
return _onClose == null ? null : _onClose();
9393
});
9494
final _closeMemo = AsyncMemoizer<void>();
9595
}

‎pkgs/shelf/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ topics:
1010
- backend
1111

1212
environment:
13-
sdk: ^3.0.0
13+
sdk: ^3.3.0
1414

1515
dependencies:
1616
async: ^2.5.0
@@ -21,6 +21,6 @@ dependencies:
2121
stream_channel: ^2.1.0
2222

2323
dev_dependencies:
24-
dart_flutter_team_lints: ^2.0.0
24+
dart_flutter_team_lints: ^3.0.0
2525
http: '>=0.13.0 <2.0.0'
2626
test: ^1.16.0

‎pkgs/shelf_packages_handler/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 3.0.3-wip
22

3-
* Require Dart `^3.0.0`
3+
* Require Dart `^3.3.0`.
44

55
## 3.0.2
66

‎pkgs/shelf_packages_handler/lib/src/package_config_handler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class PackageConfigHandler {
3636
_packageHandlers.putIfAbsent(packageName, () async {
3737
Uri? packageUri;
3838
if (_packageMap != null) {
39-
packageUri = _packageMap![packageName];
39+
packageUri = _packageMap[packageName];
4040
} else {
4141
final fakeResolvedUri = await Isolate.resolvePackageUri(
4242
Uri(scheme: 'package', path: '$packageName/'));

‎pkgs/shelf_packages_handler/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ topics:
88
- shelf
99

1010
environment:
11-
sdk: ^3.0.0
11+
sdk: ^3.3.0
1212

1313
dependencies:
1414
path: ^1.8.0
1515
shelf: ^1.0.0
1616
shelf_static: ^1.0.0
1717

1818
dev_dependencies:
19-
dart_flutter_team_lints: ^2.0.0
19+
dart_flutter_team_lints: ^3.0.0
2020
test: ^1.16.0

‎pkgs/shelf_proxy/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 1.0.5-wip
22

3-
* Require Dart `^3.0.0`
3+
* Require Dart `^3.3.0`.
44

55
## 1.0.4
66

‎pkgs/shelf_proxy/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ topics:
88
- shelf
99

1010
environment:
11-
sdk: ^3.0.0
11+
sdk: ^3.3.0
1212

1313
dependencies:
1414
http: '>=0.13.0 <2.0.0'
1515
path: ^1.8.0
1616
shelf: ^1.0.0
1717

1818
dev_dependencies:
19-
dart_flutter_team_lints: ^2.0.0
19+
dart_flutter_team_lints: ^3.0.0
2020
test: ^1.6.0

‎pkgs/shelf_router/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 1.1.5-wip
22

3-
* Require Dart `^3.0.0`.
3+
* Require Dart `^3.3.0`.
44

55
## 1.1.4
66

‎pkgs/shelf_router/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ topics:
1010
- shelf
1111

1212
environment:
13-
sdk: ^3.0.0
13+
sdk: ^3.3.0
1414

1515
dependencies:
1616
http_methods: ^1.1.0
1717
meta: ^1.3.0
1818
shelf: ^1.0.0
1919

2020
dev_dependencies:
21-
dart_flutter_team_lints: ^2.0.0
21+
dart_flutter_team_lints: ^3.0.0
2222
http: '>=0.13.0 <2.0.0'
2323
test: ^1.16.0

‎pkgs/shelf_router_generator/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.1.1-wip
2+
3+
* Require `sdk: ^3.3.0`
4+
15
## 1.1.0
26

37
* Require `sdk: ^3.0.0`

‎pkgs/shelf_router_generator/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ topics:
1010
- shelf
1111

1212
environment:
13-
sdk: ^3.0.0
13+
sdk: ^3.3.0
1414

1515
dependencies:
1616
analyzer: '>=4.6.0 <7.0.0'
@@ -25,6 +25,6 @@ dependencies:
2525
dev_dependencies:
2626
build_runner: ^2.0.0
2727
build_verify: ^3.0.0
28-
dart_flutter_team_lints: ^2.0.0
28+
dart_flutter_team_lints: ^3.0.0
2929
http: '>=0.13.0 <2.0.0'
3030
test: ^1.5.3

‎pkgs/shelf_static/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 1.1.3-wip
22

3-
* Require Dart `^3.0.0`.
3+
* Require Dart `^3.3.0`.
44

55
## 1.1.2
66

‎pkgs/shelf_static/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ topics:
88
- shelf
99

1010
environment:
11-
sdk: ^3.0.0
11+
sdk: ^3.3.0
1212

1313
dependencies:
1414
convert: ^3.0.0
@@ -20,6 +20,6 @@ dependencies:
2020

2121
dev_dependencies:
2222
args: ^2.0.0
23-
dart_flutter_team_lints: ^2.0.0
23+
dart_flutter_team_lints: ^3.0.0
2424
test: ^1.16.0
2525
test_descriptor: ^2.0.0

‎pkgs/shelf_test_handler/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 2.0.3-wip
22

3-
* Require Dart `^3.0.0`.
3+
* Require Dart `^3.3.0`.
44

55
## 2.0.2
66

‎pkgs/shelf_test_handler/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ topics:
88
- shelf
99

1010
environment:
11-
sdk: ^3.0.0
11+
sdk: ^3.3.0
1212

1313
dependencies:
1414
http_multi_server: ^3.0.0
1515
shelf: ^1.0.0
1616
test: ^1.16.0
1717

1818
dev_dependencies:
19-
dart_flutter_team_lints: ^2.0.0
19+
dart_flutter_team_lints: ^3.0.0
2020
http: '>=0.13.0 <2.0.0'
2121
shelf_web_socket: ^1.0.0
2222
web_socket_channel: ^2.0.0

‎pkgs/shelf_web_socket/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## 2.0.1-wip
22

3+
* Require Dart `^3.3.0`.
4+
35
## 2.0.0
46

57
* Require Dart `^3.0.0`.

‎pkgs/shelf_web_socket/lib/src/web_socket_handler.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class WebSocketHandler {
6666
final origin = request.headers['Origin'];
6767
if (origin != null &&
6868
_allowedOrigins != null &&
69-
!_allowedOrigins!.contains(origin.toLowerCase())) {
69+
!_allowedOrigins.contains(origin.toLowerCase())) {
7070
return _forbidden('invalid origin "$origin".');
7171
}
7272

@@ -102,7 +102,7 @@ class WebSocketHandler {
102102
if (_protocols == null) return null;
103103
for (var requestProtocol in requestProtocols.split(',')) {
104104
requestProtocol = requestProtocol.trim();
105-
if (_protocols!.contains(requestProtocol)) return requestProtocol;
105+
if (_protocols.contains(requestProtocol)) return requestProtocol;
106106
}
107107
return null;
108108
}

‎pkgs/shelf_web_socket/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ topics:
99
- shelf
1010

1111
environment:
12-
sdk: ^3.0.0
12+
sdk: ^3.3.0
1313

1414
dependencies:
1515
shelf: ^1.1.0
1616
stream_channel: ^2.1.0
1717
web_socket_channel: '>=2.0.0 <4.0.0'
1818

1919
dev_dependencies:
20-
dart_flutter_team_lints: ^2.0.0
20+
dart_flutter_team_lints: ^3.0.0
2121
http: '>=0.13.0 <2.0.0'
2222
test: ^1.25.2

0 commit comments

Comments
 (0)