From 333e4f04935bace7ef63926c6845b41e663164e7 Mon Sep 17 00:00:00 2001 From: Herbert Poul Date: Tue, 18 Aug 2020 13:19:20 +0200 Subject: [PATCH] separate implementation to allow dart:html compilation --- CHANGELOG.md | 2 +- lib/src/argon2_ffi_base.dart | 2 ++ lib/src/argon2_ffi_impl.dart | 2 -- lib/src/argon2_ffi_noop.dart | 3 +++ pubspec.yaml | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad884c0..72860d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.1.4+1 +## 0.1.4+2 * separate implementation to allow dart:html compilation. diff --git a/lib/src/argon2_ffi_base.dart b/lib/src/argon2_ffi_base.dart index e187992..abba463 100644 --- a/lib/src/argon2_ffi_base.dart +++ b/lib/src/argon2_ffi_base.dart @@ -1,5 +1,7 @@ import 'dart:typed_data'; +typedef ResolveLibrary = String Function(String baseName); + abstract class Argon2 { /// forces loading of dynamic library on MacOS instead of assuming /// argon2 was statically linked. (ie. flutter usage, vs dart usage) diff --git a/lib/src/argon2_ffi_impl.dart b/lib/src/argon2_ffi_impl.dart index 89249e1..cef10b8 100644 --- a/lib/src/argon2_ffi_impl.dart +++ b/lib/src/argon2_ffi_impl.dart @@ -38,8 +38,6 @@ typedef Argon2Hash = Pointer Function( int version, ); -typedef ResolveLibrary = String Function(String baseName); - abstract class Argon2Base extends Argon2 { // @protected Argon2Hash get argon2hash; diff --git a/lib/src/argon2_ffi_noop.dart b/lib/src/argon2_ffi_noop.dart index 556c268..45d1e5c 100644 --- a/lib/src/argon2_ffi_noop.dart +++ b/lib/src/argon2_ffi_noop.dart @@ -3,6 +3,9 @@ import 'dart:typed_data'; import 'package:argon2_ffi_base/src/argon2_ffi_base.dart'; class Argon2FfiFlutter extends Argon2 { + // ignore: avoid_unused_constructor_parameters + Argon2FfiFlutter({ResolveLibrary resolveLibrary}); + @override Uint8List argon2(Argon2Arguments args) { throw UnimplementedError(); diff --git a/pubspec.yaml b/pubspec.yaml index 6415200..6a9c861 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: argon2_ffi_base description: Base package defining the interface for an Argon2 implementation. -version: 0.1.4+1 +version: 0.1.4+2 homepage: https://github.com/authpass/argon2_ffi_base environment: