pubspec | upgraded hmi_core

a-givertzman · Nov 7, 2024 · 0effe9e · 0effe9e
1 parent ee043b4
commit 0effe9e
Show file tree

Hide file tree

Showing 30 changed files with 85 additions and 55 deletions.
diff --git a/lib/src/auth/user/app_user_single.dart b/lib/src/auth/user/app_user_single.dart
@@ -1,5 +1,7 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_json.dart';
+import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_value_object.dart';
 import 'package:hmi_networking/src/auth/user/user_info.dart';
 import 'package:hmi_networking/src/auth/user_group/app_user_group.dart';
 import 'package:hmi_networking/src/core/entities/data_object.dart';

diff --git a/lib/src/core/ds_client/cache/file/ds_cache_file.dart b/lib/src/core/ds_client/cache/file/ds_cache_file.dart
@@ -1,6 +1,8 @@
 import 'dart:convert';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_json.dart';
+import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_text_file.dart';
 import 'package:hmi_networking/src/core/entities/jds_data_point.dart';
 
 ///

diff --git a/lib/src/core/ds_client/ds_client.dart b/lib/src/core/ds_client/ds_client.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 
 ///
 abstract class DsClient {

diff --git a/lib/src/core/ds_client/ds_client_fake.dart b/lib/src/core/ds_client/ds_client_fake.dart
@@ -2,8 +2,11 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_stream.dart';
 import 'package:hmi_networking/src/core/ds_client/ds_client.dart';
 
 ///

diff --git a/lib/src/core/ds_client/ds_client_real.dart b/lib/src/core/ds_client/ds_client_real.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_stream.dart';
 import 'package:hmi_networking/src/core/ds_client/cache/ds_client_cache.dart';
 import 'package:hmi_networking/src/core/ds_client/ds_client.dart';
 import 'package:hmi_networking/src/core/ds_client/ds_client_connection_listener.dart';

diff --git a/lib/src/core/ds_send.dart b/lib/src/core/ds_send.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_stream.dart';
 import 'package:hmi_networking/src/core/ds_client/ds_client.dart';
 
 ///

diff --git a/lib/src/core/entities/jds_data_point.dart b/lib/src/core/entities/jds_data_point.dart
@@ -1,5 +1,6 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 /// 
 /// [DsDataPoint] with json transformation capabilities.
 final class JdsDataPoint<T> implements DsDataPoint<T> {

diff --git a/lib/src/core/jds_service/jds_service.dart b/lib/src/core/jds_service/jds_service.dart
@@ -1,5 +1,7 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_json.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/ds_client/ds_client.dart';
 import 'package:hmi_networking/src/core/ds_send.dart';
 import 'package:hmi_networking/src/core/entities/point_route.dart';

diff --git a/lib/src/core/jds_service/jds_service_startup.dart b/lib/src/core/jds_service/jds_service_startup.dart
@@ -1,5 +1,5 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service.dart';
 
 /// 

diff --git a/lib/src/core/jds_service/jds_service_startup_on_reconnect.dart b/lib/src/core/jds_service/jds_service_startup_on_reconnect.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service_startup.dart';
 /// 

diff --git a/lib/src/core/jds_service/update_cache_from_jds_service.dart b/lib/src/core/jds_service/update_cache_from_jds_service.dart
@@ -1,5 +1,5 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/hmi_networking.dart';
 /// 
 /// [JdsService] cache update sequence.

diff --git a/lib/src/core/line_socket/ds_line_socket.dart b/lib/src/core/line_socket/ds_line_socket.dart
@@ -2,8 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/line_socket/line_socket.dart';
 
 ///

diff --git a/lib/src/core/line_socket/line_socket.dart b/lib/src/core/line_socket/line_socket.dart
@@ -1,6 +1,6 @@
 
 import 'dart:typed_data';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 
 /// 
 /// Listen socket, send to socket,

diff --git a/lib/src/protocols/custom_protocol_line.dart b/lib/src/protocols/custom_protocol_line.dart
@@ -1,5 +1,5 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 /// 
 /// Interface to communicate with remote device(s) in both ways by sending commands 
 /// and receiving events (in the form of [DsDataPoint]s).

diff --git a/lib/src/protocols/jsd_line.dart b/lib/src/protocols/jsd_line.dart
@@ -1,8 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/line_socket/line_socket.dart';
 import 'package:hmi_networking/src/protocols/custom_protocol_line.dart';
 ///

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: hmi_networking
 description: A Flutter package used in hmi_widgets which is helps to visualize states, values, changes and other artefacts from technological processes.
-version: 1.1.0
+version: 1.1.1
 homepage: https://github.com/a-givertzman/hmi_networking
 publish_to: none
 
@@ -14,7 +14,7 @@ dependencies:
   hmi_core:
       git:
         url: https://github.com/a-givertzman/hmi_core.git
-        ref: 2.0.0
+        ref: 2.1.0
   shared_preferences: ^2.0.20
   async: ^2.11.0
 

diff --git a/test/unit/core/ds_client/cache/file/ds_cache_file/fake_text_file.dart b/test/unit/core/ds_client/cache/file/ds_cache_file/fake_text_file.dart
@@ -1,5 +1,6 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_text_file.dart';
 
 ///
 class FakeTextFile implements TextFile {

diff --git a/test/unit/core/ds_line_socket/ds_line_socket_send_test.dart b/test/unit/core/ds_line_socket/ds_line_socket_send_test.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hmi_core/hmi_core_log.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/hmi_networking.dart';
 
 void main() {

diff --git a/test/unit/core/ds_send/common/ds_send_exec_test.dart b/test/unit/core/ds_send/common/ds_send_exec_test.dart
@@ -1,6 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/ds_send.dart';
 import 'fake_ds_client.dart';
 import 'test_point_paths.dart';

diff --git a/test/unit/core/ds_send/common/fake_ds_client.dart b/test/unit/core/ds_send/common/fake_ds_client.dart
@@ -1,5 +1,5 @@
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/ds_client/ds_client.dart';
 ///
 class FakeDsClient implements DsClient {

diff --git a/test/unit/core/jds_service/fake_jds_service.dart b/test/unit/core/jds_service/fake_jds_service.dart
@@ -1,4 +1,4 @@
-import 'package:hmi_core/src/core/result_new/result.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_point_config/jds_point_configs.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service.dart';
 ///

diff --git a/test/unit/core/jds_service/jds_service_auth_test.dart b/test/unit/core/jds_service/jds_service_auth_test.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service.dart';
 import '../ds_send/common/fake_ds_client.dart';
 

diff --git a/test/unit/core/jds_service/jds_service_points_test.dart b/test/unit/core/jds_service/jds_service_points_test.dart
@@ -1,6 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_point_config/jds_point_configs.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service.dart';
 import '../ds_send/common/fake_ds_client.dart';

diff --git a/test/unit/core/jds_service/jds_service_startup/jds_service_startup_run_test.dart b/test/unit/core/jds_service/jds_service_startup/jds_service_startup_run_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_point_config/jds_point_configs.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service_startup.dart';
 import '../fake_jds_service.dart';

diff --git a/test/unit/core/jds_service/jds_service_subscribe_test.dart b/test/unit/core/jds_service/jds_service_subscribe_test.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_service.dart';
 import '../ds_send/common/fake_ds_client.dart';
 

diff --git a/...e/jds_service/update_cache_from_jds_service/update_cache_from_jds_service_apply_test.dart b/...e/jds_service/update_cache_from_jds_service/update_cache_from_jds_service_apply_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_point_config/ds_point_address.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_point_config/jds_point_config.dart';
 import 'package:hmi_networking/src/core/jds_service/jds_point_config/jds_point_configs.dart';

diff --git a/...nit/core/jds_service/update_cache_on_reconnect/jds_service_startup_on_reconnect_test.dart b/...nit/core/jds_service/update_cache_on_reconnect/jds_service_startup_on_reconnect_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/src/core/result_new/result.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/hmi_networking.dart';
 ///
 final class _FakeJdsStartup implements JdsServiceStartup {

diff --git a/test/unit/protocols/jds_line/common/fake_line_socket.dart b/test/unit/protocols/jds_line/common/fake_line_socket.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/hmi_networking.dart';
 ///
 class FakeLineSocket extends Fake implements LineSocket {

diff --git a/test/unit/protocols/jds_line/common/jds_line_request_all_test.dart b/test/unit/protocols/jds_line/common/jds_line_request_all_test.dart
@@ -1,6 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/hmi_networking.dart';
 import 'fake_line_socket.dart';
 

diff --git a/test/unit/protocols/jds_line/common/jds_line_send_test.dart b/test/unit/protocols/jds_line/common/jds_line_send_test.dart
@@ -1,6 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hmi_core/hmi_core.dart';
-import 'package:hmi_core/hmi_core_result_new.dart';
+import 'package:hmi_core/hmi_core_entities.dart';
+import 'package:hmi_core/hmi_core_failure.dart';
+import 'package:hmi_core/hmi_core_log.dart';
+import 'package:hmi_core/hmi_core_result.dart';
 import 'package:hmi_networking/hmi_networking.dart';
 import '../test_commands_data.dart';
 import 'empty_stream.dart';