From aa4b0a25fa073497fe4462bd972fbc56a98f0c41 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Wed, 12 May 2021 14:50:02 +0200 Subject: [PATCH] refactor: Update matrix_api_lite and remove no longer necessary dep override The logger package has been removed too because the matrix_api_lite no longer depends on it. It was a unnecessary import anyway because it was transitive in the past. --- pubspec.yaml | 6 +----- test/canonical_json_test.dart | 1 - test/client_test.dart | 1 - test/device_keys_list_test.dart | 2 +- test/encryption/bootstrap_test.dart | 2 +- test/encryption/cross_signing_test.dart | 2 +- test/encryption/encrypt_decrypt_room_message_test.dart | 2 +- test/encryption/encrypt_decrypt_to_device_test.dart | 2 +- test/encryption/key_manager_test.dart | 2 +- test/encryption/key_request_test.dart | 2 +- test/encryption/key_verification_test.dart | 2 +- test/encryption/olm_manager_test.dart | 2 +- test/encryption/online_key_backup_test.dart | 2 +- test/encryption/ssss_test.dart | 2 +- test/event_test.dart | 2 +- test/matrix_database_test.dart | 2 +- test/matrix_exception_test.dart | 2 +- test/matrix_file_test.dart | 2 +- test/mxc_uri_extension_test.dart | 2 +- test/room_test.dart | 2 +- test/sync_filter_test.dart | 2 +- test/timeline_test.dart | 2 +- test/uia_test.dart | 2 +- test/user_test.dart | 2 +- 24 files changed, 22 insertions(+), 28 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 587393ff..6311fe8f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,8 +19,7 @@ dependencies: base58check: ^2.0.0 olm: ^2.0.0 isolate: ^2.0.3 - logger: ^1.0.0 - matrix_api_lite: 0.3.0 + matrix_api_lite: ^0.3.1 dev_dependencies: test: ^1.15.7 @@ -30,6 +29,3 @@ dev_dependencies: pedantic: ^1.11.0 dapackages: ^1.4.0 #flutter_test: {sdk: flutter} - -dependency_overrides: - args: ^2.0.0 diff --git a/test/canonical_json_test.dart b/test/canonical_json_test.dart index 15c222e8..ca652f53 100644 --- a/test/canonical_json_test.dart +++ b/test/canonical_json_test.dart @@ -18,7 +18,6 @@ import 'package:canonical_json/canonical_json.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/client_test.dart b/test/client_test.dart index 297b7fda..0f213dc2 100644 --- a/test/client_test.dart +++ b/test/client_test.dart @@ -25,7 +25,6 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/src/client.dart'; import 'package:famedlysdk/src/utils/event_update.dart'; import 'package:famedlysdk/src/utils/matrix_file.dart'; -import 'package:logger/logger.dart'; import 'package:famedlysdk/src/utils/room_update.dart'; import 'package:olm/olm.dart' as olm; import 'package:test/test.dart'; diff --git a/test/device_keys_list_test.dart b/test/device_keys_list_test.dart index ea3446c3..c9cd41c7 100644 --- a/test/device_keys_list_test.dart +++ b/test/device_keys_list_test.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/bootstrap_test.dart b/test/encryption/bootstrap_test.dart index c5a5c068..21c3311a 100644 --- a/test/encryption/bootstrap_test.dart +++ b/test/encryption/bootstrap_test.dart @@ -21,7 +21,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/cross_signing_test.dart b/test/encryption/cross_signing_test.dart index 7c83d752..cb51cf2b 100644 --- a/test/encryption/cross_signing_test.dart +++ b/test/encryption/cross_signing_test.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/encrypt_decrypt_room_message_test.dart b/test/encryption/encrypt_decrypt_room_message_test.dart index 03a98a32..b4042ea7 100644 --- a/test/encryption/encrypt_decrypt_room_message_test.dart +++ b/test/encryption/encrypt_decrypt_room_message_test.dart @@ -17,7 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/encrypt_decrypt_to_device_test.dart b/test/encryption/encrypt_decrypt_to_device_test.dart index cd0701c7..65f6e142 100644 --- a/test/encryption/encrypt_decrypt_to_device_test.dart +++ b/test/encryption/encrypt_decrypt_to_device_test.dart @@ -17,7 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/key_manager_test.dart b/test/encryption/key_manager_test.dart index bbd2b174..96cbc817 100644 --- a/test/encryption/key_manager_test.dart +++ b/test/encryption/key_manager_test.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/key_request_test.dart b/test/encryption/key_request_test.dart index 703db23b..59fa4408 100644 --- a/test/encryption/key_request_test.dart +++ b/test/encryption/key_request_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/key_verification_test.dart b/test/encryption/key_verification_test.dart index c6aa3173..a253a9cf 100644 --- a/test/encryption/key_verification_test.dart +++ b/test/encryption/key_verification_test.dart @@ -20,7 +20,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/olm_manager_test.dart b/test/encryption/olm_manager_test.dart index 39c866f6..1349ea72 100644 --- a/test/encryption/olm_manager_test.dart +++ b/test/encryption/olm_manager_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; import 'package:famedlysdk/encryption/utils/json_signature_check_extension.dart'; diff --git a/test/encryption/online_key_backup_test.dart b/test/encryption/online_key_backup_test.dart index cdd915cf..9588ef22 100644 --- a/test/encryption/online_key_backup_test.dart +++ b/test/encryption/online_key_backup_test.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/ssss_test.dart b/test/encryption/ssss_test.dart index 83826236..d16728e7 100644 --- a/test/encryption/ssss_test.dart +++ b/test/encryption/ssss_test.dart @@ -22,7 +22,7 @@ import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/event_test.dart b/test/event_test.dart index 2523101a..16075740 100644 --- a/test/event_test.dart +++ b/test/event_test.dart @@ -22,7 +22,7 @@ import 'dart:typed_data'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/src/event.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/matrix_database_test.dart b/test/matrix_database_test.dart index 2531bed6..d7bba5af 100644 --- a/test/matrix_database_test.dart +++ b/test/matrix_database_test.dart @@ -18,7 +18,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'fake_database.dart'; diff --git a/test/matrix_exception_test.dart b/test/matrix_exception_test.dart index 0ee347e2..06300be6 100644 --- a/test/matrix_exception_test.dart +++ b/test/matrix_exception_test.dart @@ -17,7 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; import 'package:http/http.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; void main() { diff --git a/test/matrix_file_test.dart b/test/matrix_file_test.dart index e233bf82..f58edf6c 100644 --- a/test/matrix_file_test.dart +++ b/test/matrix_file_test.dart @@ -19,7 +19,7 @@ import 'dart:typed_data'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/mxc_uri_extension_test.dart b/test/mxc_uri_extension_test.dart index 38d2f4d1..9ad00537 100644 --- a/test/mxc_uri_extension_test.dart +++ b/test/mxc_uri_extension_test.dart @@ -17,7 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:famedlysdk/src/client.dart'; import 'package:famedlysdk/src/utils/uri_extension.dart'; diff --git a/test/room_test.dart b/test/room_test.dart index 0064ce1e..2beda6da 100644 --- a/test/room_test.dart +++ b/test/room_test.dart @@ -27,7 +27,7 @@ import 'package:famedlysdk/src/event.dart'; import 'package:famedlysdk/src/room.dart'; import 'package:famedlysdk/src/user.dart'; import 'package:famedlysdk/src/utils/matrix_file.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'fake_client.dart'; diff --git a/test/sync_filter_test.dart b/test/sync_filter_test.dart index 2eabe4b4..377cf245 100644 --- a/test/sync_filter_test.dart +++ b/test/sync_filter_test.dart @@ -17,7 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; const updates = { diff --git a/test/timeline_test.dart b/test/timeline_test.dart index d16764ed..bc7c09f0 100644 --- a/test/timeline_test.dart +++ b/test/timeline_test.dart @@ -17,7 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'package:famedlysdk/src/client.dart'; import 'package:famedlysdk/src/room.dart'; diff --git a/test/uia_test.dart b/test/uia_test.dart index e8d8adea..5584cccc 100644 --- a/test/uia_test.dart +++ b/test/uia_test.dart @@ -19,7 +19,7 @@ import 'dart:async'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; void main() { diff --git a/test/user_test.dart b/test/user_test.dart index 113eb353..28507d5c 100644 --- a/test/user_test.dart +++ b/test/user_test.dart @@ -19,7 +19,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/src/event.dart'; import 'package:famedlysdk/src/user.dart'; -import 'package:logger/logger.dart'; + import 'package:test/test.dart'; import 'fake_matrix_api.dart';