Skip to content

Commit ce26f75

Browse files
authored
Update all lints and dart_flutter_team_lints dependencies (#161)
1 parent 757f503 commit ce26f75

File tree

32 files changed

+54
-80
lines changed

32 files changed

+54
-80
lines changed

pkgs/native_assets_builder/analysis_options.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,13 @@ include: package:dart_flutter_team_lints/analysis_options.yaml
33
analyzer:
44
language:
55
strict-raw-types: true
6-
strict-inference: true
76
exclude:
87
# TODO(https://github.com/dart-lang/ecosystem/issues/150): Remove this.
98
- test/data/
109

1110
linter:
1211
rules:
13-
- always_declare_return_types
14-
- avoid_dynamic_calls
15-
- camel_case_types
16-
- depend_on_referenced_packages
17-
- directives_ordering
1812
- prefer_const_declarations
1913
- prefer_expression_function_bodies
2014
- prefer_final_in_for_each
2115
- prefer_final_locals
22-
- prefer_relative_imports
23-
- prefer_single_quotes
24-
- sort_pub_dependencies
25-
- unawaited_futures

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ build_output.yaml contained a format error.
287287
${e.message}
288288
''');
289289
success = false;
290-
return (<Asset>[], <Uri>[], Metadata({}), false);
290+
return (<Asset>[], <Uri>[], const Metadata({}), false);
291291
// TODO(https://github.com/dart-lang/native/issues/109): Stop throwing
292292
// type errors in native_assets_cli, release a new version of that package
293293
// and then remove this.
@@ -298,7 +298,7 @@ Building native assets for package:${config.packageName} failed.
298298
build_output.yaml contained a format error.
299299
''');
300300
success = false;
301-
return (<Asset>[], <Uri>[], Metadata({}), false);
301+
return (<Asset>[], <Uri>[], const Metadata({}), false);
302302
} finally {
303303
if (!success) {
304304
final buildOutputFile =
@@ -472,7 +472,7 @@ final class _BuildResultImpl implements BuildResult {
472472
extension on DateTime {
473473
DateTime roundDownToSeconds() =>
474474
DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch -
475-
millisecondsSinceEpoch % Duration(seconds: 1).inMilliseconds);
475+
millisecondsSinceEpoch % const Duration(seconds: 1).inMilliseconds);
476476
}
477477

478478
int _uriCompare(Uri u1, Uri u2) => u1.toString().compareTo(u2.toString());

pkgs/native_assets_builder/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
package_config: ^2.1.0
1515

1616
dev_dependencies:
17-
dart_flutter_team_lints: ^1.0.0
17+
dart_flutter_team_lints: ^2.1.1
1818
file_testing: ^3.0.0
1919
test: ^1.24.3
2020
yaml: ^3.1.2

pkgs/native_assets_builder/test/data/cyclic_package_1/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ dependencies:
1616
yaml_edit: ^2.1.0
1717

1818
dev_dependencies:
19-
lints: ^2.0.0
19+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/cyclic_package_2/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ dependencies:
1616
yaml_edit: ^2.1.0
1717

1818
dev_dependencies:
19-
lints: ^2.0.0
19+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/native_add/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies:
1515

1616
dev_dependencies:
1717
ffigen: ^8.0.2
18-
lints: ^2.0.0
18+
lints: ^3.0.0
1919
test: ^1.23.1

pkgs/native_assets_builder/test/data/native_add_add_source/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies:
1515

1616
dev_dependencies:
1717
ffigen: ^8.0.2
18-
lints: ^2.0.0
18+
lints: ^3.0.0
1919
test: ^1.23.1

pkgs/native_assets_builder/test/data/native_subtract/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies:
1515

1616
dev_dependencies:
1717
ffigen: ^8.0.2
18-
lints: ^2.0.0
18+
lints: ^3.0.0
1919
test: ^1.23.1

pkgs/native_assets_builder/test/data/package_reading_metadata/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ dependencies:
1616
yaml_edit: ^2.1.0
1717

1818
dev_dependencies:
19-
lints: ^2.0.0
19+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/package_with_metadata/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ dependencies:
1414
yaml_edit: ^2.1.0
1515

1616
dev_dependencies:
17-
lints: ^2.0.0
17+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/wrong_build_output/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ dependencies:
1414
yaml_edit: ^2.1.0
1515

1616
dev_dependencies:
17-
lints: ^2.0.0
17+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/wrong_build_output_2/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ dependencies:
1414
yaml_edit: ^2.1.0
1515

1616
dev_dependencies:
17-
lints: ^2.0.0
17+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/wrong_build_output_3/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ dependencies:
1414
yaml_edit: ^2.1.0
1515

1616
dev_dependencies:
17-
lints: ^2.0.0
17+
lints: ^3.0.0

pkgs/native_assets_builder/test/data/wrong_namespace_asset/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ dependencies:
1414
yaml_edit: ^2.1.0
1515

1616
dev_dependencies:
17-
lints: ^2.0.0
17+
lints: ^3.0.0

pkgs/native_assets_cli/analysis_options.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,10 @@ include: package:dart_flutter_team_lints/analysis_options.yaml
33
analyzer:
44
language:
55
strict-raw-types: true
6-
strict-inference: true
76

87
linter:
98
rules:
10-
- always_declare_return_types
11-
- avoid_dynamic_calls
12-
- camel_case_types
13-
- depend_on_referenced_packages
14-
- directives_ordering
159
- prefer_const_declarations
1610
- prefer_expression_function_bodies
1711
- prefer_final_in_for_each
1812
- prefer_final_locals
19-
- prefer_relative_imports
20-
- prefer_single_quotes
21-
- sort_pub_dependencies
22-
- unawaited_futures

pkgs/native_assets_cli/example/native_add_app/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies:
1313
path: ../native_add_library/
1414

1515
dev_dependencies:
16-
lints: ^2.0.0
16+
lints: ^3.0.0
1717
test: ^1.21.0

pkgs/native_assets_cli/example/native_add_library/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ dependencies:
1616

1717
dev_dependencies:
1818
ffigen: ^8.0.2
19-
lints: ^2.0.0
19+
lints: ^3.0.0
2020
test: ^1.21.0

pkgs/native_assets_cli/lib/src/model/build_config.dart

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'dart:convert';
6+
import 'dart:io';
67

78
import 'package:cli_config/cli_config.dart';
89
import 'package:collection/collection.dart';
@@ -525,7 +526,7 @@ class BuildConfig {
525526
if (other.targetIOSSdk != targetIOSSdk) return false;
526527
if (other.targetAndroidNdkApi != targetAndroidNdkApi) return false;
527528
if (other.cCompiler != cCompiler) return false;
528-
if (!DeepCollectionEquality()
529+
if (!const DeepCollectionEquality()
529530
.equals(other.dependencyMetadata, _dependencyMetadata)) return false;
530531
}
531532
return true;
@@ -541,7 +542,7 @@ class BuildConfig {
541542
dryRun,
542543
if (!dryRun) ...[
543544
buildMode,
544-
DeepCollectionEquality().hash(dependencyMetadata),
545+
const DeepCollectionEquality().hash(dependencyMetadata),
545546
targetArchitecture,
546547
targetIOSSdk,
547548
targetAndroidNdkApi,
@@ -564,7 +565,7 @@ can _only_ depend on OS.''');
564565
void _throwIfNotNullInDryRun<T>(String key) {
565566
final object = config.valueOf<T?>(key);
566567
if (object != null) {
567-
throw FormatException('''This field is not available in dry runs.
568+
throw const FormatException('''This field is not available in dry runs.
568569
In Flutter projects, native builds are generated per OS which target multiple
569570
architectures, build modes, etc. Therefore, the list of native assets produced
570571
can _only_ depend on OS.''');
@@ -639,7 +640,8 @@ class CCompilerConfig {
639640
if (other.cc != cc) return false;
640641
if (other.ld != ld) return false;
641642
if (other.envScript != envScript) return false;
642-
if (!ListEquality<String>().equals(other.envScriptArgs, envScriptArgs)) {
643+
if (!const ListEquality<String>()
644+
.equals(other.envScriptArgs, envScriptArgs)) {
643645
return false;
644646
}
645647
return true;
@@ -651,6 +653,6 @@ class CCompilerConfig {
651653
_cc,
652654
_ld,
653655
_envScript,
654-
ListEquality<String>().hash(envScriptArgs),
656+
const ListEquality<String>().hash(envScriptArgs),
655657
);
656658
}

pkgs/native_assets_cli/lib/src/model/build_output.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class BuildOutput {
3333
Metadata? metadata,
3434
}) : timestamp = (timestamp ?? DateTime.now()).roundDownToSeconds(),
3535
assets = assets ?? [],
36-
dependencies = dependencies ?? Dependencies([]),
37-
metadata = metadata ?? Metadata({});
36+
dependencies = dependencies ?? const Dependencies([]),
37+
metadata = metadata ?? const Metadata({});
3838

3939
static const _assetsKey = 'assets';
4040
static const _dependenciesKey = 'dependencies';
@@ -121,15 +121,15 @@ class BuildOutput {
121121
return false;
122122
}
123123
return other.timestamp == timestamp &&
124-
ListEquality<Asset>().equals(other.assets, assets) &&
124+
const ListEquality<Asset>().equals(other.assets, assets) &&
125125
other.dependencies == dependencies &&
126126
other.metadata == metadata;
127127
}
128128

129129
@override
130130
int get hashCode => Object.hash(
131131
timestamp.hashCode,
132-
ListEquality<Asset>().hash(assets),
132+
const ListEquality<Asset>().hash(assets),
133133
dependencies,
134134
metadata,
135135
);

pkgs/native_assets_cli/lib/src/model/dependencies.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Dependencies {
1919
if (yaml is YamlList) {
2020
return Dependencies.fromYaml(yaml);
2121
}
22-
return Dependencies([]);
22+
return const Dependencies([]);
2323
}
2424

2525
factory Dependencies.fromYaml(YamlList? yamlList) => Dependencies([
@@ -45,9 +45,9 @@ class Dependencies {
4545
if (other is! Dependencies) {
4646
return false;
4747
}
48-
return ListEquality<Uri>().equals(other.dependencies, dependencies);
48+
return const ListEquality<Uri>().equals(other.dependencies, dependencies);
4949
}
5050

5151
@override
52-
int get hashCode => ListEquality<Uri>().hash(dependencies);
52+
int get hashCode => const ListEquality<Uri>().hash(dependencies);
5353
}

pkgs/native_assets_cli/lib/src/model/metadata.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ class Metadata {
3030
if (other is! Metadata) {
3131
return false;
3232
}
33-
return DeepCollectionEquality().equals(other.metadata, metadata);
33+
return const DeepCollectionEquality().equals(other.metadata, metadata);
3434
}
3535

3636
@override
37-
int get hashCode => DeepCollectionEquality().hash(metadata);
37+
int get hashCode => const DeepCollectionEquality().hash(metadata);
3838

3939
@override
4040
String toString() => 'Metadata(${toYaml()})';

pkgs/native_assets_cli/lib/src/utils/datetime.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
extension DateTimeExtension on DateTime {
66
DateTime roundDownToSeconds() =>
77
DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch -
8-
millisecondsSinceEpoch % Duration(seconds: 1).inMilliseconds);
8+
millisecondsSinceEpoch % const Duration(seconds: 1).inMilliseconds);
99
}

pkgs/native_assets_cli/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ dependencies:
2222
yaml_edit: ^2.1.0
2323

2424
dev_dependencies:
25-
dart_flutter_team_lints: ^1.0.0
25+
dart_flutter_team_lints: ^2.1.1
2626
test: ^1.21.0

pkgs/native_assets_cli/test/model/asset_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ native-assets:
158158

159159
test('List<Asset> hashCode', () async {
160160
final assets2 = assets.take(3).toList();
161-
final equality = ListEquality<Asset>();
161+
const equality = ListEquality<Asset>();
162162
expect(equality.hash(assets) != equality.hash(assets2), true);
163163
});
164164

pkgs/native_assets_cli/test/model/build_config_test.dart

+8-8
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ void main() async {
178178
buildMode: BuildMode.release,
179179
linkModePreference: LinkModePreference.preferStatic,
180180
dependencyMetadata: {
181-
'bar': Metadata({
181+
'bar': const Metadata({
182182
'key': 'value',
183183
'foo': ['asdf', 'fdsa'],
184184
}),
185-
'foo': Metadata({
185+
'foo': const Metadata({
186186
'key': 321,
187187
}),
188188
},
@@ -198,10 +198,10 @@ void main() async {
198198
buildMode: BuildMode.release,
199199
linkModePreference: LinkModePreference.preferStatic,
200200
dependencyMetadata: {
201-
'bar': Metadata({
201+
'bar': const Metadata({
202202
'key': 'value',
203203
}),
204-
'foo': Metadata({
204+
'foo': const Metadata({
205205
'key': 123,
206206
}),
207207
},
@@ -229,11 +229,11 @@ void main() async {
229229
linkModePreference: LinkModePreference.preferStatic,
230230
// This map should be sorted on key for two layers.
231231
dependencyMetadata: {
232-
'foo': Metadata({
232+
'foo': const Metadata({
233233
'z': ['z', 'a'],
234234
'a': 321,
235235
}),
236-
'bar': Metadata({
236+
'bar': const Metadata({
237237
'key': 'value',
238238
}),
239239
},
@@ -406,7 +406,7 @@ version: ${BuildConfig.version}''';
406406
buildMode: BuildMode.release,
407407
linkModePreference: LinkModePreference.preferStatic,
408408
dependencyMetadata: {
409-
'bar': Metadata({
409+
'bar': const Metadata({
410410
'key': {'key2': 'value'},
411411
}),
412412
},
@@ -495,7 +495,7 @@ version: ${BuildConfig.version}''';
495495
buildMode: BuildMode.release,
496496
linkModePreference: LinkModePreference.dynamic,
497497
dependencyMetadata: {
498-
'foo': Metadata({'key': 'value'})
498+
'foo': const Metadata({'key': 'value'})
499499
},
500500
);
501501
printOnFailure([name1, name2].toString());

pkgs/native_assets_cli/test/model/build_output_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void main() {
3737
dependencies: Dependencies([
3838
Uri.file('path/to/file.ext'),
3939
]),
40-
metadata: Metadata({
40+
metadata: const Metadata({
4141
'key': 'value',
4242
}),
4343
);

pkgs/native_assets_cli/test/model/dependencies_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void main() {
4242

4343
test('dependencies fromYamlString', () {
4444
final dependencies = Dependencies.fromYamlString('');
45-
expect(dependencies, Dependencies([]));
45+
expect(dependencies, const Dependencies([]));
4646
});
4747

4848
test('dependencies lastModified', () async {

pkgs/native_assets_cli/test/model/metadata_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:native_assets_cli/native_assets_cli.dart';
66
import 'package:test/test.dart';
77

88
void main() {
9-
final metadata = Metadata({
9+
const metadata = Metadata({
1010
'key': 'value',
1111
'my_list': [1, 2, 3],
1212
'my_map': {

0 commit comments

Comments
 (0)