google · kevmoo · Oct 26, 2023 · Oct 11, 2023 · Oct 25, 2023 · Oct 25, 2023
diff --git a/_test_yaml/pubspec.yaml b/_test_yaml/pubspec.yaml
@@ -10,7 +10,7 @@ dev_dependencies:
   build_runner: ^2.0.0
   build_verify: ^3.0.0
   checked_yaml: any
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   json_annotation: ^4.7.0
   json_serializable: any
   path: ^1.8.2

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -14,23 +14,17 @@ linter:
     - avoid_void_async
     - cancel_subscriptions
     - cascade_invocations
-    - comment_references
     - invalid_case_patterns
     - join_return_with_assignment
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_runtimeType_toString
     - package_api_docs
-    - prefer_const_constructors
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - prefer_final_locals
-    - prefer_relative_imports
     - sort_child_properties_last
-    - test_types_in_equals
-    - type_literal_in_constant_pattern
     - unnecessary_breaks
     - unsafe_html
     - use_full_hex_values_for_flutter_colors
     - use_string_buffers
-    - use_super_parameters
diff --git a/checked_yaml/pubspec.yaml b/checked_yaml/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.0.0
   build_verify: ^3.0.0
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   json_serializable: ^6.0.0
   path: ^1.0.0
   test: ^1.16.0

diff --git a/checked_yaml/test/example_test.dart b/checked_yaml/test/example_test.dart
@@ -114,7 +114,7 @@ line 1, column 10: Unsupported value for "name". Cannot be empty.
   });
 }
 
-void _expectThrows(String yamlContent, matcher) => expect(
+void _expectThrows(String yamlContent, String matcher) => expect(
       () => _run(yamlContent),
       throwsA(
         isA<ParsedYamlException>().having(

diff --git a/example/lib/json_converter_example.dart b/example/lib/json_converter_example.dart
@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// ignore_for_file: inference_failure_on_instance_creation
+
 import 'package:json_annotation/json_annotation.dart';
 
 part 'json_converter_example.g.dart';

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -19,7 +19,7 @@ dev_dependencies:
   build_verify: ^3.0.0
 
   # Not required to use `json_serializable`.
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
 
   # REQUIRED!
   json_serializable: ^6.6.0

diff --git a/example/test/json_convert_example_test.dart b/example/test/json_convert_example_test.dart
@@ -83,8 +83,8 @@ void main() {
       throwsTypeError,
     );
 
-    final collection2 =
-        GenericCollection.fromJson(jsonDecode(encoded) as Map<String, dynamic>);
+    final collection2 = GenericCollection<dynamic>.fromJson(
+        jsonDecode(encoded) as Map<String, dynamic>);
 
     expect(collection2.results, [
       1,

diff --git a/json_annotation/pubspec.yaml b/json_annotation/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   meta: ^1.4.0
 
 dev_dependencies:
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
 # When changing JsonSerializable class.
 #  build_runner: ^2.0.0
 #  json_serializable: any
diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.7.2-wip
+
+- Add type arguments to `Map` literals used for `Record` serialization.
+
 ## 6.7.1
 
 - Support the latest `package:analyzer`.

diff --git a/json_serializable/build.yaml b/json_serializable/build.yaml
@@ -8,6 +8,10 @@ targets:
           - lines_longer_than_80_chars
           # Only for the JSON literal output file
           - text_direction_code_point_in_literal
+          # Too much work in generated code
+          - inference_failure_on_function_invocation
+          # Need to update sourcegen_helper to generate List/Map with the right type params
+          - inference_failure_on_collection_literal
 
       json_serializable:
         generate_for:

diff --git a/json_serializable/example/example.g.dart b/json_serializable/example/example.g.dart
diff --git a/json_serializable/lib/src/type_helpers/record_helper.dart b/json_serializable/lib/src/type_helpers/record_helper.dart
@@ -90,7 +90,7 @@ $helperName(
       );
     }
 
-    final mapValue = '{${items.map((e) => '$e,').join()}}';
+    final mapValue = '<String, dynamic>{${items.map((e) => '$e,').join()}}';
 
     return targetType.isNullableType
         ? ifNullOrElse(

diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml
@@ -1,5 +1,5 @@
 name: json_serializable
-version: 6.7.1
+version: 6.7.2-wip
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.
@@ -34,7 +34,7 @@ dev_dependencies:
     path: ../shared_test
   build_runner: ^2.0.0
   build_verify: ^3.0.0
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   dart_style: ^2.0.0
   logging: ^1.0.0
   source_gen_test: ^1.0.0

diff --git a/json_serializable/test/default_value/default_value.g.dart b/json_serializable/test/default_value/default_value.g.dart
diff --git a/json_serializable/test/default_value/default_value.g_any_map__checked.g.dart b/json_serializable/test/default_value/default_value.g_any_map__checked.g.dart
diff --git a/json_serializable/test/default_value/default_value_test.dart b/json_serializable/test/default_value/default_value_test.dart
@@ -15,8 +15,8 @@ const _defaultInstance = {
   'fieldString': 'string',
   'fieldInt': 42,
   'fieldDouble': 3.14,
-  'fieldListEmpty': [],
-  'fieldSetEmpty': [],
+  'fieldListEmpty': <dynamic>[],
+  'fieldSetEmpty': <dynamic>[],
   'fieldMapEmpty': <String, dynamic>{},
   'fieldListSimple': [1, 2, 3],
   'fieldSetSimple': ['entry1', 'entry2'],

diff --git a/json_serializable/test/default_value/implicit_default_value.g.dart b/json_serializable/test/default_value/implicit_default_value.g.dart
diff --git a/json_serializable/test/field_matrix_test.field_matrix.g.dart b/json_serializable/test/field_matrix_test.field_matrix.g.dart
diff --git a/json_serializable/test/generic_files/generic_argument_factories.g.dart b/json_serializable/test/generic_files/generic_argument_factories.g.dart
diff --git a/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart b/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart
diff --git a/json_serializable/test/generic_files/generic_class.dart b/json_serializable/test/generic_files/generic_class.dart
@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// ignore_for_file: inference_failure_on_instance_creation
+
 import 'package:collection/collection.dart';
 import 'package:json_annotation/json_annotation.dart';
 

diff --git a/json_serializable/test/generic_files/generic_class.g.dart b/json_serializable/test/generic_files/generic_class.g.dart
diff --git a/json_serializable/test/generic_files/generic_test.dart b/json_serializable/test/generic_files/generic_test.dart
@@ -24,6 +24,7 @@ void main() {
     }
 
     test('no type args', () {
+      // ignore: inference_failure_on_instance_creation
       roundTripGenericClass(GenericClass()
         ..fieldDynamic = 1
         ..fieldInt = 2

diff --git a/json_serializable/test/integration/converter_examples.g.dart b/json_serializable/test/integration/converter_examples.g.dart
diff --git a/json_serializable/test/integration/create_per_field_to_json_example.g.dart b/json_serializable/test/integration/create_per_field_to_json_example.g.dart
diff --git a/json_serializable/test/integration/field_map_example.g.dart b/json_serializable/test/integration/field_map_example.g.dart
diff --git a/json_serializable/test/integration/integration_test.dart b/json_serializable/test/integration/integration_test.dart
@@ -13,7 +13,7 @@ import 'json_enum_example.dart';
 import 'json_test_common.dart' show Category, Platform, StatusCode;
 import 'json_test_example.dart';
 
-Matcher _throwsArgumentError(matcher) =>
+Matcher _throwsArgumentError(Object matcher) =>
     throwsA(isArgumentError.having((e) => e.message, 'message', matcher));
 
 void main() {

diff --git a/json_serializable/test/integration/json_enum_example.g.dart b/json_serializable/test/integration/json_enum_example.g.dart
diff --git a/json_serializable/test/integration/json_test_example.g.dart b/json_serializable/test/integration/json_test_example.g.dart
diff --git a/json_serializable/test/integration/json_test_example.g_any_map.g.dart b/json_serializable/test/integration/json_test_example.g_any_map.g.dart
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.dart b/json_serializable/test/kitchen_sink/kitchen_sink.dart
@@ -249,6 +249,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
 }
 
 @JsonSerializable()
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;

diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g.dart
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart
@@ -251,6 +251,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
 @JsonSerializable(
   anyMap: true,
 )
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;

diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart
@@ -253,6 +253,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
   checked: true,
   anyMap: true,
 )
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;

diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart
@@ -253,6 +253,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
 @JsonSerializable(
   includeIfNull: false,
 )
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;

diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart
@@ -253,6 +253,7 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
 @JsonSerializable(
   explicitToJson: true,
 )
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;