diff --git a/adapters/built/analysis_options.yaml b/adapters/built/analysis_options.yaml index e79fa07..ea2c9e9 100644 --- a/adapters/built/analysis_options.yaml +++ b/adapters/built/analysis_options.yaml @@ -1,6 +1 @@ -include: package:pedantic/analysis_options.yaml -analyzer: - exclude: - - /*.mapper.g.dart - strong-mode: - implicit-casts: true \ No newline at end of file +include: package:lints/recommended.yaml \ No newline at end of file diff --git a/adapters/built/pubspec.yaml b/adapters/built/pubspec.yaml index a8267b1..6ca31de 100644 --- a/adapters/built/pubspec.yaml +++ b/adapters/built/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: built_collection: ^5.1.1 dev_dependencies: reflectable: - pedantic: + lints: build_runner: build_test: test: diff --git a/adapters/fixnum/analysis_options.yaml b/adapters/fixnum/analysis_options.yaml index e79fa07..ea2c9e9 100644 --- a/adapters/fixnum/analysis_options.yaml +++ b/adapters/fixnum/analysis_options.yaml @@ -1,6 +1 @@ -include: package:pedantic/analysis_options.yaml -analyzer: - exclude: - - /*.mapper.g.dart - strong-mode: - implicit-casts: true \ No newline at end of file +include: package:lints/recommended.yaml \ No newline at end of file diff --git a/adapters/fixnum/pubspec.yaml b/adapters/fixnum/pubspec.yaml index ebdef36..dd15586 100644 --- a/adapters/fixnum/pubspec.yaml +++ b/adapters/fixnum/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: fixnum: ^1.0.0 dev_dependencies: reflectable: - pedantic: + lints: build_runner: build_test: test: diff --git a/adapters/flutter/analysis_options.yaml b/adapters/flutter/analysis_options.yaml index e79fa07..ea2c9e9 100644 --- a/adapters/flutter/analysis_options.yaml +++ b/adapters/flutter/analysis_options.yaml @@ -1,6 +1 @@ -include: package:pedantic/analysis_options.yaml -analyzer: - exclude: - - /*.mapper.g.dart - strong-mode: - implicit-casts: true \ No newline at end of file +include: package:lints/recommended.yaml \ No newline at end of file diff --git a/adapters/flutter/pubspec.yaml b/adapters/flutter/pubspec.yaml index 129c051..c370dbc 100644 --- a/adapters/flutter/pubspec.yaml +++ b/adapters/flutter/pubspec.yaml @@ -15,7 +15,7 @@ dev_dependencies: reflectable: flutter_test: sdk: flutter - pedantic: + lints: build_runner: build_test: #dependency_overrides: diff --git a/mapper/example/example.mapper.g.dart b/mapper/example/example.mapper.g.dart index 1344bfe..34d5b48 100644 --- a/mapper/example/example.mapper.g.dart +++ b/mapper/example/example.mapper.g.dart @@ -1,12 +1,13 @@ -// This file has been generated by the dart_json_mapper v2.2.5 +// This file has been generated by the dart_json_mapper v2.2.9 // https://github.com/k-paxian/dart-json-mapper // @dart = 2.12 import 'example.dart' as x0 show Car, Person, Color; -import 'package:dart_json_mapper/dart_json_mapper.dart' show JsonMapper, JsonMapperAdapter, typeOf; +import 'package:dart_json_mapper/dart_json_mapper.dart' show JsonMapper, JsonMapperAdapter, SerializationOptions, DeserializationOptions, typeOf; +import 'package:dart_json_mapper/src/identifier_casing.dart' as x2 show CaseStyle; +import 'package:dart_json_mapper/src/model/index.dart' as x1 show ConversionDirection; // This file has been generated by the reflectable package. // https://github.com/dart-lang/reflectable. - import 'dart:core'; import 'example.dart' as prefix1; import 'package:dart_json_mapper/src/model/annotations.dart' as prefix0; @@ -50,15 +51,23 @@ final exampleGeneratedAdapter = JsonMapperAdapter( typeOf>(): (value) => value.cast(), typeOf>(): (value) => value.cast(), typeOf>(): (value) => value.cast(), - typeOf>(): (value) => value.cast() + typeOf>(): (value) => value.cast(), + typeOf>(): (value) => value.cast(), + typeOf>(): (value) => value.cast(), + typeOf>(): (value) => value.cast(), + typeOf>(): (value) => value.cast() }, enumValues: { - x0.Color: x0.Color.values + x0.Color: x0.Color.values, + x1.ConversionDirection: x1.ConversionDirection.values, + x2.CaseStyle: x2.CaseStyle.values }); -Future initializeJsonMapperAsync({Iterable adapters = const []}) => Future(() => initializeJsonMapper(adapters: adapters)); +Future initializeJsonMapperAsync({Iterable adapters = const [], SerializationOptions? serializationOptions, DeserializationOptions? deserializationOptions}) => Future(() => initializeJsonMapper(adapters: adapters, serializationOptions: serializationOptions, deserializationOptions: deserializationOptions)); -JsonMapper initializeJsonMapper({Iterable adapters = const []}) { +JsonMapper initializeJsonMapper({Iterable adapters = const [], SerializationOptions? serializationOptions, DeserializationOptions? deserializationOptions}) { + JsonMapper.globalSerializationOptions = serializationOptions ?? JsonMapper.globalSerializationOptions; + JsonMapper.globalDeserializationOptions = deserializationOptions ?? JsonMapper.globalDeserializationOptions; JsonMapper.enumerateAdapters([...adapters, exampleGeneratedAdapter], (JsonMapperAdapter adapter) { _initializeReflectable(adapter); JsonMapper().useAdapter(adapter); diff --git a/perf-test/test/starlink/built_value/built_value_test.g.dart b/perf-test/test/starlink/built_value/built_value_test.g.dart index 7e04002..732ff09 100644 --- a/perf-test/test/starlink/built_value/built_value_test.g.dart +++ b/perf-test/test/starlink/built_value/built_value_test.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of perf_test.test; +part of 'built_value_test.dart'; // ************************************************************************** // BuiltValueGenerator @@ -644,44 +644,50 @@ class _$SpaceTrack extends SpaceTrack { @override int get hashCode { - return $jf($jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc( - $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, cCSDSOMMVERS.hashCode), cOMMENT.hashCode), cREATIONDATE.hashCode), oRIGINATOR.hashCode), oBJECTNAME.hashCode), oBJECTID.hashCode), cENTERNAME.hashCode), rEFFRAME.hashCode), tIMESYSTEM.hashCode), mEANELEMENTTHEORY.hashCode), ePOCH.hashCode), mEANMOTION.hashCode), eCCENTRICITY.hashCode), iNCLINATION.hashCode), rAOFASCNODE.hashCode), aRGOFPERICENTER.hashCode), mEANANOMALY.hashCode), ePHEMERISTYPE.hashCode), cLASSIFICATIONTYPE.hashCode), nORADCATID.hashCode), eLEMENTSETNO.hashCode), rEVATEPOCH.hashCode), - bSTAR.hashCode), - mEANMOTIONDOT.hashCode), - mEANMOTIONDDOT.hashCode), - sEMIMAJORAXIS.hashCode), - pERIOD.hashCode), - aPOAPSIS.hashCode), - pERIAPSIS.hashCode), - oBJECTTYPE.hashCode), - rCSSIZE.hashCode), - cOUNTRYCODE.hashCode), - lAUNCHDATE.hashCode), - sITE.hashCode), - dECAYDATE.hashCode), - dECAYED.hashCode), - fILE.hashCode), - gPID.hashCode), - tLELINE0.hashCode), - tLELINE1.hashCode), - tLELINE2.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, cCSDSOMMVERS.hashCode); + _$hash = $jc(_$hash, cOMMENT.hashCode); + _$hash = $jc(_$hash, cREATIONDATE.hashCode); + _$hash = $jc(_$hash, oRIGINATOR.hashCode); + _$hash = $jc(_$hash, oBJECTNAME.hashCode); + _$hash = $jc(_$hash, oBJECTID.hashCode); + _$hash = $jc(_$hash, cENTERNAME.hashCode); + _$hash = $jc(_$hash, rEFFRAME.hashCode); + _$hash = $jc(_$hash, tIMESYSTEM.hashCode); + _$hash = $jc(_$hash, mEANELEMENTTHEORY.hashCode); + _$hash = $jc(_$hash, ePOCH.hashCode); + _$hash = $jc(_$hash, mEANMOTION.hashCode); + _$hash = $jc(_$hash, eCCENTRICITY.hashCode); + _$hash = $jc(_$hash, iNCLINATION.hashCode); + _$hash = $jc(_$hash, rAOFASCNODE.hashCode); + _$hash = $jc(_$hash, aRGOFPERICENTER.hashCode); + _$hash = $jc(_$hash, mEANANOMALY.hashCode); + _$hash = $jc(_$hash, ePHEMERISTYPE.hashCode); + _$hash = $jc(_$hash, cLASSIFICATIONTYPE.hashCode); + _$hash = $jc(_$hash, nORADCATID.hashCode); + _$hash = $jc(_$hash, eLEMENTSETNO.hashCode); + _$hash = $jc(_$hash, rEVATEPOCH.hashCode); + _$hash = $jc(_$hash, bSTAR.hashCode); + _$hash = $jc(_$hash, mEANMOTIONDOT.hashCode); + _$hash = $jc(_$hash, mEANMOTIONDDOT.hashCode); + _$hash = $jc(_$hash, sEMIMAJORAXIS.hashCode); + _$hash = $jc(_$hash, pERIOD.hashCode); + _$hash = $jc(_$hash, aPOAPSIS.hashCode); + _$hash = $jc(_$hash, pERIAPSIS.hashCode); + _$hash = $jc(_$hash, oBJECTTYPE.hashCode); + _$hash = $jc(_$hash, rCSSIZE.hashCode); + _$hash = $jc(_$hash, cOUNTRYCODE.hashCode); + _$hash = $jc(_$hash, lAUNCHDATE.hashCode); + _$hash = $jc(_$hash, sITE.hashCode); + _$hash = $jc(_$hash, dECAYDATE.hashCode); + _$hash = $jc(_$hash, dECAYED.hashCode); + _$hash = $jc(_$hash, fILE.hashCode); + _$hash = $jc(_$hash, gPID.hashCode); + _$hash = $jc(_$hash, tLELINE0.hashCode); + _$hash = $jc(_$hash, tLELINE1.hashCode); + _$hash = $jc(_$hash, tLELINE2.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1073,10 +1079,13 @@ class _$Record extends Record { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, spaceTrack.hashCode), version.hashCode), - launch.hashCode), - id.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, spaceTrack.hashCode); + _$hash = $jc(_$hash, version.hashCode); + _$hash = $jc(_$hash, launch.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1166,4 +1175,4 @@ class RecordBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/perf-test/test/starlink/json_serializable/json_serializable_test.g.dart b/perf-test/test/starlink/json_serializable/json_serializable_test.g.dart index 34e8c62..d94178a 100644 --- a/perf-test/test/starlink/json_serializable/json_serializable_test.g.dart +++ b/perf-test/test/starlink/json_serializable/json_serializable_test.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of perf_test.test; +part of 'json_serializable_test.dart'; // ************************************************************************** // JsonSerializableGenerator diff --git a/perf-test/test/unit/_test.mapper.g.dart b/perf-test/test/unit/_test.mapper.g.dart index 1bb3ec4..e377d8e 100644 --- a/perf-test/test/unit/_test.mapper.g.dart +++ b/perf-test/test/unit/_test.mapper.g.dart @@ -1,4 +1,4 @@ -// This file has been generated by the dart_json_mapper v2.2.8 +// This file has been generated by the dart_json_mapper v2.2.9 // https://github.com/k-paxian/dart-json-mapper // @dart = 2.12 import 'package:dart_json_mapper/dart_json_mapper.dart' show JsonMapper, JsonMapperAdapter, SerializationOptions, DeserializationOptions, typeOf;