Skip to content

Commit e2a02b7

Browse files
kevmookevmoo
authored
Move to latest pkg:dart_flutter_team_lints, bump min sdk to Dart 3 (#378)
1 parent 2926f76 commit e2a02b7

File tree

24 files changed

+108
-163
lines changed

24 files changed

+108
-163
lines changed

‎.github/workflows/dart.yml‎

Lines changed: 47 additions & 104 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 2.19.0; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`"
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 .`"
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Cache Pub hosted dependencies
4747
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
4848
with:
4949
path: "~/.pub-cache/hosted"
50-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze"
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"
5151
restore-keys: |
52-
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket
53-
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
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
5454
os:ubuntu-latest;pub-cache-hosted
5555
os:ubuntu-latest
5656
- name: Setup Dart SDK
5757
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
5858
with:
59-
sdk: "2.19.0"
59+
sdk: "3.0.0"
6060
- id: checkout
6161
name: Checkout repository
6262
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
@@ -96,6 +96,15 @@ jobs:
9696
run: dart analyze --fatal-infos .
9797
if: "always() && steps.pkgs_shelf_router_pub_upgrade.conclusion == 'success'"
9898
working-directory: pkgs/shelf_router
99+
- id: pkgs_shelf_router_generator_pub_upgrade
100+
name: pkgs/shelf_router_generator; dart pub upgrade
101+
run: dart pub upgrade
102+
if: "always() && steps.checkout.conclusion == 'success'"
103+
working-directory: pkgs/shelf_router_generator
104+
- name: "pkgs/shelf_router_generator; dart analyze --fatal-infos ."
105+
run: dart analyze --fatal-infos .
106+
if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'"
107+
working-directory: pkgs/shelf_router_generator
99108
- id: pkgs_shelf_static_pub_upgrade
100109
name: pkgs/shelf_static; dart pub upgrade
101110
run: dart pub upgrade
@@ -124,36 +133,6 @@ jobs:
124133
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
125134
working-directory: pkgs/shelf_web_socket
126135
job_003:
127-
name: "analyze_and_format; linux; Dart 3.0.0; PKG: pkgs/shelf_router_generator; `dart analyze --fatal-infos .`"
128-
runs-on: ubuntu-latest
129-
steps:
130-
- name: Cache Pub hosted dependencies
131-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
132-
with:
133-
path: "~/.pub-cache/hosted"
134-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf_router_generator;commands:analyze"
135-
restore-keys: |
136-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf_router_generator
137-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
138-
os:ubuntu-latest;pub-cache-hosted
139-
os:ubuntu-latest
140-
- name: Setup Dart SDK
141-
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
142-
with:
143-
sdk: "3.0.0"
144-
- id: checkout
145-
name: Checkout repository
146-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
147-
- id: pkgs_shelf_router_generator_pub_upgrade
148-
name: pkgs/shelf_router_generator; dart pub upgrade
149-
run: dart pub upgrade
150-
if: "always() && steps.checkout.conclusion == 'success'"
151-
working-directory: pkgs/shelf_router_generator
152-
- name: "pkgs/shelf_router_generator; dart analyze --fatal-infos ."
153-
run: dart analyze --fatal-infos .
154-
if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'"
155-
working-directory: pkgs/shelf_router_generator
156-
job_004:
157136
name: "analyze_and_format; linux; Dart dev; 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 .`"
158137
runs-on: ubuntu-latest
159138
steps:
@@ -246,7 +225,7 @@ jobs:
246225
run: dart analyze --fatal-infos .
247226
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
248227
working-directory: pkgs/shelf_web_socket
249-
job_005:
228+
job_004:
250229
name: "analyze_and_format; linux; Dart dev; 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 format --output=none --set-exit-if-changed .`"
251230
runs-on: ubuntu-latest
252231
steps:
@@ -339,24 +318,24 @@ jobs:
339318
run: "dart format --output=none --set-exit-if-changed ."
340319
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
341320
working-directory: pkgs/shelf_web_socket
342-
job_006:
343-
name: "unit_test; linux; Dart 2.19.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
321+
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`"
344323
runs-on: ubuntu-latest
345324
steps:
346325
- name: Cache Pub hosted dependencies
347326
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
348327
with:
349328
path: "~/.pub-cache/hosted"
350-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1"
329+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1"
351330
restore-keys: |
352-
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_test_handler
353-
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
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
354333
os:ubuntu-latest;pub-cache-hosted
355334
os:ubuntu-latest
356335
- name: Setup Dart SDK
357336
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
358337
with:
359-
sdk: "2.19.0"
338+
sdk: "3.0.0"
360339
- id: checkout
361340
name: Checkout repository
362341
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
@@ -383,25 +362,24 @@ jobs:
383362
- job_002
384363
- job_003
385364
- job_004
386-
- job_005
387-
job_007:
388-
name: "unit_test; linux; Dart 2.19.0; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
365+
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`"
389367
runs-on: ubuntu-latest
390368
steps:
391369
- name: Cache Pub hosted dependencies
392370
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
393371
with:
394372
path: "~/.pub-cache/hosted"
395-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0"
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"
396374
restore-keys: |
397-
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket
398-
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
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
399377
os:ubuntu-latest;pub-cache-hosted
400378
os:ubuntu-latest
401379
- name: Setup Dart SDK
402380
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
403381
with:
404-
sdk: "2.19.0"
382+
sdk: "3.0.0"
405383
- id: checkout
406384
name: Checkout repository
407385
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
@@ -441,6 +419,15 @@ jobs:
441419
run: "dart test --test-randomize-ordering-seed=random"
442420
if: "always() && steps.pkgs_shelf_router_pub_upgrade.conclusion == 'success'"
443421
working-directory: pkgs/shelf_router
422+
- id: pkgs_shelf_router_generator_pub_upgrade
423+
name: pkgs/shelf_router_generator; dart pub upgrade
424+
run: dart pub upgrade
425+
if: "always() && steps.checkout.conclusion == 'success'"
426+
working-directory: pkgs/shelf_router_generator
427+
- name: "pkgs/shelf_router_generator; dart test --test-randomize-ordering-seed=random"
428+
run: "dart test --test-randomize-ordering-seed=random"
429+
if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'"
430+
working-directory: pkgs/shelf_router_generator
444431
- id: pkgs_shelf_static_pub_upgrade
445432
name: pkgs/shelf_static; dart pub upgrade
446433
run: dart pub upgrade
@@ -473,44 +460,7 @@ jobs:
473460
- job_002
474461
- job_003
475462
- job_004
476-
- job_005
477-
job_008:
478-
name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/shelf_router_generator; `dart test --test-randomize-ordering-seed=random`"
479-
runs-on: ubuntu-latest
480-
steps:
481-
- name: Cache Pub hosted dependencies
482-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
483-
with:
484-
path: "~/.pub-cache/hosted"
485-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf_router_generator;commands:test_0"
486-
restore-keys: |
487-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/shelf_router_generator
488-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
489-
os:ubuntu-latest;pub-cache-hosted
490-
os:ubuntu-latest
491-
- name: Setup Dart SDK
492-
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
493-
with:
494-
sdk: "3.0.0"
495-
- id: checkout
496-
name: Checkout repository
497-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
498-
- id: pkgs_shelf_router_generator_pub_upgrade
499-
name: pkgs/shelf_router_generator; dart pub upgrade
500-
run: dart pub upgrade
501-
if: "always() && steps.checkout.conclusion == 'success'"
502-
working-directory: pkgs/shelf_router_generator
503-
- name: "pkgs/shelf_router_generator; dart test --test-randomize-ordering-seed=random"
504-
run: "dart test --test-randomize-ordering-seed=random"
505-
if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'"
506-
working-directory: pkgs/shelf_router_generator
507-
needs:
508-
- job_001
509-
- job_002
510-
- job_003
511-
- job_004
512-
- job_005
513-
job_009:
463+
job_007:
514464
name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
515465
runs-on: ubuntu-latest
516466
steps:
@@ -554,8 +504,7 @@ jobs:
554504
- job_002
555505
- job_003
556506
- job_004
557-
- job_005
558-
job_010:
507+
job_008:
559508
name: "unit_test; linux; Dart dev; 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`"
560509
runs-on: ubuntu-latest
561510
steps:
@@ -653,8 +602,7 @@ jobs:
653602
- job_002
654603
- job_003
655604
- job_004
656-
- job_005
657-
job_011:
605+
job_009:
658606
name: "unit_test; linux; Dart dev; PKG: pkgs/shelf_router_generator; `dart test --run-skipped -t presubmit-only`"
659607
runs-on: ubuntu-latest
660608
steps:
@@ -689,15 +637,14 @@ jobs:
689637
- job_002
690638
- job_003
691639
- job_004
692-
- job_005
693-
job_012:
694-
name: "unit_test; windows; Dart 2.19.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
640+
job_010:
641+
name: "unit_test; windows; Dart 3.0.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
695642
runs-on: windows-latest
696643
steps:
697644
- name: Setup Dart SDK
698645
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
699646
with:
700-
sdk: "2.19.0"
647+
sdk: "3.0.0"
701648
- id: checkout
702649
name: Checkout repository
703650
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
@@ -724,15 +671,14 @@ jobs:
724671
- job_002
725672
- job_003
726673
- job_004
727-
- job_005
728-
job_013:
729-
name: "unit_test; windows; Dart 2.19.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
674+
job_011:
675+
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`"
730676
runs-on: windows-latest
731677
steps:
732678
- name: Setup Dart SDK
733679
uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
734680
with:
735-
sdk: "2.19.0"
681+
sdk: "3.0.0"
736682
- id: checkout
737683
name: Checkout repository
738684
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
@@ -777,8 +723,7 @@ jobs:
777723
- job_002
778724
- job_003
779725
- job_004
780-
- job_005
781-
job_014:
726+
job_012:
782727
name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
783728
runs-on: windows-latest
784729
steps:
@@ -812,8 +757,7 @@ jobs:
812757
- job_002
813758
- job_003
814759
- job_004
815-
- job_005
816-
job_015:
760+
job_013:
817761
name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
818762
runs-on: windows-latest
819763
steps:
@@ -865,4 +809,3 @@ jobs:
865809
- job_002
866810
- job_003
867811
- job_004
868-
- job_005

‎analysis_options.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ analyzer:
66
strict-casts: true
77
strict-inference: true
88
strict-raw-types: true
9+
errors:
10+
comment_references: ignore # too many false positives
911

1012
linter:
1113
rules:
@@ -16,7 +18,4 @@ linter:
1618
- no_adjacent_strings_in_list
1719
- no_runtimeType_toString
1820
- package_api_docs
19-
- prefer_relative_imports
20-
- test_types_in_equals
2121
- unnecessary_await_in_return
22-
- use_super_parameters

‎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-dev
22

3-
* Require Dart >= 2.19
3+
* Require Dart ^3.0.0
44

55
## 1.4.1
66

‎pkgs/shelf/pubspec.yaml‎

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

1111
environment:
12-
sdk: '>=2.19.0 <3.0.0'
12+
sdk: ^3.0.0
1313

1414
dependencies:
1515
async: ^2.5.0
@@ -20,6 +20,6 @@ dependencies:
2020
stream_channel: ^2.1.0
2121

2222
dev_dependencies:
23-
dart_flutter_team_lints: ^1.0.0
23+
dart_flutter_team_lints: ^2.0.0
2424
http: '>=0.13.0 <2.0.0'
2525
test: ^1.16.0

‎pkgs/shelf/test/add_chunked_encoding_test.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,36 @@ void main() {
3030
});
3131

3232
test("doesn't add chunked encoding with status 1xx", () async {
33-
var response =
34-
await _chunkResponse(Response(123, body: Stream<List<int>>.empty()));
33+
var response = await _chunkResponse(
34+
Response(123, body: const Stream<List<int>>.empty()));
3535
expect(response.headers, isNot(contains('transfer-encoding')));
3636
expect(response.read().toList(), completion(isEmpty));
3737
});
3838

3939
test("doesn't add chunked encoding with status 204", () async {
40-
var response =
41-
await _chunkResponse(Response(204, body: Stream<List<int>>.empty()));
40+
var response = await _chunkResponse(
41+
Response(204, body: const Stream<List<int>>.empty()));
4242
expect(response.headers, isNot(contains('transfer-encoding')));
4343
expect(response.read().toList(), completion(isEmpty));
4444
});
4545

4646
test("doesn't add chunked encoding with status 304", () async {
47-
var response =
48-
await _chunkResponse(Response(204, body: Stream<List<int>>.empty()));
47+
var response = await _chunkResponse(
48+
Response(204, body: const Stream<List<int>>.empty()));
4949
expect(response.headers, isNot(contains('transfer-encoding')));
5050
expect(response.read().toList(), completion(isEmpty));
5151
});
5252

5353
test("doesn't add chunked encoding with status 204", () async {
54-
var response =
55-
await _chunkResponse(Response(204, body: Stream<List<int>>.empty()));
54+
var response = await _chunkResponse(
55+
Response(204, body: const Stream<List<int>>.empty()));
5656
expect(response.headers, isNot(contains('transfer-encoding')));
5757
expect(response.read().toList(), completion(isEmpty));
5858
});
5959

6060
test("doesn't add chunked encoding with status 204", () async {
61-
var response =
62-
await _chunkResponse(Response(204, body: Stream<List<int>>.empty()));
61+
var response = await _chunkResponse(
62+
Response(204, body: const Stream<List<int>>.empty()));
6363
expect(response.headers, isNot(contains('transfer-encoding')));
6464
expect(response.read().toList(), completion(isEmpty));
6565
});

0 commit comments

Comments
 (0)