From 0010405bda2de24cf2195462dbe5be5e39a9d7d2 Mon Sep 17 00:00:00 2001 From: "thomashii@dukefirehawk.com" Date: Sun, 26 Mar 2023 09:34:19 +0800 Subject: [PATCH] Migrated to Dart 3 --- packages/body_parser/README.md | 2 +- packages/body_parser/pubspec.yaml | 2 +- packages/code_buffer/README.md | 2 +- packages/code_buffer/pubspec.yaml | 2 +- packages/combinator/pubspec.yaml | 2 +- packages/html_builder/CHANGELOG.md | 4 ++++ packages/html_builder/README.md | 2 +- packages/html_builder/lib/src/mutations.dart | 6 +++--- packages/html_builder/pubspec.yaml | 6 +++--- packages/html_builder/test/render_test.dart | 1 - 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/packages/body_parser/README.md b/packages/body_parser/README.md index 8eb0211..c5c71e4 100644 --- a/packages/body_parser/README.md +++ b/packages/body_parser/README.md @@ -30,7 +30,7 @@ A benefit of this is that primitive types are automatically deserialized correct To install Body Parser for your Dart project, simply add body_parser to your pub dependencies. dependencies: - belatuk_body_parser: ^4.0.0 + belatuk_body_parser: ^5.0.0 ### Usage diff --git a/packages/body_parser/pubspec.yaml b/packages/body_parser/pubspec.yaml index 6008acd..4667195 100644 --- a/packages/body_parser/pubspec.yaml +++ b/packages/body_parser/pubspec.yaml @@ -10,5 +10,5 @@ dependencies: mime: ^1.0.0 dev_dependencies: http: ^0.13.0 - test: ^1.17.8 + test: ^1.24.0 lints: ^2.0.0 \ No newline at end of file diff --git a/packages/code_buffer/README.md b/packages/code_buffer/README.md index e305835..13747b7 100644 --- a/packages/code_buffer/README.md +++ b/packages/code_buffer/README.md @@ -14,7 +14,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - belatuk_code_buffer: ^4.0.0 + belatuk_code_buffer: ^5.0.0 ``` ## Usage diff --git a/packages/code_buffer/pubspec.yaml b/packages/code_buffer/pubspec.yaml index 23f8e93..f309685 100644 --- a/packages/code_buffer/pubspec.yaml +++ b/packages/code_buffer/pubspec.yaml @@ -8,5 +8,5 @@ dependencies: charcode: ^1.2.0 source_span: ^1.8.1 dev_dependencies: - test: ^1.17.3 + test: ^1.24.0 lints: ^2.0.0 diff --git a/packages/combinator/pubspec.yaml b/packages/combinator/pubspec.yaml index ba30c0b..5e66cfb 100644 --- a/packages/combinator/pubspec.yaml +++ b/packages/combinator/pubspec.yaml @@ -11,5 +11,5 @@ dependencies: string_scanner: ^1.1.0 tuple: ^2.0.0 dev_dependencies: - test: ^1.17.4 + test: ^1.24.0 lints: ^2.0.0 diff --git a/packages/html_builder/CHANGELOG.md b/packages/html_builder/CHANGELOG.md index e2c2d5f..3e26cab 100644 --- a/packages/html_builder/CHANGELOG.md +++ b/packages/html_builder/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 5.0.0-beta.1 + +* Require Dart >= 3.0 + ## 4.0.0 * Require Dart >= 2.17 diff --git a/packages/html_builder/README.md b/packages/html_builder/README.md index b59ff25..243791c 100644 --- a/packages/html_builder/README.md +++ b/packages/html_builder/README.md @@ -18,7 +18,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - belatuk_html_builder: ^4.0.0 + belatuk_html_builder: ^5.0.0 ``` ## Usage diff --git a/packages/html_builder/lib/src/mutations.dart b/packages/html_builder/lib/src/mutations.dart index 3173163..f3cdc7e 100644 --- a/packages/html_builder/lib/src/mutations.dart +++ b/packages/html_builder/lib/src/mutations.dart @@ -12,9 +12,9 @@ Node Function(Node) rebuild(NodeBuilder Function(NodeBuilder) transform, /// /// Use this alongside [rebuild]. Node Function(Node) rebuildRecursive(Node Function(Node) f) { - Node _build(Node node) { - return NodeBuilder.from(f(node)).mapChildren(_build).build(); + Node build(Node node) { + return NodeBuilder.from(f(node)).mapChildren(build).build(); } - return _build; + return build; } diff --git a/packages/html_builder/pubspec.yaml b/packages/html_builder/pubspec.yaml index 26b993a..52e1fe2 100644 --- a/packages/html_builder/pubspec.yaml +++ b/packages/html_builder/pubspec.yaml @@ -1,12 +1,12 @@ name: belatuk_html_builder -version: 4.0.0 +version: 5.0.0-beta.1 description: Build HTML AST's and render them to HTML. This can be used as an internal DSL, i.e. for a templating engine. homepage: https://github.com/dart-backend/belatuk-common-utilities/tree/main/packages/html_builder environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=3.0.0-290.3.beta <4.0.0' dependencies: collection: ^1.15.0 dev_dependencies: html: ^0.15.0 - test: ^1.17.4 + test: ^1.24.0 lints: ^2.0.0 diff --git a/packages/html_builder/test/render_test.dart b/packages/html_builder/test/render_test.dart index 17a2867..e078b4f 100644 --- a/packages/html_builder/test/render_test.dart +++ b/packages/html_builder/test/render_test.dart @@ -1,6 +1,5 @@ import 'package:html/parser.dart' as html5; import 'package:belatuk_html_builder/elements.dart'; -import 'package:belatuk_html_builder/belatuk_html_builder.dart'; import 'package:test/test.dart'; void main() {