Skip to content

Commit f8e57b5

Browse files
authored
Update to latest lints (google#1361)
1 parent e2c8bad commit f8e57b5

File tree

67 files changed

+221
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+221
-198
lines changed

_test_yaml/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dev_dependencies:
1010
build_runner: ^2.0.0
1111
build_verify: ^3.0.0
1212
checked_yaml: any
13-
dart_flutter_team_lints: ^1.0.0
13+
dart_flutter_team_lints: ^2.0.0
1414
json_annotation: ^4.7.0
1515
json_serializable: any
1616
path: ^1.8.2

analysis_options.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,17 @@ linter:
1414
- avoid_void_async
1515
- cancel_subscriptions
1616
- cascade_invocations
17-
- comment_references
1817
- invalid_case_patterns
1918
- join_return_with_assignment
2019
- literal_only_boolean_expressions
2120
- missing_whitespace_between_adjacent_strings
2221
- no_runtimeType_toString
2322
- package_api_docs
24-
- prefer_const_constructors
2523
- prefer_const_declarations
2624
- prefer_expression_function_bodies
2725
- prefer_final_locals
28-
- prefer_relative_imports
2926
- sort_child_properties_last
30-
- test_types_in_equals
31-
- type_literal_in_constant_pattern
3227
- unnecessary_breaks
3328
- unsafe_html
3429
- use_full_hex_values_for_flutter_colors
3530
- use_string_buffers
36-
- use_super_parameters

checked_yaml/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies:
2323
dev_dependencies:
2424
build_runner: ^2.0.0
2525
build_verify: ^3.0.0
26-
dart_flutter_team_lints: ^1.0.0
26+
dart_flutter_team_lints: ^2.0.0
2727
json_serializable: ^6.0.0
2828
path: ^1.0.0
2929
test: ^1.16.0

checked_yaml/test/example_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ line 1, column 10: Unsupported value for "name". Cannot be empty.
114114
});
115115
}
116116

117-
void _expectThrows(String yamlContent, matcher) => expect(
117+
void _expectThrows(String yamlContent, String matcher) => expect(
118118
() => _run(yamlContent),
119119
throwsA(
120120
isA<ParsedYamlException>().having(

example/lib/json_converter_example.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// ignore_for_file: inference_failure_on_instance_creation
6+
57
import 'package:json_annotation/json_annotation.dart';
68

79
part 'json_converter_example.g.dart';

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dev_dependencies:
1919
build_verify: ^3.0.0
2020

2121
# Not required to use `json_serializable`.
22-
dart_flutter_team_lints: ^1.0.0
22+
dart_flutter_team_lints: ^2.0.0
2323

2424
# REQUIRED!
2525
json_serializable: ^6.6.0

example/test/json_convert_example_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ void main() {
8383
throwsTypeError,
8484
);
8585

86-
final collection2 =
87-
GenericCollection.fromJson(jsonDecode(encoded) as Map<String, dynamic>);
86+
final collection2 = GenericCollection<dynamic>.fromJson(
87+
jsonDecode(encoded) as Map<String, dynamic>);
8888

8989
expect(collection2.results, [
9090
1,

json_annotation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
meta: ^1.4.0
1818

1919
dev_dependencies:
20-
dart_flutter_team_lints: ^1.0.0
20+
dart_flutter_team_lints: ^2.0.0
2121
# When changing JsonSerializable class.
2222
# build_runner: ^2.0.0
2323
# json_serializable: any

json_serializable/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 6.7.2-wip
2+
3+
- Add type arguments to `Map` literals used for `Record` serialization.
4+
15
## 6.7.1
26

37
- Support the latest `package:analyzer`.

json_serializable/build.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ targets:
88
- lines_longer_than_80_chars
99
# Only for the JSON literal output file
1010
- text_direction_code_point_in_literal
11+
# Too much work in generated code
12+
- inference_failure_on_function_invocation
13+
# Need to update sourcegen_helper to generate List/Map with the right type params
14+
- inference_failure_on_collection_literal
1115

1216
json_serializable:
1317
generate_for:

json_serializable/example/example.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/lib/src/type_helpers/record_helper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ $helperName(
9090
);
9191
}
9292

93-
final mapValue = '{${items.map((e) => '$e,').join()}}';
93+
final mapValue = '<String, dynamic>{${items.map((e) => '$e,').join()}}';
9494

9595
return targetType.isNullableType
9696
? ifNullOrElse(

json_serializable/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: json_serializable
2-
version: 6.7.1
2+
version: 6.7.2-wip
33
description: >-
44
Automatically generate code for converting to and from JSON by annotating
55
Dart classes.
@@ -34,7 +34,7 @@ dev_dependencies:
3434
path: ../shared_test
3535
build_runner: ^2.0.0
3636
build_verify: ^3.0.0
37-
dart_flutter_team_lints: ^1.0.0
37+
dart_flutter_team_lints: ^2.0.0
3838
dart_style: ^2.0.0
3939
logging: ^1.0.0
4040
source_gen_test: ^1.0.0

json_serializable/test/default_value/default_value.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/default_value/default_value.g_any_map__checked.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/default_value/default_value_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const _defaultInstance = {
1515
'fieldString': 'string',
1616
'fieldInt': 42,
1717
'fieldDouble': 3.14,
18-
'fieldListEmpty': [],
19-
'fieldSetEmpty': [],
18+
'fieldListEmpty': <dynamic>[],
19+
'fieldSetEmpty': <dynamic>[],
2020
'fieldMapEmpty': <String, dynamic>{},
2121
'fieldListSimple': [1, 2, 3],
2222
'fieldSetSimple': ['entry1', 'entry2'],

json_serializable/test/default_value/implicit_default_value.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/field_matrix_test.field_matrix.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/generic_files/generic_argument_factories.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/generic_files/generic_class.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// ignore_for_file: inference_failure_on_instance_creation
6+
57
import 'package:collection/collection.dart';
68
import 'package:json_annotation/json_annotation.dart';
79

json_serializable/test/generic_files/generic_class.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/generic_files/generic_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ void main() {
2424
}
2525

2626
test('no type args', () {
27+
// ignore: inference_failure_on_instance_creation
2728
roundTripGenericClass(GenericClass()
2829
..fieldDynamic = 1
2930
..fieldInt = 2

json_serializable/test/integration/converter_examples.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/integration/create_per_field_to_json_example.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/integration/field_map_example.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/integration/integration_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'json_enum_example.dart';
1313
import 'json_test_common.dart' show Category, Platform, StatusCode;
1414
import 'json_test_example.dart';
1515

16-
Matcher _throwsArgumentError(matcher) =>
16+
Matcher _throwsArgumentError(Object matcher) =>
1717
throwsA(isArgumentError.having((e) => e.message, 'message', matcher));
1818

1919
void main() {

json_serializable/test/integration/json_enum_example.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/integration/json_test_example.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/integration/json_test_example.g_any_map.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/kitchen_sink/kitchen_sink.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
249249
}
250250

251251
@JsonSerializable()
252+
// ignore: inference_failure_on_instance_creation
252253
@GenericConverter()
253254
class JsonConverterGeneric<S, T, U> {
254255
S item;

json_serializable/test/kitchen_sink/kitchen_sink.g.dart

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
251251
@JsonSerializable(
252252
anyMap: true,
253253
)
254+
// ignore: inference_failure_on_instance_creation
254255
@GenericConverter()
255256
class JsonConverterGeneric<S, T, U> {
256257
S item;

json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
253253
checked: true,
254254
anyMap: true,
255255
)
256+
// ignore: inference_failure_on_instance_creation
256257
@GenericConverter()
257258
class JsonConverterGeneric<S, T, U> {
258259
S item;

json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
253253
@JsonSerializable(
254254
includeIfNull: false,
255255
)
256+
// ignore: inference_failure_on_instance_creation
256257
@GenericConverter()
257258
class JsonConverterGeneric<S, T, U> {
258259
S item;

json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
253253
@JsonSerializable(
254254
explicitToJson: true,
255255
)
256+
// ignore: inference_failure_on_instance_creation
256257
@GenericConverter()
257258
class JsonConverterGeneric<S, T, U> {
258259
S item;

0 commit comments

Comments
 (0)