diff --git a/example/pubspec.lock b/example/pubspec.lock index 6fa771c..aa5ed5b 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "72.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.11.0" args: dependency: transitive description: @@ -42,18 +42,18 @@ packages: dependency: transitive description: name: bloc - sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" + sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189" url: "https://pub.dev" source: hosted - version: "8.1.4" + version: "9.0.0" bloc_presentation: dependency: "direct main" description: name: bloc_presentation - sha256: d80359c463789a1e7b5095b4fb204798a6c168fd08b9eefa3ffcb9063bf7a85e + sha256: "03ea22745a23274a7fa4425ac16e120838471d3073fa37a3332c18641cb2d8a2" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" boolean_selector: dependency: transitive description: @@ -178,10 +178,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: transitive description: @@ -212,7 +212,7 @@ packages: path: ".." relative: true source: path - version: "0.0.6" + version: "0.0.7" equatable: dependency: transitive description: @@ -254,10 +254,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a + sha256: "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b" url: "https://pub.dev" source: hosted - version: "8.1.6" + version: "9.0.0" flutter_lints: dependency: "direct dev" description: @@ -403,18 +403,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -435,18 +435,18 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" macros: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -579,7 +579,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_gen: dependency: transitive description: @@ -608,10 +608,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -632,10 +632,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -648,10 +648,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" timing: dependency: transitive description: @@ -680,10 +680,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" watcher: dependency: transitive description: @@ -733,5 +733,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.1 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.1" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index f270027..3402044 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: path: ../ flutter: sdk: flutter - flutter_bloc: ^8.1.1 + flutter_bloc: ^9.0.0 freezed_annotation: ^2.2.0 get_it: ^7.7.0 injectable: ^2.1.0 diff --git a/lib/chopper/chopper.dart b/lib/chopper/chopper.dart index 19459a3..f44dcb8 100644 --- a/lib/chopper/chopper.dart +++ b/lib/chopper/chopper.dart @@ -1,6 +1,3 @@ -/// DCC Toolkit chopper util. -library chopper; - export 'color_converter.dart'; export 'datetime_converter.dart'; export 'json_serializable_converter.dart'; diff --git a/lib/chopper/color_converter.dart b/lib/chopper/color_converter.dart index 30e9e83..669391d 100644 --- a/lib/chopper/color_converter.dart +++ b/lib/chopper/color_converter.dart @@ -28,6 +28,9 @@ class ColorConverter implements JsonConverter { /// Each value is a two-digit hexadecimal number. @override String toJson(Color color) { + // Next flutter release (>3.27) will contain a new method `toARGB32` to replace `.value`. + // Ignore this for now. + // ignore: deprecated_member_use return '#${color.value.toRadixString(16).padLeft(8, '0')}'; } } diff --git a/lib/chopper/json_serializable_converter.dart b/lib/chopper/json_serializable_converter.dart index 68e9a82..e6b8921 100644 --- a/lib/chopper/json_serializable_converter.dart +++ b/lib/chopper/json_serializable_converter.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:convert'; import 'package:chopper/chopper.dart'; -import 'package:collection/collection.dart'; /// Method signature for a function that creates a dart object from a json map. typedef JsonFactory = T Function(Map json); @@ -44,7 +43,7 @@ class JsonSerializableConverter extends JsonConverter { } List _decodeList(Iterable values) => - values.whereNotNull().map((v) => _decode(v) as T).toList(); + values.nonNulls.map((v) => _decode(v) as T).toList(); dynamic _decode(dynamic entity) { if (entity is Iterable) return _decodeList(entity as List); diff --git a/lib/common/dcc_logger.dart b/lib/common/dcc_logger.dart index 2f50b7d..bda22b5 100644 --- a/lib/common/dcc_logger.dart +++ b/lib/common/dcc_logger.dart @@ -66,7 +66,7 @@ class DCCLogger { /// ```dart /// DCCLogger.info('test bericht', tag: 'test'); /// ``` - /// prints: [[13:46]] [[INFO]] DCC: test bericht + /// prints: [[13:46]] [[INFO]] DCC: <test> test bericht @Deprecated('Use BoltLogger.zap instead') static void info( String message, { @@ -84,7 +84,7 @@ class DCCLogger { /// ```dart /// DCCLogger.severe('test bericht', tag: 'test'); /// ``` - /// prints: [[13:46]] [[SEVERE]] DCC: test bericht + /// prints: [[13:46]] [[SEVERE]] DCC: <test> test bericht @Deprecated('Use BoltLogger.shock instead') static void severe( String message, { diff --git a/lib/dcc_toolkit.dart b/lib/dcc_toolkit.dart index 4cdad9c..e292c72 100644 --- a/lib/dcc_toolkit.dart +++ b/lib/dcc_toolkit.dart @@ -1,6 +1,3 @@ -/// DCC Toolkit provides set of tools to help you build apps faster. -library dcc_toolkit; - export 'chopper/chopper.dart'; export 'common/dimensions.dart'; export 'common/extensions/build_context.dart'; diff --git a/lib/logger/extensions/zap_extension.dart b/lib/logger/extensions/zap_extension.dart index bae215d..cb0d369 100644 --- a/lib/logger/extensions/zap_extension.dart +++ b/lib/logger/extensions/zap_extension.dart @@ -9,7 +9,8 @@ extension ZapExtension on Object { String? tag, Level level = Level.INFO, }) { - //ignore: no_runtimeType_toString + // We actually want to know to runtimeType of the object + // ignore: no_runtimeType_toString BoltLogger.zap(message, tag: tag ?? runtimeType.toString(), level: level); } @@ -19,6 +20,7 @@ extension ZapExtension on Object { String? tag, Level level = Level.SEVERE, }) { + // We actually want to know to runtimeType of the object //ignore: no_runtimeType_toString BoltLogger.shock(message, tag: tag ?? runtimeType.toString(), level: level); } diff --git a/lib/ui/blocful_widget.dart b/lib/ui/blocful_widget.dart index e8c820e..d03ae5e 100644 --- a/lib/ui/blocful_widget.dart +++ b/lib/ui/blocful_widget.dart @@ -5,7 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; /// A widget that wraps your UI in a [BlocPresentationListener] and a [BlocConsumer] to be able to handle all events simultaniously /// /// Example: -/// /// ```dart +/// ```dart /// class SomePage extends BlocfulWidget { /// const SomePage({super.key}) /// : super(onCreateBloc: SomeCubit()); @@ -20,7 +20,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; /// return SomeWidget(); /// } /// } -/// ```dart +/// ``` abstract class BlocfulWidget, STATE, EVENT> extends StatelessWidget { /// Creates a [BlocfulWidget] diff --git a/pubspec.lock b/pubspec.lock index 59410c4..a8e62f2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "72.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.11.0" args: dependency: transitive description: @@ -42,18 +42,18 @@ packages: dependency: transitive description: name: bloc - sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" + sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189" url: "https://pub.dev" source: hosted - version: "8.1.4" + version: "9.0.0" bloc_presentation: dependency: "direct main" description: name: bloc_presentation - sha256: d80359c463789a1e7b5095b4fb204798a6c168fd08b9eefa3ffcb9063bf7a85e + sha256: "03ea22745a23274a7fa4425ac16e120838471d3073fa37a3332c18641cb2d8a2" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" boolean_selector: dependency: transitive description: @@ -90,10 +90,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: transitive description: @@ -151,10 +151,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a + sha256: "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b" url: "https://pub.dev" source: hosted - version: "8.1.6" + version: "9.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -244,18 +244,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -268,18 +268,18 @@ packages: dependency: "direct main" description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" macros: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -436,7 +436,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_map_stack_trace: dependency: transitive description: @@ -465,10 +465,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -481,10 +481,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -497,26 +497,26 @@ packages: dependency: transitive description: name: test - sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.7" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" typed_data: dependency: transitive description: @@ -537,18 +537,18 @@ packages: dependency: "direct dev" description: name: very_good_analysis - sha256: "1fb637c0022034b1f19ea2acb42a3603cbd8314a470646a59a2fb01f5f3a8629" + sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "7.0.0" vm_service: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" watcher: dependency: transitive description: @@ -606,5 +606,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.1" diff --git a/pubspec.yaml b/pubspec.yaml index 92d2b50..408c4eb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,31 +1,31 @@ name: dcc_toolkit description: "Internal toolkit package used by the DCC team." -version: 0.0.7 +version: 0.0.8 homepage: https://dutchcodingcompany.com repository: https://github.com/DutchCodingCompany/dcc_toolkit environment: - sdk: ">=3.5.0 <4.0.0" - flutter: ">=3.22.0" + sdk: ">=3.6.0 <4.0.0" + flutter: ">=3.27.1" dependencies: - bloc_presentation: ^1.0.0 + bloc_presentation: ^1.0.1 chopper: ^8.0.1+1 collection: ^1.18.0 flutter: sdk: flutter - flutter_bloc: ^8.1.6 + flutter_bloc: ^9.0.0 freezed_annotation: ^2.4.4 http: ^1.2.2 intl: ^0.19.0 - logging: ^1.2.0 + logging: ^1.3.0 dev_dependencies: flutter_test: sdk: flutter mocktail: ^1.0.4 - parameterized_test: ^2.0.0 - very_good_analysis: ^6.0.0 + parameterized_test: ^2.0.1 + very_good_analysis: ^7.0.0 flutter: uses-material-design: true diff --git a/test/dcc_logger_test.dart b/test/dcc_logger_test.dart index 5e460f4..9187b40 100644 --- a/test/dcc_logger_test.dart +++ b/test/dcc_logger_test.dart @@ -1,3 +1,4 @@ +// For testing purposes. //ignore_for_file: deprecated_member_use_from_same_package import 'package:dcc_toolkit/common/dcc_logger.dart'; import 'package:flutter_test/flutter_test.dart';