From 1301b492f730000bc12e55270d8931e32c95e89a Mon Sep 17 00:00:00 2001 From: "thomashii@dukefirehawk.com" Date: Sun, 21 May 2023 09:20:55 +0800 Subject: [PATCH] Updated framework --- CHANGELOG.md | 4 ++ packages/framework/CHANGELOG.md | 4 ++ .../lib/src/core/response_context.dart | 2 +- .../lib/src/http2/http2_response_context.dart | 8 +-- packages/framework/pubspec.yaml | 64 +++++++++---------- 5 files changed, 45 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 329d8413..3f28d4b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ * Upgraded: angel3_container * Upgraded: angel3_container_generator * Upgraded: angel3_mock_request +* Upgraded: angel3_framework +* Upgraded: angel3_auth (todo) +* Upgraded: angel3_configuration (todo) +* Upgraded: angel3_validate (todo) ## 7.0.0 diff --git a/packages/framework/CHANGELOG.md b/packages/framework/CHANGELOG.md index 17ddb23e..43aa203a 100644 --- a/packages/framework/CHANGELOG.md +++ b/packages/framework/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.0.0 + +* Require Dart >= 3.0 + ## 7.0.4 * Updated `Expose` fields to non-nullable diff --git a/packages/framework/lib/src/core/response_context.dart b/packages/framework/lib/src/core/response_context.dart index 317c07fd..97793880 100644 --- a/packages/framework/lib/src/core/response_context.dart +++ b/packages/framework/lib/src/core/response_context.dart @@ -392,7 +392,7 @@ abstract class ResponseContext } } -abstract class LockableBytesBuilder extends BytesBuilder { +abstract class LockableBytesBuilder implements BytesBuilder { factory LockableBytesBuilder() { return _LockableBytesBuilderImpl(); } diff --git a/packages/framework/lib/src/http2/http2_response_context.dart b/packages/framework/lib/src/http2/http2_response_context.dart index 8898453b..fc625d34 100644 --- a/packages/framework/lib/src/http2/http2_response_context.dart +++ b/packages/framework/lib/src/http2/http2_response_context.dart @@ -60,10 +60,10 @@ class Http2ResponseContext extends ResponseContext { @override BytesBuilder? get buffer => _buffer; - @override - void addError(Object error, [StackTrace? stackTrace]) { - super.addError(error, stackTrace); - } + // @override + // void addError(Object error, [StackTrace? stackTrace]) { + // super.addError(error, stackTrace); + // } @override void useBuffer() { diff --git a/packages/framework/pubspec.yaml b/packages/framework/pubspec.yaml index 7d18735a..cab7b2a2 100644 --- a/packages/framework/pubspec.yaml +++ b/packages/framework/pubspec.yaml @@ -1,49 +1,49 @@ name: angel3_framework -version: 7.0.4 +version: 8.0.0 description: A high-powered HTTP server extensible framework with dependency injection, routing and much more. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/framework environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: - angel3_container: ^7.0.0 - angel3_http_exception: ^7.0.0 - angel3_model: ^7.0.0 - angel3_route: ^7.0.0 - angel3_mock_request: ^7.0.0 - belatuk_merge_map: ^4.0.0 - belatuk_combinator: ^4.0.0 - belatuk_http_server: ^3.0.0 - charcode: ^1.2.0 - file: ^6.1.0 + angel3_container: ^8.0.0 + angel3_http_exception: ^8.0.0 + angel3_model: ^8.0.0 + angel3_route: ^8.0.0 + angel3_mock_request: ^8.0.0 + belatuk_merge_map: ^5.0.0 + belatuk_combinator: ^5.0.0 + belatuk_http_server: ^4.0.0 + charcode: ^1.3.0 + file: ^7.0.0 http_parser: ^4.0.0 http2: ^2.0.0 - logging: ^1.0.0 - matcher: ^0.12.10 - meta: ^1.3.0 + logging: ^1.1.0 + matcher: ^0.12.16 + meta: ^1.9.0 mime: ^1.0.0 path: ^1.8.0 - quiver: ^3.0.1 - recase: ^4.0.0 - stack_trace: ^1.10.0 - string_scanner: ^1.1.0 + quiver: ^3.2.0 + recase: ^4.1.0 + stack_trace: ^1.11.0 + string_scanner: ^1.2.0 tuple: ^2.0.0 - uuid: ^3.0.1 - collection: ^1.15.0 + uuid: ^3.0.0 + collection: ^1.17.0 dev_dependencies: http: ^0.13.1 io: ^1.0.0 - test: ^1.21.0 - lints: ^2.0.0 + test: ^1.24.0 + lints: ^2.1.0 dependency_overrides: angel3_container: path: ../container/angel_container -# angel3_http_exception: -# path: ../http_exception -# angel3_model: -# path: ../model -# angel3_route: -# path: ../route -# angel3_mock_request: -# path: ../mock_request - + angel3_http_exception: + path: ../http_exception + angel3_model: + path: ../model + angel3_route: + path: ../route + angel3_mock_request: + path: ../mock_request +