From 410174675b71be33aa56c8ab00ad6b7a6f7f99dc Mon Sep 17 00:00:00 2001 From: Herbert Poul Date: Mon, 3 Aug 2020 23:55:45 +0200 Subject: [PATCH] move resolveLibraryForceDynamic setting to shared class --- CHANGELOG.md | 2 +- lib/src/argon2_ffi_base.dart | 4 ++++ lib/src/argon2_ffi_impl.dart | 7 ++----- pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38bc5ee..ad884c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.1.4 +## 0.1.4+1 * separate implementation to allow dart:html compilation. diff --git a/lib/src/argon2_ffi_base.dart b/lib/src/argon2_ffi_base.dart index c78783f..e187992 100644 --- a/lib/src/argon2_ffi_base.dart +++ b/lib/src/argon2_ffi_base.dart @@ -1,6 +1,10 @@ import 'dart:typed_data'; abstract class Argon2 { + /// forces loading of dynamic library on MacOS instead of assuming + /// argon2 was statically linked. (ie. flutter usage, vs dart usage) + static bool resolveLibraryForceDynamic = false; + Uint8List argon2(Argon2Arguments args); Future argon2Async(Argon2Arguments args); diff --git a/lib/src/argon2_ffi_impl.dart b/lib/src/argon2_ffi_impl.dart index fe77600..89249e1 100644 --- a/lib/src/argon2_ffi_impl.dart +++ b/lib/src/argon2_ffi_impl.dart @@ -94,10 +94,6 @@ class Argon2FfiFlutter extends Argon2Base { static ResolveLibrary defaultResolveLibrary = (name) => name; - /// forces loading of dynamic library on MacOS instead of assuming - /// argon2 was statically linked. (ie. flutter usage, vs dart usage) - static bool resolveLibraryForceDynamic = false; - final ResolveLibrary resolveLibrary; int Function(int x, int y) _nativeAdd; @@ -109,7 +105,8 @@ class Argon2FfiFlutter extends Argon2Base { DynamicLibrary _loadLib() { final resolveLibrary = this.resolveLibrary ?? defaultResolveLibrary; - if (!resolveLibraryForceDynamic && (Platform.isIOS || Platform.isMacOS)) { + if (!Argon2.resolveLibraryForceDynamic && + (Platform.isIOS || Platform.isMacOS)) { return DynamicLibrary.executable(); } final libraryNames = [ diff --git a/pubspec.yaml b/pubspec.yaml index cf4741a..6415200 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 +version: 0.1.4+1 homepage: https://github.com/authpass/argon2_ffi_base environment: