From 98e0cf52a54e5f6179ae8f219cea70ec98bdfa07 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 11 Sep 2024 09:40:21 -0700 Subject: [PATCH 1/3] wip --- pkgs/cli_config/lib/src/config.dart | 4 ++-- .../lib/extension_discovery.dart | 4 ++-- .../lib/src/yaml_config_format.dart | 4 ++-- pkgs/mime/lib/src/bound_multipart_stream.dart | 1 - pkgs/oauth2/analysis_options.yaml | 20 ------------------- pkgs/oauth2/pubspec.yaml | 2 +- pkgs/source_map_stack_trace/pubspec.yaml | 2 +- 7 files changed, 8 insertions(+), 29 deletions(-) diff --git a/pkgs/cli_config/lib/src/config.dart b/pkgs/cli_config/lib/src/config.dart index 63120293..85e2c0c4 100644 --- a/pkgs/cli_config/lib/src/config.dart +++ b/pkgs/cli_config/lib/src/config.dart @@ -82,7 +82,7 @@ class Config { /// Constructs a config by parsing the three sources. /// - /// If provided, [commandLineDefines] must be a list of '='. + /// If provided, [commandLineDefines] must be a list of `=`. /// /// If provided, [workingDirectory] is used to resolves paths inside /// [commandLineDefines]. @@ -120,7 +120,7 @@ class Config { /// Constructs a config by parsing the three sources. /// - /// If provided, [commandLineDefines] must be a list of '='. + /// If provided, [commandLineDefines] must be a list of `=`. /// /// If provided, [workingDirectory] is used to resolves paths inside /// [commandLineDefines]. diff --git a/pkgs/extension_discovery/lib/extension_discovery.dart b/pkgs/extension_discovery/lib/extension_discovery.dart index 197ae6d7..22a5fedb 100644 --- a/pkgs/extension_discovery/lib/extension_discovery.dart +++ b/pkgs/extension_discovery/lib/extension_discovery.dart @@ -60,8 +60,8 @@ final class Extension { /// * [bool] (`true` or `false`), /// * [String], /// * [num] ([int] or [double]), - /// * [List], and, - /// * [Map]. + /// * `List`, and, + /// * `Map`. final Map config; Extension._({ diff --git a/pkgs/extension_discovery/lib/src/yaml_config_format.dart b/pkgs/extension_discovery/lib/src/yaml_config_format.dart index 53da6d3d..a28b31b3 100644 --- a/pkgs/extension_discovery/lib/src/yaml_config_format.dart +++ b/pkgs/extension_discovery/lib/src/yaml_config_format.dart @@ -38,8 +38,8 @@ import 'package:yaml/yaml.dart' /// * [bool] (`true` or `false`), /// * [String], /// * [num] ([int] or [double]), -/// * [List], and, -/// * [Map]. +/// * `List`, and, +/// * `Map`. Map parseYamlFromConfigFile(String yamlString) { final visited = {}; Object? toPlainType(YamlNode n) { diff --git a/pkgs/mime/lib/src/bound_multipart_stream.dart b/pkgs/mime/lib/src/bound_multipart_stream.dart index 0830a610..03b213be 100644 --- a/pkgs/mime/lib/src/bound_multipart_stream.dart +++ b/pkgs/mime/lib/src/bound_multipart_stream.dart @@ -348,7 +348,6 @@ class BoundMultipartStream { default: // Should be unreachable. assert(false); - break; } // Move to the next byte. diff --git a/pkgs/oauth2/analysis_options.yaml b/pkgs/oauth2/analysis_options.yaml index 68d2a49a..e21412ca 100644 --- a/pkgs/oauth2/analysis_options.yaml +++ b/pkgs/oauth2/analysis_options.yaml @@ -10,34 +10,14 @@ analyzer: linter: rules: - - always_declare_return_types - - avoid_catching_errors - - avoid_dynamic_calls - avoid_private_typedef_functions - avoid_unused_constructor_parameters - avoid_void_async - cancel_subscriptions - - directives_ordering - literal_only_boolean_expressions - no_adjacent_strings_in_list - no_runtimeType_toString - - omit_local_variable_types - - only_throw_errors - package_api_docs - - prefer_asserts_in_initializer_lists - - prefer_const_constructors - prefer_const_declarations - - prefer_relative_imports - - prefer_single_quotes - - sort_pub_dependencies - - test_types_in_equals - - throw_in_finally - - type_annotate_public_apis - - unawaited_futures - unnecessary_await_in_return - - unnecessary_lambdas - - unnecessary_parenthesis - - unnecessary_statements - - use_is_even_rather_than_modulo - use_string_buffers - - use_super_parameters diff --git a/pkgs/oauth2/pubspec.yaml b/pkgs/oauth2/pubspec.yaml index 9c89b7bd..aeb44d9f 100644 --- a/pkgs/oauth2/pubspec.yaml +++ b/pkgs/oauth2/pubspec.yaml @@ -16,5 +16,5 @@ dependencies: http_parser: ^4.0.0 dev_dependencies: - dart_flutter_team_lints: ^2.0.0 + dart_flutter_team_lints: ^3.0.0 test: ^1.16.0 diff --git a/pkgs/source_map_stack_trace/pubspec.yaml b/pkgs/source_map_stack_trace/pubspec.yaml index ecd579ae..5ed2ecab 100644 --- a/pkgs/source_map_stack_trace/pubspec.yaml +++ b/pkgs/source_map_stack_trace/pubspec.yaml @@ -12,6 +12,6 @@ dependencies: stack_trace: ^1.10.0 dev_dependencies: - dart_flutter_team_lints: ^2.0.0 + dart_flutter_team_lints: ^3.0.0 source_span: ^1.8.0 test: ^1.16.0 From f849bf59cd82dfc6d27e279ecf1469e598132a9c Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 11 Sep 2024 09:42:44 -0700 Subject: [PATCH 2/3] wip --- .github/workflows/oauth2.yml | 4 ++-- pkgs/oauth2/CHANGELOG.md | 4 ++++ pkgs/oauth2/pubspec.yaml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/oauth2.yml b/.github/workflows/oauth2.yml index 820dd1a4..da3883df 100644 --- a/.github/workflows/oauth2.yml +++ b/.github/workflows/oauth2.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [3.0.0, dev] + sdk: [dev] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 @@ -62,7 +62,7 @@ jobs: matrix: # Add macos-latest and/or windows-latest if relevant for this package. os: [ubuntu-latest] - sdk: [stable, beta] + sdk: [3.4, dev] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 diff --git a/pkgs/oauth2/CHANGELOG.md b/pkgs/oauth2/CHANGELOG.md index 33d927e2..ff39de3f 100644 --- a/pkgs/oauth2/CHANGELOG.md +++ b/pkgs/oauth2/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.4-wip + +* Require Dart 3.4 + ## 2.0.3 * Require `package:http` v1.0.0 diff --git a/pkgs/oauth2/pubspec.yaml b/pkgs/oauth2/pubspec.yaml index aeb44d9f..75ded187 100644 --- a/pkgs/oauth2/pubspec.yaml +++ b/pkgs/oauth2/pubspec.yaml @@ -1,5 +1,5 @@ name: oauth2 -version: 2.0.3 +version: 2.0.4-wip description: >- A client library for authenticating with a remote service via OAuth2 on behalf of a user, and making authorized HTTP requests with the user's @@ -7,7 +7,7 @@ description: >- repository: https://github.com/dart-lang/tools/tree/main/pkgs/oauth2 environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: collection: ^1.15.0 From 2bae72ad9348c0d25876ae4147032978d294aa3f Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 11 Sep 2024 09:46:02 -0700 Subject: [PATCH 3/3] wip --- pkgs/source_map_stack_trace/CHANGELOG.md | 2 ++ pkgs/source_map_stack_trace/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/source_map_stack_trace/CHANGELOG.md b/pkgs/source_map_stack_trace/CHANGELOG.md index 64300db6..00c66d9c 100644 --- a/pkgs/source_map_stack_trace/CHANGELOG.md +++ b/pkgs/source_map_stack_trace/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.1.3-wip + ## 2.1.2 * Require Dart 3.3.0 diff --git a/pkgs/source_map_stack_trace/pubspec.yaml b/pkgs/source_map_stack_trace/pubspec.yaml index 5ed2ecab..d4b8c3aa 100644 --- a/pkgs/source_map_stack_trace/pubspec.yaml +++ b/pkgs/source_map_stack_trace/pubspec.yaml @@ -1,5 +1,5 @@ name: source_map_stack_trace -version: 2.1.2 +version: 2.1.3-wip description: A package for applying source maps to stack traces. repository: https://github.com/dart-lang/tools/tree/main/pkgs/source_map_stack_trace