From 8c69c772a01bdc5060748b5d98ba72f637ab29d4 Mon Sep 17 00:00:00 2001
From: Herbert Poul <herbert@codeux.design>
Date: Sun, 7 Mar 2021 10:15:15 +0000
Subject: [PATCH] upgrade to null safety dependencies

---
 lib/src/argon2_ffi_impl.dart |  6 +++---
 lib/src/utils.dart           |  2 +-
 pubspec.lock                 | 17 +++++------------
 pubspec.yaml                 |  8 ++++----
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/lib/src/argon2_ffi_impl.dart b/lib/src/argon2_ffi_impl.dart
index 88e1c6f..dcbe60d 100644
--- a/lib/src/argon2_ffi_impl.dart
+++ b/lib/src/argon2_ffi_impl.dart
@@ -67,10 +67,10 @@ abstract class Argon2Base extends Argon2 {
       args.version,
     );
 
-    free(keyPtr);
-    free(saltPtr);
+    calloc.free(keyPtr);
+    calloc.free(saltPtr);
 //    free(saltArray);
-    final resultString = Utf8.fromUtf8(result);
+    final resultString = result.toDartString();
     return base64.decode(resultString);
   }
 
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 9f23908..fb5c688 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -15,7 +15,7 @@ class Uint8ArrayUtils {
   }
 
   static Pointer<Uint8> toPointer(Uint8List bytes) {
-    final ptr = allocate<Uint8>(count: bytes.length);
+    final ptr = calloc.allocate<Uint8>(bytes.length);
     final byteList = ptr.asTypedList(bytes.length);
     byteList.setAll(0, bytes);
     return ptr.cast();
diff --git a/pubspec.lock b/pubspec.lock
index 96708ba..1d66400 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,34 +7,27 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "1.0.0"
   logging:
     dependency: "direct main"
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.4"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.2"
+    version: "1.0.0"
   path:
     dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   pedantic:
     dependency: "direct dev"
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.2"
+    version: "1.11.0"
 sdks:
-  dart: ">=2.7.0 <3.0.0"
+  dart: ">=2.12.0-259.9.beta <3.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 7805c0e..d5547a9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,9 +7,9 @@ environment:
   sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
-  ffi: ^0.1.3
-  logging: ^0.11.4
-  path: ">=1.7.0 <2.0.0"
+  ffi: ^1.0.0
+  logging: ^1.0.0
+  path: ^1.8.0
 
 dev_dependencies:
-  pedantic: ^1.9.2
+  pedantic: ^1.11.0