Skip to content

Commit 88b78b7

Browse files
committed
require dart 3.5.0
1 parent 03a0d6a commit 88b78b7

File tree

3 files changed

+130
-49
lines changed

3 files changed

+130
-49
lines changed

.github/workflows/dart.yml

+128-48
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ 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.3.0; PKGS: 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_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler; `dart analyze --fatal-infos .`"
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Cache Pub hosted dependencies
4747
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
4848
with:
4949
path: "~/.pub-cache/hosted"
50-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages: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_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:analyze"
5151
restore-keys: |
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages: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
52+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler
5353
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
5454
os:ubuntu-latest;pub-cache-hosted
5555
os:ubuntu-latest
@@ -114,15 +114,6 @@ jobs:
114114
run: dart analyze --fatal-infos .
115115
if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'"
116116
working-directory: pkgs/shelf_test_handler
117-
- id: pkgs_shelf_web_socket_pub_upgrade
118-
name: pkgs/shelf_web_socket; dart pub upgrade
119-
run: dart pub upgrade
120-
if: "always() && steps.checkout.conclusion == 'success'"
121-
working-directory: pkgs/shelf_web_socket
122-
- name: "pkgs/shelf_web_socket; dart analyze --fatal-infos ."
123-
run: dart analyze --fatal-infos .
124-
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
125-
working-directory: pkgs/shelf_web_socket
126117
job_003:
127118
name: "analyze_and_format; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart analyze --fatal-infos .`"
128119
runs-on: ubuntu-latest
@@ -154,6 +145,36 @@ jobs:
154145
if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'"
155146
working-directory: pkgs/shelf
156147
job_004:
148+
name: "analyze_and_format; linux; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart analyze --fatal-infos .`"
149+
runs-on: ubuntu-latest
150+
steps:
151+
- name: Cache Pub hosted dependencies
152+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
153+
with:
154+
path: "~/.pub-cache/hosted"
155+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:analyze"
156+
restore-keys: |
157+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket
158+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
159+
os:ubuntu-latest;pub-cache-hosted
160+
os:ubuntu-latest
161+
- name: Setup Dart SDK
162+
uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
163+
with:
164+
sdk: "3.5.0"
165+
- id: checkout
166+
name: Checkout repository
167+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
168+
- id: pkgs_shelf_web_socket_pub_upgrade
169+
name: pkgs/shelf_web_socket; dart pub upgrade
170+
run: dart pub upgrade
171+
if: "always() && steps.checkout.conclusion == 'success'"
172+
working-directory: pkgs/shelf_web_socket
173+
- name: "pkgs/shelf_web_socket; dart analyze --fatal-infos ."
174+
run: dart analyze --fatal-infos .
175+
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
176+
working-directory: pkgs/shelf_web_socket
177+
job_005:
157178
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 .`"
158179
runs-on: ubuntu-latest
159180
steps:
@@ -246,7 +267,7 @@ jobs:
246267
run: dart analyze --fatal-infos .
247268
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
248269
working-directory: pkgs/shelf_web_socket
249-
job_005:
270+
job_006:
250271
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 .`"
251272
runs-on: ubuntu-latest
252273
steps:
@@ -339,17 +360,17 @@ jobs:
339360
run: "dart format --output=none --set-exit-if-changed ."
340361
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
341362
working-directory: pkgs/shelf_web_socket
342-
job_006:
343-
name: "unit_test; linux; Dart 3.3.0; PKGS: 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`"
363+
job_007:
364+
name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random`"
344365
runs-on: ubuntu-latest
345366
steps:
346367
- name: Cache Pub hosted dependencies
347368
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
348369
with:
349370
path: "~/.pub-cache/hosted"
350-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages: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"
371+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:test_0"
351372
restore-keys: |
352-
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages: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
373+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler
353374
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
354375
os:ubuntu-latest;pub-cache-hosted
355376
os:ubuntu-latest
@@ -414,22 +435,14 @@ jobs:
414435
run: "dart test --test-randomize-ordering-seed=random"
415436
if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'"
416437
working-directory: pkgs/shelf_test_handler
417-
- id: pkgs_shelf_web_socket_pub_upgrade
418-
name: pkgs/shelf_web_socket; dart pub upgrade
419-
run: dart pub upgrade
420-
if: "always() && steps.checkout.conclusion == 'success'"
421-
working-directory: pkgs/shelf_web_socket
422-
- name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random"
423-
run: "dart test --test-randomize-ordering-seed=random"
424-
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
425-
working-directory: pkgs/shelf_web_socket
426438
needs:
427439
- job_001
428440
- job_002
429441
- job_003
430442
- job_004
431443
- job_005
432-
job_007:
444+
- job_006
445+
job_008:
433446
name: "unit_test; linux; Dart 3.3.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
434447
runs-on: ubuntu-latest
435448
steps:
@@ -465,7 +478,8 @@ jobs:
465478
- job_003
466479
- job_004
467480
- job_005
468-
job_008:
481+
- job_006
482+
job_009:
469483
name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`"
470484
runs-on: ubuntu-latest
471485
steps:
@@ -501,7 +515,8 @@ jobs:
501515
- job_003
502516
- job_004
503517
- job_005
504-
job_009:
518+
- job_006
519+
job_010:
505520
name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random`"
506521
runs-on: ubuntu-latest
507522
steps:
@@ -537,7 +552,45 @@ jobs:
537552
- job_003
538553
- job_004
539554
- job_005
540-
job_010:
555+
- job_006
556+
job_011:
557+
name: "unit_test; linux; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
558+
runs-on: ubuntu-latest
559+
steps:
560+
- name: Cache Pub hosted dependencies
561+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
562+
with:
563+
path: "~/.pub-cache/hosted"
564+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:test_0"
565+
restore-keys: |
566+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket
567+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
568+
os:ubuntu-latest;pub-cache-hosted
569+
os:ubuntu-latest
570+
- name: Setup Dart SDK
571+
uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
572+
with:
573+
sdk: "3.5.0"
574+
- id: checkout
575+
name: Checkout repository
576+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
577+
- id: pkgs_shelf_web_socket_pub_upgrade
578+
name: pkgs/shelf_web_socket; dart pub upgrade
579+
run: dart pub upgrade
580+
if: "always() && steps.checkout.conclusion == 'success'"
581+
working-directory: pkgs/shelf_web_socket
582+
- name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random"
583+
run: "dart test --test-randomize-ordering-seed=random"
584+
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
585+
working-directory: pkgs/shelf_web_socket
586+
needs:
587+
- job_001
588+
- job_002
589+
- job_003
590+
- job_004
591+
- job_005
592+
- job_006
593+
job_012:
541594
name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`"
542595
runs-on: ubuntu-latest
543596
steps:
@@ -582,7 +635,8 @@ jobs:
582635
- job_003
583636
- job_004
584637
- job_005
585-
job_011:
638+
- job_006
639+
job_013:
586640
name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
587641
runs-on: ubuntu-latest
588642
steps:
@@ -627,7 +681,8 @@ jobs:
627681
- job_003
628682
- job_004
629683
- job_005
630-
job_012:
684+
- job_006
685+
job_014:
631686
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`"
632687
runs-on: ubuntu-latest
633688
steps:
@@ -726,7 +781,8 @@ jobs:
726781
- job_003
727782
- job_004
728783
- job_005
729-
job_013:
784+
- job_006
785+
job_015:
730786
name: "unit_test; linux; Dart dev; PKG: pkgs/shelf_router_generator; `dart test --run-skipped -t presubmit-only`"
731787
runs-on: ubuntu-latest
732788
steps:
@@ -762,8 +818,9 @@ jobs:
762818
- job_003
763819
- job_004
764820
- job_005
765-
job_014:
766-
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`"
821+
- job_006
822+
job_016:
823+
name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random`"
767824
runs-on: windows-latest
768825
steps:
769826
- name: Setup Dart SDK
@@ -800,22 +857,14 @@ jobs:
800857
run: "dart test --test-randomize-ordering-seed=random"
801858
if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'"
802859
working-directory: pkgs/shelf_test_handler
803-
- id: pkgs_shelf_web_socket_pub_upgrade
804-
name: pkgs/shelf_web_socket; dart pub upgrade
805-
run: dart pub upgrade
806-
if: "always() && steps.checkout.conclusion == 'success'"
807-
working-directory: pkgs/shelf_web_socket
808-
- name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random"
809-
run: "dart test --test-randomize-ordering-seed=random"
810-
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
811-
working-directory: pkgs/shelf_web_socket
812860
needs:
813861
- job_001
814862
- job_002
815863
- job_003
816864
- job_004
817865
- job_005
818-
job_015:
866+
- job_006
867+
job_017:
819868
name: "unit_test; windows; Dart 3.3.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
820869
runs-on: windows-latest
821870
steps:
@@ -841,7 +890,8 @@ jobs:
841890
- job_003
842891
- job_004
843892
- job_005
844-
job_016:
893+
- job_006
894+
job_018:
845895
name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`"
846896
runs-on: windows-latest
847897
steps:
@@ -867,7 +917,35 @@ jobs:
867917
- job_003
868918
- job_004
869919
- job_005
870-
job_017:
920+
- job_006
921+
job_019:
922+
name: "unit_test; windows; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`"
923+
runs-on: windows-latest
924+
steps:
925+
- name: Setup Dart SDK
926+
uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
927+
with:
928+
sdk: "3.5.0"
929+
- id: checkout
930+
name: Checkout repository
931+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
932+
- id: pkgs_shelf_web_socket_pub_upgrade
933+
name: pkgs/shelf_web_socket; dart pub upgrade
934+
run: dart pub upgrade
935+
if: "always() && steps.checkout.conclusion == 'success'"
936+
working-directory: pkgs/shelf_web_socket
937+
- name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random"
938+
run: "dart test --test-randomize-ordering-seed=random"
939+
if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'"
940+
working-directory: pkgs/shelf_web_socket
941+
needs:
942+
- job_001
943+
- job_002
944+
- job_003
945+
- job_004
946+
- job_005
947+
- job_006
948+
job_020:
871949
name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`"
872950
runs-on: windows-latest
873951
steps:
@@ -902,7 +980,8 @@ jobs:
902980
- job_003
903981
- job_004
904982
- job_005
905-
job_018:
983+
- job_006
984+
job_021:
906985
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`"
907986
runs-on: windows-latest
908987
steps:
@@ -955,3 +1034,4 @@ jobs:
9551034
- job_003
9561035
- job_004
9571036
- job_005
1037+
- job_006

pkgs/shelf_web_socket/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
one or two parameters. This now requires a `ConnectionCallback`; a typedef
66
taking two parameters. See also https://github.com/dart-lang/shelf/issues/457.
77
* Add a API usage example.
8+
* Require Dart `^3.5.0`.
89

910
Note that most clients seeing analysis issues from the above breaking change can
1011
fix it by adding a second parameter to their callback. So, they would change

pkgs/shelf_web_socket/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ topics:
99
- shelf
1010

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

1414
dependencies:
1515
shelf: ^1.1.0

0 commit comments

Comments
 (0)