From fc1b78d712ec2710db4e4ad47f51c627c6889e82 Mon Sep 17 00:00:00 2001
From: Lukas Lihotzki <lukas@lihotzki.de>
Date: Tue, 14 Jul 2020 17:08:30 +0200
Subject: [PATCH] olm and matrix_file_e2ee from pub

---
 pubspec.lock | 18 ------------------
 pubspec.yaml | 12 ++----------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index e532c62..7f80235 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -323,15 +323,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.6"
-  matrix_file_e2ee:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: "1.x.y"
-      resolved-ref: "32edeff765369a7a77a0822f4b19302ca24a017b"
-      url: "https://gitlab.com/famedly/libraries/matrix_file_e2ee.git"
-    source: git
-    version: "1.0.3"
   meta:
     dependency: transitive
     description:
@@ -395,15 +386,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.8"
-  olm:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: "1.x.y"
-      resolved-ref: "8e4fcccff7a2d4d0bd5142964db092bf45061905"
-      url: "https://gitlab.com/famedly/libraries/dart-olm.git"
-    source: git
-    version: "1.2.0"
   package_config:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c75844a..a82843e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,16 +19,8 @@ dependencies:
   crypto: ^2.1.4
   base58check: ^1.0.1
   password_hash: ^2.0.0
-
-  olm:
-    git:
-      url: https://gitlab.com/famedly/libraries/dart-olm.git
-      ref: 1.x.y
-
-  matrix_file_e2ee:
-    git:
-      url: https://gitlab.com/famedly/libraries/matrix_file_e2ee.git
-      ref: 1.x.y
+  olm: ^1.2.1
+  matrix_file_e2ee: ^1.0.4
 
 dev_dependencies:
   test: ^1.0.0