From b7728bc761896360269e4d7187bbdb5fef6b53ae Mon Sep 17 00:00:00 2001 From: thomashii Date: Sat, 6 Mar 2021 22:10:24 +0800 Subject: [PATCH] Updated package framework --- CHANGELOG.md | 3 ++ .../container/angel_container/pubspec.yaml | 10 ++-- packages/framework/example/hostname.dart | 3 +- packages/framework/example/main.dart | 3 +- packages/framework/pubspec.yaml | 49 +++++++++++-------- packages/framework/test/controller_test.dart | 6 +-- packages/framework/test/di_test.dart | 13 ++--- packages/model/pubspec.yaml | 2 +- 8 files changed, 49 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 587494b5..ae39bd83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # 2.3.0 +* Changed Dart SDK requirements for all packages to ">=2.10.0 <3.0.0" * Upgrade angel_http_exception to 1.3.0 * Upgrade angel_cli to 2.3.0. Rename not working. * Upgrade angel_route to 3.3.0 * Upgrade angel_model to 1.3.0 +* Upgrade angel_container to 1.3.0 +* Upgrade angel_framework to 2.3.0 # 2.2.0 diff --git a/packages/container/angel_container/pubspec.yaml b/packages/container/angel_container/pubspec.yaml index a60b3e8a..7ac64d52 100644 --- a/packages/container/angel_container/pubspec.yaml +++ b/packages/container/angel_container/pubspec.yaml @@ -1,13 +1,13 @@ name: angel_container -version: 1.1.0 +version: 1.3.0 author: Tobe O description: A hierarchical DI container, and pluggable backends for reflection. homepage: https://github.com/angel-dart/container.git environment: - sdk: ">=2.10.0 <2.12.0" + sdk: ">=2.10.0 <3.0.0" dependencies: - collection: ^1.14.13 + collection: ^1.15.0 quiver: ^2.1.5 dev_dependencies: - pedantic: ^1.9.2 - test: ^1.15.7 \ No newline at end of file + pedantic: ^1.11.0 + test: ^1.16.5 \ No newline at end of file diff --git a/packages/framework/example/hostname.dart b/packages/framework/example/hostname.dart index 80628642..66003dd0 100644 --- a/packages/framework/example/hostname.dart +++ b/packages/framework/example/hostname.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:angel_framework/angel_framework.dart'; import 'package:angel_framework/http.dart'; import 'package:logging/logging.dart'; -import 'package:pretty_logging/pretty_logging.dart'; Future apiConfigurer(Angel app) async { app.get('/', (req, res) => 'Hello, API!'); @@ -18,7 +17,7 @@ Future frontendConfigurer(Angel app) async { main() async { // Logging set up/boilerplate hierarchicalLoggingEnabled = true; - Logger.root.onRecord.listen(prettyLog); + //Logger.root.onRecord.listen(prettyLog); var app = Angel(logger: Logger('angel')); var http = AngelHttp(app); diff --git a/packages/framework/example/main.dart b/packages/framework/example/main.dart index f500270b..ce99ce09 100644 --- a/packages/framework/example/main.dart +++ b/packages/framework/example/main.dart @@ -2,11 +2,10 @@ import 'package:angel_container/mirrors.dart'; import 'package:angel_framework/angel_framework.dart'; import 'package:angel_framework/http.dart'; import 'package:logging/logging.dart'; -import 'package:pretty_logging/pretty_logging.dart'; main() async { // Logging set up/boilerplate - Logger.root.onRecord.listen(prettyLog); + //Logger.root.onRecord.listen(prettyLog); // Create our server. var app = Angel( diff --git a/packages/framework/pubspec.yaml b/packages/framework/pubspec.yaml index 9e373074..fdb969d1 100644 --- a/packages/framework/pubspec.yaml +++ b/packages/framework/pubspec.yaml @@ -1,41 +1,48 @@ name: angel_framework -version: 2.1.1 +version: 2.3.0 description: A high-powered HTTP server with dependency injection, routing and much more. author: Tobe O homepage: https://github.com/angel-dart/angel_framework +publish_to: none environment: - sdk: ">=2.10.0 <2.12.0" + sdk: ">=2.10.0 <3.0.0" dependencies: - angel_container: # ^1.0.4 - path: ../container/angel_container - angel_http_exception: #^1.0.0 - path: ../http_exception - angel_model: #^1.0.0 - path: ../model - angel_route: #^3.0.0 - path: ../route + angel_container: ^1.3.0 + angel_http_exception: ^1.3.0 + angel_model: ^1.3.0 + angel_route: ^3.3.0 charcode: ^1.0.0 combinator: ^1.0.0 - file: ^5.0.0 - http_parser: ^3.0.0 + file: ^6.1.0 + http_parser: ^4.0.0 http_server: ^0.9.0 - http2: "^1.0.0" - logging: ">=0.11.3 <1.0.0" + http2: ^2.0.0 + logging: ^1.0.0 matcher: ^0.12.0 merge_map: ^1.0.0 meta: ^1.0.0 - mime: ^0.9.3 + mime: ^0.9.0 mock_request: ^1.0.0 path: ^1.0.0 # pedantic: ^1.0.0 quiver_hashcode: ^2.0.0 - recase: ^2.0.0 + recase: ^3.0.1 stack_trace: ^1.0.0 string_scanner: ^1.0.0 - tuple: ^1.0.0 - uuid: ^2.0.0-rc.1 + tuple: ^1.0.3 + uuid: ^3.0.1 dev_dependencies: - http: ^0.12.0 - io: ^0.3.0 - pretty_logging: ^1.0.0 + http: ^0.13.0 + io: ^1.0.0 + #pretty_logging: ^1.0.0 test: ^1.15.7 +dependency_overrides: + angel_route: + path: ../route + angel_http_exception: + path: ../http_exception + angel_model: + path: ../model + angel_container: + path: ../container/angel_container + diff --git a/packages/framework/test/controller_test.dart b/packages/framework/test/controller_test.dart index d5689c72..450d70a0 100644 --- a/packages/framework/test/controller_test.dart +++ b/packages/framework/test/controller_test.dart @@ -139,7 +139,7 @@ main() { test("middleware", () async { var rgx = RegExp("^Hello, world!"); - var response = await client.get("$url/todos/0"); + var response = await client.get(Uri.parse("$url/todos/0")); print('Response: ${response.body}'); expect(rgx.firstMatch(response.body)?.start, equals(0)); @@ -152,7 +152,7 @@ main() { test("controller in group", () async { var rgx = RegExp("^Hello, world!"); - var response = await client.get("$url/ctrl_group/todos/0"); + var response = await client.get(Uri.parse("$url/ctrl_group/todos/0")); print('Response: ${response.body}'); expect(rgx.firstMatch(response.body)?.start, equals(0)); @@ -164,7 +164,7 @@ main() { }); test("named actions", () async { - var response = await client.get("$url/redirect"); + var response = await client.get(Uri.parse("$url/redirect")); print('Response: ${response.body}'); expect(response.body, equals("Hello, \"world!\"")); }); diff --git a/packages/framework/test/di_test.dart b/packages/framework/test/di_test.dart index a0df1f36..26e902b8 100644 --- a/packages/framework/test/di_test.dart +++ b/packages/framework/test/di_test.dart @@ -71,32 +71,33 @@ main() { }); test("singleton in route", () async { - validateTodoSingleton(await client.get("$url/errands")); + validateTodoSingleton(await client.get(Uri.parse("$url/errands"))); }); test("singleton in controller", () async { - validateTodoSingleton(await client.get("$url/errands2")); + validateTodoSingleton(await client.get(Uri.parse("$url/errands2"))); }); test("make in route", () async { - var response = await client.get("$url/errands3"); + var response = await client.get(Uri.parse("$url/errands3")); var text = await json.decode(response.body) as String; expect(text, equals(TEXT)); }); test("make in controller", () async { - var response = await client.get("$url/errands4"); + var response = await client.get(Uri.parse("$url/errands4")); var text = await json.decode(response.body) as String; expect(text, equals(TEXT)); }); test('resolve from future in controller', () async { - var response = await client.post('$url/errands4/async', body: 'hey'); + var response = + await client.post(Uri.parse('$url/errands4/async'), body: 'hey'); expect(response.body, json.encode({'bar': 'hey'})); }); test('resolve from future in route', () async { - var response = await client.post('$url/async', body: 'yes'); + var response = await client.post(Uri.parse('$url/async'), body: 'yes'); expect(response.body, json.encode({'baz': 'yes'})); }); } diff --git a/packages/model/pubspec.yaml b/packages/model/pubspec.yaml index a8971ac9..a98d5d32 100644 --- a/packages/model/pubspec.yaml +++ b/packages/model/pubspec.yaml @@ -2,7 +2,7 @@ name: angel_model version: 1.3.0 description: Angel's basic data model class, no longer with the added weight of the whole framework. author: Tobe O -homepage: https://github.com/angel-dart/model +homepage: https://github.com/dukefirehawk/angel/packages/model environment: sdk: ">=2.10.0 <3.0.0" dev_dependencies: