From 00bf7f4ec90a77d9d56c1e83d114f96096ce81b9 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:12:40 +0100 Subject: [PATCH 01/12] Removed obsolete authors section from pubspec.yaml --- pubspec.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index d93ffac..b91328e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,9 +2,6 @@ name: rx_command description: Reactive event handler wrapper class inspired by ReactiveUI. version: 6.0.0 maintainer: Thomas Burkhart (@escamoteur) -authors: - - Flutter Community - - Thomas Burkhart homepage: https://github.com/fluttercommunity/rx_command documentation: environment: From e6cbf30970fddecbf44b6572aa21d61b69ba9442 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:04 +0100 Subject: [PATCH 02/12] Update SDK constraints in pubspec.yaml to support Dart 3.0.0 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index b91328e..cce850b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ maintainer: Thomas Burkhart (@escamoteur) homepage: https://github.com/fluttercommunity/rx_command documentation: environment: - sdk: '>=2.12.0 <3.0.0' + sdk: ">=3.0.0 <4.0.0" dependencies: rxdart: ^0.26.0 From 3eb5b529d6c781335f684c4196b3440a0567d16c Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:12 +0100 Subject: [PATCH 03/12] Refactor analysis_options.yaml to clean up linter rules and formatting --- analysis_options.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index b32efe7..53caf8a 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -3,7 +3,7 @@ analyzer: implicit-casts: false errors: unused_import: error - unused_local_variable: warning + unused_local_variable: warning dead_code: error invalid_override_of_non_virtual_member: error exclude: @@ -18,7 +18,6 @@ linter: - avoid_null_checks_in_equality_operators - avoid_renaming_method_parameters - avoid_return_types_on_setters - - avoid_returning_null - avoid_types_as_parameter_names - avoid_unused_constructor_parameters - await_only_futures @@ -34,11 +33,8 @@ linter: - empty_statements - hash_and_equals #- implementation_imports - - invariant_booleans - - iterable_contains_unrelated_type - library_names - library_prefixes - - list_remove_unrelated_type - no_adjacent_strings_in_list - no_duplicate_case_values - non_constant_identifier_names @@ -58,7 +54,7 @@ linter: #- prefer_interpolation_to_compose_strings - prefer_is_empty - prefer_is_not_empty -# - prefer_single_quotes + # - prefer_single_quotes - prefer_typing_uninitialized_variables - recursive_getters - slash_for_doc_comments @@ -68,9 +64,9 @@ linter: - unawaited_futures - unnecessary_brace_in_string_interps - unnecessary_getters_setters -# - unnecessary_lambdas + # - unnecessary_lambdas - unnecessary_null_aware_assignments - unnecessary_statements -# - unnecessary_this + # - unnecessary_this - unrelated_type_equality_checks - - valid_regexps \ No newline at end of file + - valid_regexps From 99b731c21b75758d6e26d17f675b7ecd92f7d11a Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:14 +0100 Subject: [PATCH 04/12] Fix test assertion in rx_command_test to check for expected result value instead of result type --- test/rx_command_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/rx_command_test.dart b/test/rx_command_test.dart index a65494f..f9f2561 100644 --- a/test/rx_command_test.dart +++ b/test/rx_command_test.dart @@ -675,9 +675,9 @@ void main() { }, initialLastResult: 0); cmd.execute(); - final result = await cmd.next is int; + final result = await cmd.next; - expect(result, true); + expect(result, 42); }); // No idea why it's not posible to catch the exception with expect(command.results, emitsError(isException)); From 3b8d1ab6ca6e6003a61109c2d964b73b7cf81723 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:16 +0100 Subject: [PATCH 05/12] Bump rxdart dependency to 0.28.0 --- lib/rx_command.dart | 33 ++++++++++++++++++--------------- pubspec.yaml | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lib/rx_command.dart b/lib/rx_command.dart index b3df666..a037288 100644 --- a/lib/rx_command.dart +++ b/lib/rx_command.dart @@ -658,7 +658,7 @@ class RxCommandSync extends RxCommand { } lastResult = result; if (result != null || null is TResult) { - _resultsSubject.add(result as TResult); + _resultsSubject.add(result as TResult); } commandResult = CommandResult(param, result, null, false); @@ -810,7 +810,7 @@ class RxCommandAsync extends RxCommand { class RxCommandStream extends RxCommand { StreamProvider _streamProvider; - StreamSubscription>? _inputStreamSubscription; + StreamSubscription>? _inputStreamSubscription; RxCommandStream._( StreamProvider streamProvider, @@ -876,29 +876,32 @@ class RxCommandStream extends RxCommand { var inputStream = _streamProvider(param); _inputStreamSubscription = inputStream.materialize().listen( - (Notification notification) { - if (notification.isOnData) { - _resultsSubject.add(notification.requireData); + (StreamNotification notification) { + if (notification.isData) { + _resultsSubject.add(notification.requireDataValue); var commandResult = - CommandResult(param, notification.requireData, null, true); + CommandResult(param, notification.requireDataValue, null, true); _commandResultsSubject.add(commandResult); RxCommand.loggingHandler?.call(_debugName, commandResult); - lastResult = notification.requireData; - } else if (notification.isOnError) { + lastResult = notification.requireDataValue; + } else if (notification.isError) { if (throwExceptions) { - _resultsSubject.addError(notification.errorAndStackTrace!.error); + _resultsSubject + .addError(notification.errorAndStackTraceOrNull!.error); _commandResultsSubject - .addError(notification.errorAndStackTrace!.error); + .addError(notification.errorAndStackTraceOrNull!.error); } else { - final commandResult = CommandResult( - param, null, notification.errorAndStackTrace!.error, false); + final commandResult = CommandResult(param, null, + notification.errorAndStackTraceOrNull!.error, false); _commandResultsSubject.add(commandResult); RxCommand.loggingHandler?.call(_debugName, commandResult); } - RxCommand.globalExceptionHandler?.call(_debugName, - CommandError(param, notification.errorAndStackTrace!.error)); - } else if (notification.isOnDone) { + RxCommand.globalExceptionHandler?.call( + _debugName, + CommandError( + param, notification.errorAndStackTraceOrNull!.error)); + } else if (notification.isDone) { final commandResult = CommandResult(param, lastResult, null, false); _commandResultsSubject.add(commandResult); diff --git a/pubspec.yaml b/pubspec.yaml index cce850b..9ec4cad 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - rxdart: ^0.26.0 + rxdart: ^0.28.0 quiver: ^3.0.1 From 4ad0142b27d06f7b6c785c4021a337a93dab1db8 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:19 +0100 Subject: [PATCH 06/12] Updated pubspec.lock --- pubspec.lock | 277 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 163 insertions(+), 114 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 74150e6..8732e3d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,344 +5,393 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 + url: "https://pub.dev" source: hosted - version: "20.0.0" + version: "80.0.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" + url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "7.3.0" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" source: hosted - version: "1.2.0" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" + version: "2.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.19.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - url: "https://pub.dartlang.org" + sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.11.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.6" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "7.0.1" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.3" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.2.2" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.2" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.5" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" + url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.7.2" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.3.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.12.17" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.16.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "2.0.0" node_preamble: dependency: transitive description: name: node_preamble - url: "https://pub.dartlang.org" + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.9.1" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.5.1" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.5" quiver: dependency: "direct main" description: name: quiver - url: "https://pub.dartlang.org" + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.2.2" rxdart: dependency: "direct main" description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + url: "https://pub.dev" source: hosted - version: "0.26.0" + version: "0.28.0" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.2" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - url: "https://pub.dartlang.org" + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.2" shelf_static: dependency: transitive description: name: shelf_static - url: "https://pub.dartlang.org" + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "3.0.0" source_map_stack_trace: dependency: transitive description: name: source_map_stack_trace - url: "https://pub.dartlang.org" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" source_maps: dependency: transitive description: name: source_maps - url: "https://pub.dartlang.org" + sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" + url: "https://pub.dev" source: hosted - version: "0.10.10" + version: "0.10.13" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" test: dependency: "direct dev" description: name: test - url: "https://pub.dartlang.org" + sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + url: "https://pub.dev" source: hosted - version: "1.16.8" + version: "1.25.15" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.7.4" test_core: dependency: transitive description: name: test_core - url: "https://pub.dartlang.org" + sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + url: "https://pub.dev" source: hosted - version: "0.3.19" + version: "0.6.8" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" vm_service: dependency: transitive description: name: vm_service - url: "https://pub.dartlang.org" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "15.0.0" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.2" webkit_inspection_protocol: dependency: transitive description: name: webkit_inspection_protocol - url: "https://pub.dartlang.org" + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.2.1" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.3" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=3.7.0-0 <4.0.0" From fa17a7733b05315aec5e00146ba44337e4121470 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:21 +0100 Subject: [PATCH 07/12] Added publish_to section in pubspec.yaml in example app --- example/pubspec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index a7d8033..719dfb5 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,8 @@ name: flutter_weather_demo description: A new Flutter project. version: 1.0.0+1 +publish_to: none + environment: sdk: '>=2.12.0 <3.0.0' From 49128bb42740aaed0b50312339777dd485854c8b Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:23 +0100 Subject: [PATCH 08/12] Update SDK constraints in pubspec.yaml to support Dart 3.0.0 in example app --- example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 719dfb5..4f959c6 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0+1 publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: From db5d8db6ab8c15692f9edb6d1743bc4ee380a16c Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:25 +0100 Subject: [PATCH 09/12] Refactor analysis_options.yaml to clean up linter rules and formatting in example app --- example/analysis_options.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index e734a46..a600238 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -8,7 +8,6 @@ analyzer: invalid_override_of_non_virtual_member: error exclude: - lib/json/* - linter: rules: @@ -19,7 +18,6 @@ linter: - avoid_null_checks_in_equality_operators - avoid_renaming_method_parameters - avoid_return_types_on_setters - - avoid_returning_null - avoid_types_as_parameter_names - avoid_unused_constructor_parameters - await_only_futures @@ -35,11 +33,8 @@ linter: - empty_statements - hash_and_equals #- implementation_imports - - invariant_booleans - - iterable_contains_unrelated_type - library_names - library_prefixes - - list_remove_unrelated_type - no_adjacent_strings_in_list - no_duplicate_case_values - non_constant_identifier_names @@ -59,7 +54,7 @@ linter: #- prefer_interpolation_to_compose_strings - prefer_is_empty - prefer_is_not_empty -# - prefer_single_quotes + # - prefer_single_quotes - prefer_typing_uninitialized_variables - recursive_getters - slash_for_doc_comments @@ -69,9 +64,9 @@ linter: - unawaited_futures - unnecessary_brace_in_string_interps - unnecessary_getters_setters -# - unnecessary_lambdas + # - unnecessary_lambdas - unnecessary_null_aware_assignments - unnecessary_statements -# - unnecessary_this + # - unnecessary_this - unrelated_type_equality_checks - - valid_regexps \ No newline at end of file + - valid_regexps From 57d7a55c60bee43a2025a2a75f55572b8ecf1d83 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:28 +0100 Subject: [PATCH 10/12] Bump rxdart dependency to 0.28.0 in example app --- example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 4f959c6..ea60e61 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: flutter: sdk: flutter http: any - rxdart: ^0.26.0 + rxdart: ^0.28.0 rx_command: path: ../ From 6930555ee88582c154a9d5a164c1fa172afcbd16 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:31 +0100 Subject: [PATCH 11/12] Updated pubspec.lock in example app --- example/pubspec.lock | 141 +++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 46 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index d5db2c2..2ca013c 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,27 +1,38 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - characters: + async: dependency: transitive description: - name: characters - url: "https://pub.dartlang.org" + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" source: hosted - version: "1.1.0" - charcode: + version: "2.13.0" + boolean_selector: dependency: transitive description: - name: charcode - url: "https://pub.dartlang.org" + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.19.1" flutter: dependency: "direct main" description: flutter @@ -31,111 +42,149 @@ packages: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + url: "https://pub.dev" source: hosted - version: "0.13.1" + version: "1.3.0" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.2" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.16.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.9.1" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.2.2" rx_command: dependency: "direct main" description: path: ".." relative: true source: path - version: "5.3.0" + version: "6.0.0" rxdart: dependency: "direct main" description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + url: "https://pub.dev" source: hosted - version: "0.26.0" + version: "0.28.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "1.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=3.7.0-0 <4.0.0" From 62d850b0594ab2688deb2fd9d662fc09b8b7cdc0 Mon Sep 17 00:00:00 2001 From: mk-dev-1 <41755310+mk-dev-1@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:14:38 +0100 Subject: [PATCH 12/12] Replaced discontinued RaisedButton with ElevatedButton --- example/lib/homepage.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/example/lib/homepage.dart b/example/lib/homepage.dart index d2a9022..235d1b0 100644 --- a/example/lib/homepage.dart +++ b/example/lib/homepage.dart @@ -67,10 +67,8 @@ class HomePage extends StatelessWidget { .execute : null; } - return RaisedButton( + return ElevatedButton( child: Text("Update"), - color: Color.fromARGB(255, 33, 150, 243), - textColor: Color.fromARGB(255, 255, 255, 255), onPressed: handler, ); },