From 3d55abdd11ee3ec080395a117e25923acf2a85d4 Mon Sep 17 00:00:00 2001
From: Lukas Lihotzki <lukas@lihotzki.de>
Date: Mon, 29 Mar 2021 16:37:29 +0200
Subject: [PATCH] chore: upgrade to ffi 1.0.0

---
 analysis_options.yaml               |  5 ++++-
 lib/src/utils/device_keys_list.dart |  2 +-
 pubspec.yaml                        | 12 ++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index fefe9615..6d8082c2 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -9,4 +9,7 @@ analyzer:
   errors:
     todo: ignore
   exclude:
-    - example/main.dart
\ No newline at end of file
+    - example/main.dart
+
+    # needed until crypto packages upgrade
+    - lib/src/database/database.g.dart
diff --git a/lib/src/utils/device_keys_list.dart b/lib/src/utils/device_keys_list.dart
index 3b59c65b..52e2078f 100644
--- a/lib/src/utils/device_keys_list.dart
+++ b/lib/src/utils/device_keys_list.dart
@@ -187,7 +187,7 @@ abstract class SignableKey extends MatrixSignableKey {
     olm.Utility olmutil;
     try {
       olmutil = olm.Utility();
-    } on NoSuchMethodError {
+    } catch (e) {
       // if no libolm is present we land in this catch block, and return the default
       // set if no libolm is there. Some signatures should be assumed-valid while others
       // should be assumed-invalid
diff --git a/pubspec.yaml b/pubspec.yaml
index 95949141..84fb1424 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,14 +13,14 @@ dependencies:
   canonical_json: ^1.0.0
   markdown: ^3.0.0
   html_unescape: ^1.0.2
-  moor: ^3.4.0
+  moor: ^4.0.0
   random_string: ^2.1.0
   encrypt: ^4.1.0
   crypto: ^2.1.5
   base58check: ^1.0.1
   password_hash: ^2.0.0
-  olm: ^1.3.0
-  matrix_file_e2ee: ^1.0.5
+  olm: ^2.0.0
+  matrix_file_e2ee: ^1.1.0
   isolate: ^2.0.3
   logger: ^0.9.4
   matrix_api_lite: ^0.2.0
@@ -28,9 +28,13 @@ dependencies:
 dev_dependencies:
   test: ^1.15.7
   coverage: ">=0.15.0 <2.0.0"
-  moor_generator: ^3.4.1
+  moor_generator: ^4.0.0
   build_runner: ^1.11.1
   pedantic: ^1.11.0
   dapackages: ^1.4.0
   #flutter_test:
     #sdk: flutter
+
+dependency_overrides:
+  # needed until crypto packages upgrade
+  convert: ^3.0.0