From e8e54da8c5714832eba2864b5abbcad06f079b7b Mon Sep 17 00:00:00 2001 From: WilliamVerhaeghe Date: Fri, 27 Oct 2023 15:43:06 +0200 Subject: [PATCH 1/2] Update dependencies --- .vscode/settings.json | 4 +- analysis_options.yaml | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/analysis_options.yaml | 6 +- example/android/app/build.gradle | 4 +- example/android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/lib/main.dart | 2 +- example/pubspec.lock | 86 ++++++++++--------- example/pubspec.yaml | 8 +- .../file_storage_manager.dart | 8 +- .../flutter_file_storage_manager.dart | 10 +-- pubspec.lock | 74 ++++++++-------- pubspec.yaml | 20 ++--- ...ter_key_value_file_storage_test.mocks.dart | 18 +++- test/key_value_storage_test.mocks.dart | 15 +++- 16 files changed, 152 insertions(+), 119 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e26dfe..a863fd1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "dart.flutterSdkPath": "~/fvm/versions/3.13.9" +} \ No newline at end of file diff --git a/analysis_options.yaml b/analysis_options.yaml index 980a957..9773a3f 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -6,9 +6,9 @@ analyzer: missing_return: error todo: ignore sdk_version_async_exported_from_core: ignore - strong-mode: - implicit-casts: false - implicit-dynamic: false + language: + strict-casts: true + strict-raw-types: true exclude: - '**.mocks.dart' - 'test/coverage_helper_test.dart' diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 9fe8d05..3c472b9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index 980a957..9773a3f 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -6,9 +6,9 @@ analyzer: missing_return: error todo: ignore sdk_version_async_exported_from_core: ignore - strong-mode: - implicit-casts: false - implicit-dynamic: false + language: + strict-casts: true + strict-raw-types: true exclude: - '**.mocks.dart' - 'test/coverage_helper_test.dart' diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index c5be349..2a16c38 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -44,7 +44,7 @@ android { defaultConfig { applicationId "com.icapps.flutter_key_value_file_storage_example" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/example/android/build.gradle b/example/android/build.gradle index 4256f91..e306d8e 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..6b66533 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/example/lib/main.dart b/example/lib/main.dart index 625864b..f7e62ff 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -7,7 +7,7 @@ void main() { } class MyApp extends StatefulWidget { - const MyApp({Key? key}) : super(key: key); + const MyApp({super.key}); @override State createState() => _MyAppState(); diff --git a/example/pubspec.lock b/example/pubspec.lock index 7d0f0f2..a38f1a7 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,26 +37,26 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" device_info_plus: dependency: transitive description: name: device_info_plus - sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b" + sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419" url: "https://pub.dev" source: hosted - version: "9.0.2" + version: "9.1.0" device_info_plus_platform_interface: dependency: transitive description: @@ -100,23 +100,23 @@ packages: path: ".." relative: true source: path - version: "0.0.7" + version: "0.0.8" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" flutter_secure_storage: dependency: "direct main" description: name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.0.0" flutter_secure_storage_linux: dependency: transitive description: @@ -153,10 +153,10 @@ packages: dependency: transitive description: name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -179,26 +179,26 @@ packages: dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -219,50 +219,50 @@ packages: dependency: transitive description: name: path_provider - sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95 + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.0.12" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e + sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.2.1" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74" + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "2e32f1640f07caef0d3cb993680f181c79e54a3827b997d5ee221490d131fbd9" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.8" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" platform: dependency: transitive description: @@ -296,10 +296,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -328,10 +328,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" term_glyph: dependency: transitive description: @@ -344,10 +344,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -356,6 +356,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" win32: dependency: transitive description: @@ -381,5 +389,5 @@ packages: source: hosted version: "1.0.0" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.3.0" + dart: ">=3.1.0-185.0.dev <4.0.0" + flutter: ">=3.7.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9276b67..807c4f1 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,20 +4,20 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.14.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: sdk: flutter flutter_key_value_file_storage: path: ../ - flutter_secure_storage: ^8.0.0 - cupertino_icons: ^1.0.5 + flutter_secure_storage: ^9.0.0 + cupertino_icons: ^1.0.6 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.0 flutter: uses-material-design: true \ No newline at end of file diff --git a/lib/src/file_storage_manager/file_storage_manager.dart b/lib/src/file_storage_manager/file_storage_manager.dart index 20c9aad..a40a097 100644 --- a/lib/src/file_storage_manager/file_storage_manager.dart +++ b/lib/src/file_storage_manager/file_storage_manager.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:flutter_key_value_file_storage/src/file_storage/documents_file_storage.dart'; -import 'package:flutter_key_value_file_storage/src/key_value_storage.dart'; import 'package:flutter_key_value_file_storage/src/file_storage/file_storage.dart'; +import 'package:flutter_key_value_file_storage/src/key_value_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:synchronized/synchronized.dart'; @@ -124,10 +124,12 @@ abstract class FileStorageManager { () => _locks.putIfAbsent(key, () => Lock(reentrant: true))); try { final result = await lock.synchronized(() => computation.call()); - await _locksLock.synchronized(() => _locks.remove(lock)); + await _locksLock + .synchronized(() => _locks.removeWhere((_, value) => value == lock)); return result; } finally { - await _locksLock.synchronized(() => _locks.remove(lock)); + await _locksLock + .synchronized(() => _locks.removeWhere((_, value) => value == lock)); } } diff --git a/lib/src/file_storage_manager/flutter_file_storage_manager.dart b/lib/src/file_storage_manager/flutter_file_storage_manager.dart index 091df0b..c20c5a6 100644 --- a/lib/src/file_storage_manager/flutter_file_storage_manager.dart +++ b/lib/src/file_storage_manager/flutter_file_storage_manager.dart @@ -2,20 +2,16 @@ import 'dart:async'; import 'dart:convert'; import 'dart:typed_data'; -import 'package:flutter_key_value_file_storage/src/file_storage/file_storage.dart'; import 'package:flutter_key_value_file_storage/src/file_storage_manager/file_storage_manager.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; class FlutterFileStorageManager extends FileStorageManager { static const _keysStorageKeyDefault = 'flutter_key_value_file_storage_keys'; FlutterFileStorageManager( - FlutterSecureStorage storage, { - FileStorage? fileStorage, + super.storage, { + super.fileStorage, String? keysStorageKey, - }) : super(storage, - fileStorage: fileStorage, - keysStorageKey: keysStorageKey ?? _keysStorageKeyDefault); + }) : super(keysStorageKey: keysStorageKey ?? _keysStorageKeyDefault); @override Future performWrite( diff --git a/pubspec.lock b/pubspec.lock index 6a066ea..0a20131 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "569ddca58d535e601dd1584afa117710abc999d036c0cd2c51777fb257df78e8" + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "53.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "10927c4b7c7c88b1adbca278c3d5531db92e2f4b4abf04e2919a800af965f3f5" + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.13.0" args: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf" + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "4.0.0" build_resolvers: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.6" build_runner_core: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.7.0" collection: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b" + sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419" url: "https://pub.dev" source: hosted - version: "9.0.2" + version: "9.1.0" device_info_plus_platform_interface: dependency: transitive description: @@ -226,18 +226,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" flutter_secure_storage: dependency: "direct main" description: name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.0.0" flutter_secure_storage_linux: dependency: transitive description: @@ -274,10 +274,10 @@ packages: dependency: transitive description: name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -356,10 +356,10 @@ packages: dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" logging: dependency: transitive description: @@ -404,10 +404,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.2" package_config: dependency: transitive description: @@ -428,50 +428,50 @@ packages: dependency: "direct main" description: name: path_provider - sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95 + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.0.12" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e + sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.2.1" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74" + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "2e32f1640f07caef0d3cb993680f181c79e54a3827b997d5ee221490d131fbd9" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.8" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" platform: dependency: transitive description: @@ -593,10 +593,10 @@ packages: dependency: "direct main" description: name: synchronized - sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" term_glyph: dependency: transitive description: @@ -687,4 +687,4 @@ packages: version: "3.1.1" sdks: dart: ">=3.0.0 <4.0.0" - flutter: ">=3.3.0" + flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2fb7106..ea1e1d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,27 +1,27 @@ name: flutter_key_value_file_storage description: An implementation to save big chunks of content to a file -version: 0.0.7 +version: 0.0.8 homepage: https://github.com/icapps/flutter_key_value_file_storage environment: - sdk: ">=2.14.0 <4.0.0" + sdk: ">=3.0.0 <4.0.0" flutter: ">=2.5.0" dependencies: - device_info_plus: ^9.0.0 + device_info_plus: ^9.1.0 flutter: sdk: flutter - flutter_secure_storage: ^8.0.0 - path: ^1.8.1 - path_provider: ^2.0.12 - synchronized: ^3.0.1 + flutter_secure_storage: ^9.0.0 + path: ^1.8.3 + path_provider: ^2.1.1 + synchronized: ^3.1.0 dev_dependencies: - build_runner: ^2.3.0 + build_runner: ^2.4.6 flutter_test: sdk: flutter - flutter_lints: ^2.0.1 - mockito: ^5.3.2 + flutter_lints: ^3.0.0 + mockito: ^5.4.2 flutter: plugin: diff --git a/test/flutter_key_value_file_storage_test.mocks.dart b/test/flutter_key_value_file_storage_test.mocks.dart index 21af4b9..22d6a4a 100644 --- a/test/flutter_key_value_file_storage_test.mocks.dart +++ b/test/flutter_key_value_file_storage_test.mocks.dart @@ -1,5 +1,5 @@ -// Mocks generated by Mockito 5.3.2 from annotations -// in flutter_key_value_file_storage/example/ios/.symlinks/plugins/flutter_key_value_file_storage/test/flutter_key_value_file_storage_test.dart. +// Mocks generated by Mockito 5.4.2 from annotations +// in flutter_key_value_file_storage/test/flutter_key_value_file_storage_test.dart. // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -112,6 +112,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#iOptions), ), ) as _i2.IOSOptions); + @override _i2.AndroidOptions get aOptions => (super.noSuchMethod( Invocation.getter(#aOptions), @@ -120,6 +121,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#aOptions), ), ) as _i2.AndroidOptions); + @override _i2.LinuxOptions get lOptions => (super.noSuchMethod( Invocation.getter(#lOptions), @@ -128,6 +130,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#lOptions), ), ) as _i2.LinuxOptions); + @override _i2.WindowsOptions get wOptions => (super.noSuchMethod( Invocation.getter(#wOptions), @@ -136,6 +139,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#wOptions), ), ) as _i2.WindowsOptions); + @override _i2.WebOptions get webOptions => (super.noSuchMethod( Invocation.getter(#webOptions), @@ -144,6 +148,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#webOptions), ), ) as _i2.WebOptions); + @override _i2.MacOsOptions get mOptions => (super.noSuchMethod( Invocation.getter(#mOptions), @@ -152,6 +157,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#mOptions), ), ) as _i2.MacOsOptions); + @override _i4.Future write({ required String? key, @@ -181,6 +187,7 @@ class MockFlutterSecureStorage extends _i1.Mock returnValue: _i4.Future.value(), returnValueForMissingStub: _i4.Future.value(), ) as _i4.Future); + @override _i4.Future read({ required String? key, @@ -207,6 +214,7 @@ class MockFlutterSecureStorage extends _i1.Mock ), returnValue: _i4.Future.value(), ) as _i4.Future); + @override _i4.Future containsKey({ required String? key, @@ -233,6 +241,7 @@ class MockFlutterSecureStorage extends _i1.Mock ), returnValue: _i4.Future.value(false), ) as _i4.Future); + @override _i4.Future delete({ required String? key, @@ -260,6 +269,7 @@ class MockFlutterSecureStorage extends _i1.Mock returnValue: _i4.Future.value(), returnValueForMissingStub: _i4.Future.value(), ) as _i4.Future); + @override _i4.Future> readAll({ _i2.IOSOptions? iOptions, @@ -284,6 +294,7 @@ class MockFlutterSecureStorage extends _i1.Mock ), returnValue: _i4.Future>.value({}), ) as _i4.Future>); + @override _i4.Future deleteAll({ _i2.IOSOptions? iOptions, @@ -327,6 +338,7 @@ class MockFileStorage extends _i1.Mock implements _i5.FileStorage { ), returnValue: _i4.Future<_i6.Uint8List?>.value(), ) as _i4.Future<_i6.Uint8List?>); + @override _i4.Future exists(String? filename) => (super.noSuchMethod( Invocation.method( @@ -335,6 +347,7 @@ class MockFileStorage extends _i1.Mock implements _i5.FileStorage { ), returnValue: _i4.Future.value(false), ) as _i4.Future); + @override _i4.Future<_i3.File> write( String? filename, @@ -359,6 +372,7 @@ class MockFileStorage extends _i1.Mock implements _i5.FileStorage { ), )), ) as _i4.Future<_i3.File>); + @override _i4.Future delete(String? filename) => (super.noSuchMethod( Invocation.method( diff --git a/test/key_value_storage_test.mocks.dart b/test/key_value_storage_test.mocks.dart index 099b620..d69c7ee 100644 --- a/test/key_value_storage_test.mocks.dart +++ b/test/key_value_storage_test.mocks.dart @@ -1,5 +1,5 @@ -// Mocks generated by Mockito 5.3.2 from annotations -// in flutter_key_value_file_storage/example/ios/.symlinks/plugins/flutter_key_value_file_storage/test/key_value_storage_test.dart. +// Mocks generated by Mockito 5.4.2 from annotations +// in flutter_key_value_file_storage/test/key_value_storage_test.dart. // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -98,6 +98,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#iOptions), ), ) as _i2.IOSOptions); + @override _i2.AndroidOptions get aOptions => (super.noSuchMethod( Invocation.getter(#aOptions), @@ -106,6 +107,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#aOptions), ), ) as _i2.AndroidOptions); + @override _i2.LinuxOptions get lOptions => (super.noSuchMethod( Invocation.getter(#lOptions), @@ -114,6 +116,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#lOptions), ), ) as _i2.LinuxOptions); + @override _i2.WindowsOptions get wOptions => (super.noSuchMethod( Invocation.getter(#wOptions), @@ -122,6 +125,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#wOptions), ), ) as _i2.WindowsOptions); + @override _i2.WebOptions get webOptions => (super.noSuchMethod( Invocation.getter(#webOptions), @@ -130,6 +134,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#webOptions), ), ) as _i2.WebOptions); + @override _i2.MacOsOptions get mOptions => (super.noSuchMethod( Invocation.getter(#mOptions), @@ -138,6 +143,7 @@ class MockFlutterSecureStorage extends _i1.Mock Invocation.getter(#mOptions), ), ) as _i2.MacOsOptions); + @override _i3.Future write({ required String? key, @@ -167,6 +173,7 @@ class MockFlutterSecureStorage extends _i1.Mock returnValue: _i3.Future.value(), returnValueForMissingStub: _i3.Future.value(), ) as _i3.Future); + @override _i3.Future read({ required String? key, @@ -193,6 +200,7 @@ class MockFlutterSecureStorage extends _i1.Mock ), returnValue: _i3.Future.value(), ) as _i3.Future); + @override _i3.Future containsKey({ required String? key, @@ -219,6 +227,7 @@ class MockFlutterSecureStorage extends _i1.Mock ), returnValue: _i3.Future.value(false), ) as _i3.Future); + @override _i3.Future delete({ required String? key, @@ -246,6 +255,7 @@ class MockFlutterSecureStorage extends _i1.Mock returnValue: _i3.Future.value(), returnValueForMissingStub: _i3.Future.value(), ) as _i3.Future); + @override _i3.Future> readAll({ _i2.IOSOptions? iOptions, @@ -270,6 +280,7 @@ class MockFlutterSecureStorage extends _i1.Mock ), returnValue: _i3.Future>.value({}), ) as _i3.Future>); + @override _i3.Future deleteAll({ _i2.IOSOptions? iOptions, From 0d01e42798f39c5c11d19ceb8618b408a31d55ec Mon Sep 17 00:00:00 2001 From: WilliamVerhaeghe Date: Fri, 27 Oct 2023 15:43:41 +0200 Subject: [PATCH 2/2] Added to changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a2d98c..959e6bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.8 - 27/10/2023 +### Updated +* Dependency updates + ## 0.0.7 - 14/06/2023 ### Updated * Dependency updates