From 1b601bb7b026e5b9090d20a50585034a1edd9b27 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Wed, 6 Sep 2023 16:11:48 +0200 Subject: [PATCH] update dependencies --- packages/sodium/CHANGELOG.md | 9 ++++- packages/sodium/example/pubspec.yaml | 2 +- .../lib/src/ffi/bindings/libsodium.ffi.dart | 36 ++++++++++--------- packages/sodium/pubspec.yaml | 30 ++++++++-------- .../isolates/transferable_key_pair_test.dart | 2 +- .../transferable_secure_key_test.dart | 2 +- .../ffi/bindings/sodium_pointer_test.dart | 2 +- 7 files changed, 47 insertions(+), 36 deletions(-) diff --git a/packages/sodium/CHANGELOG.md b/packages/sodium/CHANGELOG.md index ef7bd896..ba0d1e19 100644 --- a/packages/sodium/CHANGELOG.md +++ b/packages/sodium/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.1.2] - 2023-09-06 +### Changed +- Update min required dart SDK to 3.1.0 +- Update dependencies +- Update formatting + ## [2.1.1] - 2023-06-06 ### Changed - Update dependencies @@ -138,6 +144,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Initial stable release +[2.1.2]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium-v2.1.1...sodium-v2.1.2 [2.1.1]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium-v2.1.0...sodium-v2.1.1 [2.1.0]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium%2Fv2.0.1...sodium-v2.1.0 [2.0.1]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium%2Fv2.0.0...sodium%2Fv2.0.1 @@ -154,4 +161,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [1.1.2]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium%2Fv1.1.1...sodium%2Fv1.1.2 [1.1.1]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium%2Fv1.1.0...sodium%2Fv1.1.1 [1.1.0]: https://github.com/Skycoder42/libsodium_dart_bindings/compare/sodium%2Fv1.0.0...sodium%2Fv1.1.0 -[1.0.0]: https://github.com/Skycoder42/libsodium_dart_bindings/releases/tag/sodium%2Fv1.0.0 \ No newline at end of file +[1.0.0]: https://github.com/Skycoder42/libsodium_dart_bindings/releases/tag/sodium%2Fv1.0.0 diff --git a/packages/sodium/example/pubspec.yaml b/packages/sodium/example/pubspec.yaml index b7f9a5b4..07020dc2 100644 --- a/packages/sodium/example/pubspec.yaml +++ b/packages/sodium/example/pubspec.yaml @@ -2,7 +2,7 @@ name: sodium_example description: Sample dart program for web and native environment: - sdk: ">=2.18.2 <3.0.0" + sdk: ^3.1.0 dependencies: sodium: diff --git a/packages/sodium/lib/src/ffi/bindings/libsodium.ffi.dart b/packages/sodium/lib/src/ffi/bindings/libsodium.ffi.dart index 34147f02..6c6c7395 100644 --- a/packages/sodium/lib/src/ffi/bindings/libsodium.ffi.dart +++ b/packages/sodium/lib/src/ffi/bindings/libsodium.ffi.dart @@ -8088,9 +8088,9 @@ class LibSodiumFFI { } late final _randombytes_bufPtr = _lookup< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Size)>>('randombytes_buf'); + ffi + .NativeFunction, ffi.Size)>>( + 'randombytes_buf'); late final _randombytes_buf = _randombytes_bufPtr .asFunction, int)>(); @@ -8336,9 +8336,9 @@ class LibSodiumFFI { } late final _sodium_memzeroPtr = _lookup< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Size)>>('sodium_memzero'); + ffi + .NativeFunction, ffi.Size)>>( + 'sodium_memzero'); late final _sodium_memzero = _sodium_memzeroPtr .asFunction, int)>(); @@ -8630,8 +8630,9 @@ class LibSodiumFFI { } late final _sodium_mlockPtr = _lookup< - ffi.NativeFunction< - ffi.Int Function(ffi.Pointer, ffi.Size)>>('sodium_mlock'); + ffi + .NativeFunction, ffi.Size)>>( + 'sodium_mlock'); late final _sodium_mlock = _sodium_mlockPtr.asFunction, int)>(); @@ -8646,8 +8647,9 @@ class LibSodiumFFI { } late final _sodium_munlockPtr = _lookup< - ffi.NativeFunction< - ffi.Int Function(ffi.Pointer, ffi.Size)>>('sodium_munlock'); + ffi + .NativeFunction, ffi.Size)>>( + 'sodium_munlock'); late final _sodium_munlock = _sodium_munlockPtr.asFunction, int)>(); @@ -8676,9 +8678,9 @@ class LibSodiumFFI { } late final _sodium_allocarrayPtr = _lookup< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Size, ffi.Size)>>('sodium_allocarray'); + ffi + .NativeFunction Function(ffi.Size, ffi.Size)>>( + 'sodium_allocarray'); late final _sodium_allocarray = _sodium_allocarrayPtr .asFunction Function(int, int)>(); @@ -9283,7 +9285,8 @@ class LibSodiumFFI { late final _crypto_box_curve25519xchacha20poly1305_open_easy_afternmPtr = _lookup< - ffi.NativeFunction< + ffi + .NativeFunction< ffi.Int Function( ffi.Pointer, ffi.Pointer, @@ -11054,8 +11057,9 @@ final class randombytes_implementation extends ffi.Struct { external ffi.Pointer> stir; - external ffi.Pointer< - ffi.NativeFunction> uniform; + external ffi + .Pointer> + uniform; external ffi.Pointer< ffi.NativeFunction< diff --git a/packages/sodium/pubspec.yaml b/packages/sodium/pubspec.yaml index 6626f7ab..7781b7af 100644 --- a/packages/sodium/pubspec.yaml +++ b/packages/sodium/pubspec.yaml @@ -1,32 +1,32 @@ name: sodium description: Dart bindings for libsodium, for the Dart-VM and for the Web -version: 2.1.1 +version: 2.1.2 homepage: https://github.com/Skycoder42/libsodium_dart_bindings environment: - sdk: ^3.0.0 + sdk: ^3.1.0 dependencies: - ffi: ^2.0.2 - freezed_annotation: ^2.2.0 + ffi: ^2.1.0 + freezed_annotation: ^2.4.1 js: ^0.6.7 meta: ^1.9.1 dev_dependencies: args: ^2.4.2 - build_runner: ^2.4.4 - cider: ">=0.1.5 <0.3.0" - collection: ^1.17.2 + build_runner: ^2.4.6 + cider: ^0.2.3 + collection: ^1.18.0 coverage: ^1.6.3 - custom_lint: ">=0.4.0 <0.6.0" - dart_pre_commit: ^5.1.0+1 - dart_test_tools: ^5.1.1 - ffigen: ">=8.0.2 <10.0.0" - freezed: ^2.3.5 - mocktail: ">=0.3.0 <2.0.0" + custom_lint: ^0.5.3 + dart_pre_commit: ^5.2.1 + dart_test_tools: ^5.3.0 + ffigen: ^9.0.1 + freezed: ^2.4.2 + mocktail: ^1.0.0 path: ^1.8.3 - test: ^1.24.3 - tuple: ^2.0.1 + test: ^1.24.6 + tuple: ^2.0.2 ffigen: output: "lib/src/ffi/bindings/libsodium.ffi.dart" diff --git a/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_key_pair_test.dart b/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_key_pair_test.dart index 37003077..7a0be00c 100644 --- a/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_key_pair_test.dart +++ b/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_key_pair_test.dart @@ -126,7 +126,7 @@ void main() { ), () => mockLibSodiumFFI.sodium_mprotect_noaccess( Pointer.fromAddress(testNativeHandle[0]), - ) + ), ]); expect(result.publicKey, testPublicKey); diff --git a/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_secure_key_test.dart b/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_secure_key_test.dart index cabb994c..6192b7a2 100644 --- a/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_secure_key_test.dart +++ b/packages/sodium/test/unit/ffi/api/helpers/isolates/transferable_secure_key_test.dart @@ -109,7 +109,7 @@ void main() { ), () => mockLibSodiumFFI.sodium_mprotect_noaccess( Pointer.fromAddress(testNativeHandle[0]), - ) + ), ]); expect(result.detach(), testNativeHandle); diff --git a/packages/sodium/test/unit/ffi/bindings/sodium_pointer_test.dart b/packages/sodium/test/unit/ffi/bindings/sodium_pointer_test.dart index 21547944..87a9c2a5 100644 --- a/packages/sodium/test/unit/ffi/bindings/sodium_pointer_test.dart +++ b/packages/sodium/test/unit/ffi/bindings/sodium_pointer_test.dart @@ -1010,7 +1010,7 @@ void main() { 1.100000023841858, 2.200000047683716, 3.299999952316284, - testData[4] + testData[4], ], ); });