diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 4090be40..7cfeec9f 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.5.0 +# Created with package:mono_repo v6.5.6 name: Dart CI on: push: @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -29,37 +29,37 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - name: mono_repo self validate - run: dart pub global activate mono_repo 6.5.0 + run: dart pub global activate mono_repo 6.5.6 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 2.17.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 .`" + name: "analyze_and_format; linux; Dart 2.19.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 .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.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" + 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_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.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 - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 + 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_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: - sdk: "2.17.0" + sdk: "2.19.0" - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -137,7 +137,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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" @@ -147,12 +147,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -230,7 +230,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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:format" @@ -240,12 +240,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -319,26 +319,26 @@ jobs: if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket job_005: - name: "unit_test; linux; Dart 2.17.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" + name: "unit_test; linux; Dart 2.19.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:pkgs/shelf-pkgs/shelf_test_handler - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 + os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:pkgs/shelf-pkgs/shelf_test_handler + os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: - sdk: "2.17.0" + sdk: "2.19.0" - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -363,26 +363,26 @@ jobs: - job_003 - job_004 job_006: - name: "unit_test; linux; Dart 2.17.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`" + name: "unit_test; linux; Dart 2.19.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`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.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" + 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_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.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 - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 + 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_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: - sdk: "2.17.0" + sdk: "2.19.0" - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -465,7 +465,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -475,12 +475,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -509,7 +509,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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" @@ -519,12 +519,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -603,16 +603,16 @@ jobs: - job_003 - job_004 job_009: - name: "unit_test; windows; Dart 2.17.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" + name: "unit_test; windows; Dart 2.19.0; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: - sdk: "2.17.0" + sdk: "2.19.0" - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -637,16 +637,16 @@ jobs: - job_003 - job_004 job_010: - name: "unit_test; windows; Dart 2.17.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + 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`" runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: - sdk: "2.17.0" + sdk: "2.19.0" - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -693,12 +693,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -727,12 +727,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade diff --git a/pkgs/shelf/CHANGELOG.md b/pkgs/shelf/CHANGELOG.md index 60dfc2eb..e13bc1ab 100644 --- a/pkgs/shelf/CHANGELOG.md +++ b/pkgs/shelf/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.4.2-dev + +* Require Dart >= 2.19 + ## 1.4.1 * Added package topics to the pubspec file. diff --git a/pkgs/shelf/lib/shelf_io.dart b/pkgs/shelf/lib/shelf_io.dart index 8a2c3e7a..be0367a2 100644 --- a/pkgs/shelf/lib/shelf_io.dart +++ b/pkgs/shelf/lib/shelf_io.dart @@ -19,6 +19,8 @@ /// (the default), streamed responses will be buffered to improve performance. /// If `false`, all chunks will be pushed over the wire as they're received. /// See [HttpResponse.bufferOutput] for more information. +library; + import 'dart:async'; import 'dart:io'; diff --git a/pkgs/shelf/pubspec.yaml b/pkgs/shelf/pubspec.yaml index 5bc91fd0..33b591b8 100644 --- a/pkgs/shelf/pubspec.yaml +++ b/pkgs/shelf/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf -version: 1.4.1 +version: 1.4.2-dev description: > A model for web server middleware that encourages composition and easy reuse. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf @@ -9,7 +9,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: async: ^2.5.0 @@ -20,6 +20,6 @@ dependencies: stream_channel: ^2.1.0 dev_dependencies: - dart_flutter_team_lints: ^0.1.0 - http: ^0.13.0 + dart_flutter_team_lints: ^1.0.0 + http: '>=0.13.0 <2.0.0' test: ^1.16.0 diff --git a/pkgs/shelf/test/io_server_test.dart b/pkgs/shelf/test/io_server_test.dart index 421fe167..8c325eb3 100644 --- a/pkgs/shelf/test/io_server_test.dart +++ b/pkgs/shelf/test/io_server_test.dart @@ -3,6 +3,8 @@ // BSD-style license that can be found in the LICENSE file. @TestOn('vm') +library; + import 'dart:async'; import 'dart:io'; diff --git a/pkgs/shelf/test/shelf_io_test.dart b/pkgs/shelf/test/shelf_io_test.dart index e7c08bec..791fca5a 100644 --- a/pkgs/shelf/test/shelf_io_test.dart +++ b/pkgs/shelf/test/shelf_io_test.dart @@ -3,6 +3,8 @@ // BSD-style license that can be found in the LICENSE file. @TestOn('vm') +library; + import 'dart:async'; import 'dart:convert'; import 'dart:io'; diff --git a/pkgs/shelf_packages_handler/CHANGELOG.md b/pkgs/shelf_packages_handler/CHANGELOG.md index 0bbe0266..c5802f3e 100644 --- a/pkgs/shelf_packages_handler/CHANGELOG.md +++ b/pkgs/shelf_packages_handler/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.3-dev + +* Require Dart `2.19`. + ## 3.0.2 * Added package topics to the pubspec file. diff --git a/pkgs/shelf_packages_handler/lib/shelf_packages_handler.dart b/pkgs/shelf_packages_handler/lib/shelf_packages_handler.dart index 165314af..a6a47541 100644 --- a/pkgs/shelf_packages_handler/lib/shelf_packages_handler.dart +++ b/pkgs/shelf_packages_handler/lib/shelf_packages_handler.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -library shelf_packages_handler; - import 'package:shelf/shelf.dart'; import 'src/dir_handler.dart'; @@ -31,4 +29,4 @@ Handler packagesHandler({Map? packageMap}) => /// This is useful for ensuring that `package:` imports work for all entrypoints /// in Dartium. Handler packagesDirHandler({Map? packageMap}) => - DirHandler('packages', packagesHandler(packageMap: packageMap)); + DirHandler('packages', packagesHandler(packageMap: packageMap)).call; diff --git a/pkgs/shelf_packages_handler/lib/src/dir_handler.dart b/pkgs/shelf_packages_handler/lib/src/dir_handler.dart index b4d753ac..3d22f1a0 100644 --- a/pkgs/shelf_packages_handler/lib/src/dir_handler.dart +++ b/pkgs/shelf_packages_handler/lib/src/dir_handler.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -library shelf_packages_handler.dir_handler; - import 'dart:async'; import 'package:path/path.dart' as p; diff --git a/pkgs/shelf_packages_handler/pubspec.yaml b/pkgs/shelf_packages_handler/pubspec.yaml index 19a9dac3..5db84da6 100644 --- a/pkgs/shelf_packages_handler/pubspec.yaml +++ b/pkgs/shelf_packages_handler/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_packages_handler -version: 3.0.2 +version: 3.0.3-dev description: A shelf handler for serving a `packages/` directory. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_packages_handler @@ -8,7 +8,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: path: ^1.8.0 @@ -16,5 +16,5 @@ dependencies: shelf_static: ^1.0.0 dev_dependencies: - dart_flutter_team_lints: ^0.1.0 + dart_flutter_team_lints: ^1.0.0 test: ^1.16.0 diff --git a/pkgs/shelf_proxy/CHANGELOG.md b/pkgs/shelf_proxy/CHANGELOG.md index 10f85a98..133fb213 100644 --- a/pkgs/shelf_proxy/CHANGELOG.md +++ b/pkgs/shelf_proxy/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.0.4 + +* Require Dart `2.19`. +* Allow `package:http` v1.0.0 + ## 1.0.3 * Added package topics to the pubspec file. diff --git a/pkgs/shelf_proxy/pubspec.yaml b/pkgs/shelf_proxy/pubspec.yaml index 01445907..a83e47b2 100644 --- a/pkgs/shelf_proxy/pubspec.yaml +++ b/pkgs/shelf_proxy/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_proxy -version: 1.0.3 +version: 1.0.4 description: A shelf handler for proxying HTTP requests to another server. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_proxy @@ -8,13 +8,13 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: - http: ^0.13.0 + http: '>=0.13.0 <2.0.0' path: ^1.8.0 shelf: ^1.0.0 dev_dependencies: - dart_flutter_team_lints: ^0.1.0 + dart_flutter_team_lints: ^1.0.0 test: ^1.6.0 diff --git a/pkgs/shelf_router/CHANGELOG.md b/pkgs/shelf_router/CHANGELOG.md index da8a214f..4bd59ec4 100644 --- a/pkgs/shelf_router/CHANGELOG.md +++ b/pkgs/shelf_router/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.5-dev + +* Require Dart `2.19`. + ## 1.1.4 * Fixed a spelling issue in the pubspec file. diff --git a/pkgs/shelf_router/example/main.dart b/pkgs/shelf_router/example/main.dart index 39d1a7d1..61b9303b 100644 --- a/pkgs/shelf_router/example/main.dart +++ b/pkgs/shelf_router/example/main.dart @@ -45,7 +45,7 @@ class Service { }); // Other routers can be mounted... - router.mount('/api/', Api().router); + router.mount('/api/', Api().router.call); // You can catch all verbs and use a URL-parameter with a regular expression // that matches everything to catch app. @@ -53,7 +53,7 @@ class Service { return Response.notFound('Page not found'); }); - return router; + return router.call; } } diff --git a/pkgs/shelf_router/pubspec.yaml b/pkgs/shelf_router/pubspec.yaml index a536af5e..0a7db233 100644 --- a/pkgs/shelf_router/pubspec.yaml +++ b/pkgs/shelf_router/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_router -version: 1.1.4 +version: 1.1.5-dev description: > A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations. @@ -10,7 +10,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: http_methods: ^1.1.0 @@ -18,6 +18,6 @@ dependencies: shelf: ^1.0.0 dev_dependencies: - dart_flutter_team_lints: ^0.1.0 - http: ^0.13.0 + dart_flutter_team_lints: ^1.0.0 + http: '>=0.13.0 <2.0.0' test: ^1.16.0 diff --git a/pkgs/shelf_router/test/router_test.dart b/pkgs/shelf_router/test/router_test.dart index f664f563..6f31620a 100644 --- a/pkgs/shelf_router/test/router_test.dart +++ b/pkgs/shelf_router/test/router_test.dart @@ -13,6 +13,8 @@ // limitations under the License. @TestOn('vm') +library; + import 'dart:async'; import 'dart:io'; @@ -59,7 +61,7 @@ void main() { return Response.ok('not-found'); }); - server.mount(app); + server.mount(app.call); expect(await get('/sync-hello'), 'hello-world'); expect(await get('/async-hello'), 'hello-world'); @@ -79,7 +81,7 @@ void main() { return Response.ok('$user / $group'); }); - server.mount(app); + server.mount(app.call); expect(await get('/user/jonasfj/groups/42'), 'jonasfj / 42'); }); @@ -92,7 +94,7 @@ void main() { return Response.ok('$user / $group'); }); - server.mount(app); + server.mount(app.call); expect(await get('/user/jonasfj/groups/42'), 'jonasfj / 42'); }); @@ -108,13 +110,13 @@ void main() { return Response.ok('hello-world'); }); - app.mount('/api/', api); + app.mount('/api/', api.call); app.all('/<_|[^]*>', (Request request) { return Response.ok('catch-all-handler'); }); - server.mount(app); + server.mount(app.call); expect(await get('/hello'), 'hello-world'); expect(await get('/api/user/jonasfj/info'), 'Hello jonasfj'); @@ -139,10 +141,10 @@ void main() { var app = Router(); app.mount( '/api/', - Pipeline().addMiddleware(middleware).addHandler(api), + Pipeline().addMiddleware(middleware).addHandler(api.call), ); - server.mount(app); + server.mount(app.call); expect(await get('/api/hello'), 'Hello'); expect(await get('/api/hello?ok'), 'middleware'); @@ -163,13 +165,13 @@ void main() { return Response.ok('hello-world'); }); - app.mount('/api', api); + app.mount('/api', api.call); app.all('/<_|[^]*>', (Request request) { return Response.ok('catch-all-handler'); }); - server.mount(app); + server.mount(app.call); expect(await get('/hello'), 'hello-world'); expect(await get('/api'), 'Hello World!'); @@ -180,7 +182,7 @@ void main() { test('responds with 404 if no handler matches', () { var api = Router()..get('/hello', (request) => Response.ok('Hello')); - server.mount(api); + server.mount(api.call); expect( get('/hi'), @@ -191,7 +193,7 @@ void main() { test('can invoke custom handler if no route matches', () { var api = Router(notFoundHandler: (req) => Response.ok('Not found, but ok')) ..get('/hello', (request) => Response.ok('Hello')); - server.mount(api); + server.mount(api.call); expect(get('/hi'), completion('Not found, but ok')); }); diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md index 60020e89..35e7ce92 100644 --- a/pkgs/shelf_router_generator/CHANGELOG.md +++ b/pkgs/shelf_router_generator/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.7-dev + +* Require `sdk: '>=2.19.0 <3.0.0'` + ## 1.0.6 * Added package topics to the pubspec file. diff --git a/pkgs/shelf_router_generator/example/main.dart b/pkgs/shelf_router_generator/example/main.dart index 0137d910..5368d179 100644 --- a/pkgs/shelf_router_generator/example/main.dart +++ b/pkgs/shelf_router_generator/example/main.dart @@ -53,7 +53,7 @@ class Service { // The generated function _$ServiceRouter can be used to get a [Handler] // for this object. This can be used with [shelf_io.serve]. - Handler get handler => _$ServiceRouter(this); + Handler get handler => _$ServiceRouter(this).call; } class Api { diff --git a/pkgs/shelf_router_generator/example/main.g.dart b/pkgs/shelf_router_generator/example/main.g.dart index 71a4434b..93d45937 100644 --- a/pkgs/shelf_router_generator/example/main.g.dart +++ b/pkgs/shelf_router_generator/example/main.g.dart @@ -8,18 +8,47 @@ part of 'main.dart'; Router _$ServiceRouter(Service service) { final router = Router(); - router.add('GET', r'/say-hi/', service._hi); - router.add('GET', r'/user/', service._user); - router.add('GET', r'/wave', service._wave); - router.mount(r'/api/', service._api); - router.all(r'/', service._notFound); + router.add( + 'GET', + r'/say-hi/', + service._hi, + ); + router.add( + 'GET', + r'/user/', + service._user, + ); + router.add( + 'GET', + r'/wave', + service._wave, + ); + router.mount( + r'/api/', + service._api.call, + ); + router.all( + r'/', + service._notFound, + ); return router; } Router _$ApiRouter(Api service) { final router = Router(); - router.add('GET', r'/messages', service._messages); - router.add('GET', r'/messages/', service._messages); - router.all(r'/', service._notFound); + router.add( + 'GET', + r'/messages', + service._messages, + ); + router.add( + 'GET', + r'/messages/', + service._messages, + ); + router.all( + r'/', + service._notFound, + ); return router; } diff --git a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart index 8d6a4e01..ff86cde0 100644 --- a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart +++ b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart @@ -90,7 +90,7 @@ code.Code _buildAddHandlerCode({ case r'$mount': return router.property('mount').call([ code.literalString(handler.route, raw: true), - service.property(handler.element.name), + service.property(handler.element.name).property('call'), ]).statement; case r'$all': return router.property('all').call([ diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index 60302fdc..ef31a90e 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_router_generator -version: 1.0.6 +version: 1.0.7-dev description: > A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. @@ -10,7 +10,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: analyzer: '>=4.6.0 <6.0.0' @@ -25,6 +25,8 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_verify: ^3.0.0 - dart_flutter_team_lints: ^0.1.0 - http: ^0.13.0 + dart_flutter_team_lints: ^1.0.0 + http: '>=0.13.0 <2.0.0' + # TODO: REMOVE THIS ONCE build_runner_core is fixed! dart-lang/build#3514 + logging: 1.1.0 test: ^1.5.3 diff --git a/pkgs/shelf_router_generator/test/server/api.g.dart b/pkgs/shelf_router_generator/test/server/api.g.dart index b2dc9a96..75e9a23c 100644 --- a/pkgs/shelf_router_generator/test/server/api.g.dart +++ b/pkgs/shelf_router_generator/test/server/api.g.dart @@ -8,8 +8,20 @@ part of 'api.dart'; Router _$ApiRouter(Api service) { final router = Router(); - router.add('GET', r'/time', service._time); - router.add('GET', r'/to-uppercase/', service._toUpperCase); - router.add('GET', r'/$string-escape', service._stringEscapingWorks); + router.add( + 'GET', + r'/time', + service._time, + ); + router.add( + 'GET', + r'/to-uppercase/', + service._toUpperCase, + ); + router.add( + 'GET', + r'/$string-escape', + service._stringEscapingWorks, + ); return router; } diff --git a/pkgs/shelf_router_generator/test/server/server.dart b/pkgs/shelf_router_generator/test/server/server.dart index 0ec30399..ba55082a 100644 --- a/pkgs/shelf_router_generator/test/server/server.dart +++ b/pkgs/shelf_router_generator/test/server/server.dart @@ -24,7 +24,7 @@ class Server { late HttpServer _server; Future start() async { - _server = await shelf_io.serve(_service.router, 'localhost', 0); + _server = await shelf_io.serve(_service.router.call, 'localhost', 0); } Future stop() => _server.close(); diff --git a/pkgs/shelf_router_generator/test/server/service.g.dart b/pkgs/shelf_router_generator/test/server/service.g.dart index 77e27e4c..07508c26 100644 --- a/pkgs/shelf_router_generator/test/server/service.g.dart +++ b/pkgs/shelf_router_generator/test/server/service.g.dart @@ -8,12 +8,38 @@ part of 'service.dart'; Router _$ServiceRouter(Service service) { final router = Router(); - router.add('GET', r'/say-hello', service._sayHello); - router.add('GET', r'/say-hello/', service._sayHello); - router.add('GET', r'/wave', service._wave); - router.add('GET', r'/greet/', service._greet); - router.add('GET', r'/hi/', service._hi); - router.mount(r'/api/', service._api); - router.all(r'/<_|.*>', service._index); + router.add( + 'GET', + r'/say-hello', + service._sayHello, + ); + router.add( + 'GET', + r'/say-hello/', + service._sayHello, + ); + router.add( + 'GET', + r'/wave', + service._wave, + ); + router.add( + 'GET', + r'/greet/', + service._greet, + ); + router.add( + 'GET', + r'/hi/', + service._hi, + ); + router.mount( + r'/api/', + service._api.call, + ); + router.all( + r'/<_|.*>', + service._index, + ); return router; } diff --git a/pkgs/shelf_static/CHANGELOG.md b/pkgs/shelf_static/CHANGELOG.md index fd6ae933..827a2bfb 100644 --- a/pkgs/shelf_static/CHANGELOG.md +++ b/pkgs/shelf_static/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.3-dev + +* Require Dart `2.19`. + ## 1.1.2 * Added package topics to the pubspec file. diff --git a/pkgs/shelf_static/example/example.dart b/pkgs/shelf_static/example/example.dart index fa73650a..ea8f39c7 100644 --- a/pkgs/shelf_static/example/example.dart +++ b/pkgs/shelf_static/example/example.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -library shelf_static.example; - import 'dart:io'; import 'package:args/args.dart'; import 'package:shelf/shelf.dart' as shelf; diff --git a/pkgs/shelf_static/pubspec.yaml b/pkgs/shelf_static/pubspec.yaml index fa438a71..e929a01b 100644 --- a/pkgs/shelf_static/pubspec.yaml +++ b/pkgs/shelf_static/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_static -version: 1.1.2 +version: 1.1.3-dev description: Static file server support for the shelf package and ecosystem. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_static @@ -8,7 +8,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: convert: ^3.0.0 @@ -20,6 +20,6 @@ dependencies: dev_dependencies: args: ^2.0.0 - dart_flutter_team_lints: ^0.1.0 + dart_flutter_team_lints: ^1.0.0 test: ^1.16.0 test_descriptor: ^2.0.0 diff --git a/pkgs/shelf_test_handler/CHANGELOG.md b/pkgs/shelf_test_handler/CHANGELOG.md index 83d75cc5..0af07fd7 100644 --- a/pkgs/shelf_test_handler/CHANGELOG.md +++ b/pkgs/shelf_test_handler/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.3-dev + +* Require Dart `2.19`. + ## 2.0.2 * Added package topics to the pubspec file. diff --git a/pkgs/shelf_test_handler/lib/src/server.dart b/pkgs/shelf_test_handler/lib/src/server.dart index 540649e5..32af56bd 100644 --- a/pkgs/shelf_test_handler/lib/src/server.dart +++ b/pkgs/shelf_test_handler/lib/src/server.dart @@ -35,7 +35,7 @@ class ShelfTestServer { {bool log = true, String? description}) async { var server = await HttpMultiServer.loopback(0); var handler = ShelfTestHandler(log: log, description: description); - serveRequests(server, handler); + serveRequests(server, handler.call); return ShelfTestServer._(server, handler); } diff --git a/pkgs/shelf_test_handler/pubspec.yaml b/pkgs/shelf_test_handler/pubspec.yaml index e5a91f46..4c6eb731 100644 --- a/pkgs/shelf_test_handler/pubspec.yaml +++ b/pkgs/shelf_test_handler/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_test_handler -version: 2.0.2 +version: 2.0.3-dev description: A Shelf handler that makes it easy to test HTTP interactions. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_test_handler @@ -8,7 +8,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: http_multi_server: ^3.0.0 @@ -16,7 +16,7 @@ dependencies: test: ^1.16.0 dev_dependencies: - dart_flutter_team_lints: ^0.1.0 - http: ^0.13.0 + dart_flutter_team_lints: ^1.0.0 + http: '>=0.13.0 <2.0.0' shelf_web_socket: ^1.0.0 web_socket_channel: ^2.0.0 diff --git a/pkgs/shelf_test_handler/test/server_test.dart b/pkgs/shelf_test_handler/test/server_test.dart index 29208d9e..5e3c0e88 100644 --- a/pkgs/shelf_test_handler/test/server_test.dart +++ b/pkgs/shelf_test_handler/test/server_test.dart @@ -3,6 +3,8 @@ // BSD-style license that can be found in the LICENSE file. @TestOn('vm') +library; + import 'dart:io'; import 'package:http/http.dart' as http; diff --git a/pkgs/shelf_web_socket/CHANGELOG.md b/pkgs/shelf_web_socket/CHANGELOG.md index 3ff17fb0..b9fd8a89 100644 --- a/pkgs/shelf_web_socket/CHANGELOG.md +++ b/pkgs/shelf_web_socket/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.5-dev + +* Require Dart `2.19`. + ## 1.0.4 * Added package topics to the pubspec file. diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml index d4f0a46c..45da866d 100644 --- a/pkgs/shelf_web_socket/pubspec.yaml +++ b/pkgs/shelf_web_socket/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_web_socket -version: 1.0.4 +version: 1.0.5-dev description: > A shelf handler that wires up a listener for every connection. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket @@ -9,7 +9,7 @@ topics: - shelf environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: shelf: ^1.1.0 @@ -17,6 +17,6 @@ dependencies: web_socket_channel: ^2.0.0 dev_dependencies: - dart_flutter_team_lints: ^0.1.0 - http: ^0.13.0 + dart_flutter_team_lints: ^1.0.0 + http: '>=0.13.0 <2.0.0' test: ^1.16.0 diff --git a/tool/ci.sh b/tool/ci.sh index 58800314..61e3c62b 100644 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.5.0 +# Created with package:mono_repo v6.5.6 # Support built in commands on windows out of the box. # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")