Merge branch 'lukaslihotzki/pub-olm' into 'master'

olm and matrix_file_e2ee from pub

See merge request famedly/famedlysdk!384

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:

pubspec.yaml

@@ -19,16 +19,8 @@ dependencies:
   crypto: ^2.1.4
   base58check: ^1.0.1
   password_hash: ^2.0.0
-
+  olm: ^1.2.1
-  olm:
+  matrix_file_e2ee: ^1.0.4
-    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
 
 dev_dependencies:
   test: ^1.0.0