diff --git a/.github/labeler.yml b/.github/labeler.yml index 1ab6973fd8..575d4f0915 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -31,3 +31,7 @@ 'package:http_parser': - changed-files: - any-glob-to-any-file: 'pkgs/http_parser/**' + +'package:web_socket_conformance_tests': + - changed-files: + - any-glob-to-any-file: 'pkgs/web_socket_conformance_tests/**' diff --git a/pkgs/http2/CHANGELOG.md b/pkgs/http2/CHANGELOG.md index 6e482a92b3..830df9de13 100644 --- a/pkgs/http2/CHANGELOG.md +++ b/pkgs/http2/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.3.2-wip + ## 2.3.1 - Require Dart 3.2 diff --git a/pkgs/http2/lib/http2.dart b/pkgs/http2/lib/http2.dart index 3f1ed78404..46f840a09c 100644 --- a/pkgs/http2/lib/http2.dart +++ b/pkgs/http2/lib/http2.dart @@ -42,7 +42,8 @@ /// /// A simple example on how to connect to a http/2 capable server and /// requesting a resource is available at https://github.com/dart-lang/http2/blob/master/example/display_headers.dart. -library http2.http2; +library; import 'transport.dart'; + export 'transport.dart'; diff --git a/pkgs/http2/lib/src/frames/frames.dart b/pkgs/http2/lib/src/frames/frames.dart index f6e74d250f..c253adb94e 100644 --- a/pkgs/http2/lib/src/frames/frames.dart +++ b/pkgs/http2/lib/src/frames/frames.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 http2.src.frames; - import 'dart:async'; import 'dart:math' show max; import 'dart:typed_data'; @@ -14,7 +12,7 @@ import '../hpack/hpack.dart'; import '../settings/settings.dart'; import '../sync_errors.dart'; +part 'frame_reader.dart'; part 'frame_types.dart'; part 'frame_utils.dart'; -part 'frame_reader.dart'; part 'frame_writer.dart'; diff --git a/pkgs/http2/lib/src/hpack/hpack.dart b/pkgs/http2/lib/src/hpack/hpack.dart index ab5d9c8fa8..de44266cdd 100644 --- a/pkgs/http2/lib/src/hpack/hpack.dart +++ b/pkgs/http2/lib/src/hpack/hpack.dart @@ -3,9 +3,9 @@ // BSD-style license that can be found in the LICENSE file. /// Implements a [HPackContext] for encoding/decoding headers according to the -/// HPACK specificaiton. See here for more information: +/// HPACK specification. See here for more information: /// https://tools.ietf.org/html/draft-ietf-httpbis-header-compression-10 -library http2.hpack; +library; import 'dart:convert' show ascii; import 'dart:typed_data'; diff --git a/pkgs/http2/pubspec.yaml b/pkgs/http2/pubspec.yaml index 7d9e6b851b..d5b614db58 100644 --- a/pkgs/http2/pubspec.yaml +++ b/pkgs/http2/pubspec.yaml @@ -1,5 +1,5 @@ name: http2 -version: 2.3.1 +version: 2.3.2-wip description: A HTTP/2 implementation in Dart. repository: https://github.com/dart-lang/http/tree/master/pkgs/http2 @@ -13,6 +13,6 @@ environment: dev_dependencies: build_runner: ^2.3.0 - dart_flutter_team_lints: ^2.0.0 + dart_flutter_team_lints: ^3.0.0 mockito: ^5.3.2 test: ^1.21.4 diff --git a/pkgs/http_client_conformance_tests/pubspec.yaml b/pkgs/http_client_conformance_tests/pubspec.yaml index 74d165e6f9..2d8d652300 100644 --- a/pkgs/http_client_conformance_tests/pubspec.yaml +++ b/pkgs/http_client_conformance_tests/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: async: ^2.8.2 - dart_style: ^2.3.7 + dart_style: '>=2.3.7 <4.0.0' http: ^1.2.0 stream_channel: ^2.1.1 test: ^1.21.2 diff --git a/pkgs/web_socket_conformance_tests/pubspec.yaml b/pkgs/web_socket_conformance_tests/pubspec.yaml index d7b64f2e36..a4448145c0 100644 --- a/pkgs/web_socket_conformance_tests/pubspec.yaml +++ b/pkgs/web_socket_conformance_tests/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: async: ^2.11.0 crypto: ^3.0.3 - dart_style: ^2.3.7 + dart_style: '>2.3.7 <4.0.0' stream_channel: ^2.1.2 test: ^1.24.0 web_socket: ^0.1.0