From 01aaa19abfb8cee9601ebe31a443d712fe087983 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 11 Apr 2021 10:09:24 +0200
Subject: [PATCH] chore: Fix linux dependencies

---
 .gitlab-ci.yml                   |  3 +--
 lib/utils/sentry_controller.dart |  4 ++--
 pubspec.lock                     | 17 +++++------------
 pubspec.yaml                     |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 871c1bd0..426aae95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ snap:edge:
   stage: release
   image: "snapcore/snapcraft"
   before_script:
-    - apt update && apt install git curl unzip clang cmake build-essential ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev -y
+    - apt update && apt install git curl unzip clang cmake build-essential ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1 librhash0 -y
     - git clone https://github.com/flutter/flutter.git
     - export PATH="$PATH:`pwd`/flutter/bin"
   variables:
@@ -186,7 +186,6 @@ snap:edge:
     paths:
       - "./*.snap"
     when: on_success
-  allow_failure: true
 
 #snap:publish:
 #  stage: release
diff --git a/lib/utils/sentry_controller.dart b/lib/utils/sentry_controller.dart
index 09e38371..cb44b528 100644
--- a/lib/utils/sentry_controller.dart
+++ b/lib/utils/sentry_controller.dart
@@ -22,13 +22,13 @@ abstract class SentryController {
     return await storage.getItemBool(SettingKeys.sentry);
   }
 
-  static final sentry = SentryClient(dsn: AppConfig.sentryDns);
+  static final sentry = SentryClient(SentryOptions(dsn: AppConfig.sentryDns));
 
   static void captureException(error, stackTrace) async {
     Logs().e('Capture exception', error, stackTrace);
     if (!kDebugMode && await getSentryStatus()) {
       await sentry.captureException(
-        exception: error,
+        error,
         stackTrace: stackTrace,
       );
     }
diff --git a/pubspec.lock b/pubspec.lock
index 15ca890f..65b762a8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -379,19 +379,19 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_math:
+  flutter_math_fork:
     dependency: transitive
     description:
-      name: flutter_math
+      name: flutter_math_fork
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0-nullsafety.1"
+    version: "0.3.0+2"
   flutter_matrix_html:
     dependency: "direct main"
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "2801b47a5ca640d114b134024afe657166cccfe8"
+      resolved-ref: "71735d848c9720d986c84078a013253321399058"
       url: "https://github.com/ChristianPauly/flutter_matrix_html.git"
     source: git
     version: "0.2.0"
@@ -912,7 +912,7 @@ packages:
       name: sentry
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "5.0.0"
   share:
     dependency: "direct main"
     description:
@@ -1193,13 +1193,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
-  usage:
-    dependency: transitive
-    description:
-      name: usage
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.4.2"
   uuid:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6c45fd63..271bebb0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -67,7 +67,7 @@ dependencies:
       url: https://gitlab.com/famedly/libraries/native_imaging.git
       ref: master
   flutter_blurhash: ^0.6.0
-  sentry: ">=3.0.0 <4.0.0"
+  sentry: ^5.0.0
   scroll_to_index: ^2.0.0
   swipe_to_action: ^0.1.0
   flutter_svg: ^0.21.0+1