Skip to content

Commit

Permalink
Update to latest lints, require Dart ^3.1 (#568)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo authored Dec 1, 2023
1 parent 3774ad0 commit 42d32cb
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
matrix:
# Add macos-latest and/or windows-latest if relevant for this package.
os: [ubuntu-latest]
sdk: [2.19.0, dev]
sdk: [3.1, dev]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 7.1.2-wip

* Require Dart `^3.1.0`.
* Update all CommonMark specification links to 0.30.
* Fix beginning of line detection in `AutolinkExtensionSyntax`.

Expand Down
6 changes: 2 additions & 4 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ analyzer:
# The example app explicitly takes a String of user-generated HTML and
# inserts it straight into a <div> using innerHtml.
unsafe_html: ignore
# Waiting on a couple of bug fixes and new features before this should be enabled
comment_references: ignore

linter:
rules:
Expand All @@ -25,15 +27,11 @@ linter:
- missing_whitespace_between_adjacent_strings
- no_adjacent_strings_in_list
- package_api_docs
- prefer_const_constructors
- prefer_const_declarations
- prefer_final_locals
- prefer_final_in_for_each
- prefer_relative_imports
- test_types_in_equals
- unnecessary_await_in_return
- unnecessary_raw_strings
- use_if_null_to_convert_nulls_to_bools
- use_raw_strings
- use_string_buffers
- use_super_parameters
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ executables:
markdown:

environment:
sdk: '>=2.19.0 <3.0.0'
sdk: ^3.1.0

dependencies:
args: ^2.0.0
Expand All @@ -20,11 +20,11 @@ dependencies:
dev_dependencies:
build_runner: ^2.0.5
build_version: ^2.0.3
build_web_compilers: '>=3.0.0 <5.0.0'
build_web_compilers: ^4.0.0
collection: ^1.15.0
dart_flutter_team_lints: ^1.0.0
dart_flutter_team_lints: ^2.0.0
html: ^0.15.0
http: '>=0.13.5 <2.0.0'
http: ^1.0.0
io: ^1.0.0
js: ^0.6.3
path: ^1.8.0
Expand Down
5 changes: 2 additions & 3 deletions tool/expected_output.dart
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,10 @@ Iterable<DataCase> _dataCases({
return results;
}

/// Parse and yield data cases (each a [DataCase]) from the directory containing
/// [library], optionally under [subdirectory].
/// Parse and yield data cases (each a [DataCase]) from [testDirectory].
///
/// By default, only read data cases from files with a `.unit` extension. Data
/// cases are read from files located immediately in [directory], or
/// cases are read from files located immediately in [testDirectory], or
/// recursively, according to [recursive].
///
/// The typical use case of this method is to declare a library at the top of a
Expand Down
21 changes: 3 additions & 18 deletions tool/stats.dart
Original file line number Diff line number Diff line change
Expand Up @@ -179,26 +179,11 @@ Future<void> _processConfig(

Object? _convert(Object? obj) {
if (obj is CompareLevel) {
switch (obj) {
case CompareLevel.strict:
return 'strict';
case CompareLevel.error:
return 'error';
case CompareLevel.fail:
return 'fail';
case CompareLevel.loose:
return 'loose';
default:
throw ArgumentError('`$obj` is unknown.');
}
return obj.name;
}
if (obj is Map) {
final map = <String, Object?>{};
obj.forEach((k, v) {
final newKey = k.toString();
map[newKey] = v;
});
return map;
return obj
.map<String, Object?>((key, value) => MapEntry(key.toString(), value));
}
return obj;
}
Expand Down
2 changes: 1 addition & 1 deletion tool/update_github_emojis.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const _emojisFilePath = 'lib/src/emojis.dart';
/// Reference to emoji map within legacy_emojis.dart
const legacyEmojis = legacy.emojis;

/// AUTO GENERATED by [reconcile_emojis.dart] - this only needed to be done ONCE
/// AUTO GENERATED by `reconcile_emojis.dart` - this only needed to be done ONCE
/// during the reconciliation process with the legacy emoji.
/// This array is ONLY USED when the --useGitHubUnicodes option is used to
/// minimize the visual differences in the output emoji.
Expand Down

0 comments on commit 42d32cb

Please sign in to comment.