Merge branch 'lukaslihotzki/flutter_olm' into 'master'

Include the olm library with flutter_olm

See merge request ChristianPauly/fluffychat-flutter!105

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "ios/olm"]
-	path = ios/olm
-	url = https://gitlab.matrix.org/matrix-org/olm.git

android/app/build.gradle

@@ -49,11 +49,6 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {
-                arguments "-DOLM_TESTS=NO"
-            }
-        }
     }
 
     signingConfigs {
@@ -77,15 +72,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    externalNativeBuild {
-        // Encapsulates your CMake build configurations.
-        cmake {
-            // Provides a relative path to your CMake build script.
-            path "../../ios/olm/CMakeLists.txt"
-            version "3.10.2"
-        }
-    }
 }
 
 flutter {

ios/Podfile

@@ -63,7 +63,6 @@ target 'Runner' do
 
   # Keep pod path relative so it can be checked into Podfile.lock.
   pod 'Flutter', :path => 'Flutter'
-  pod 'OLMKit'
 
   # Plugin Pods
 

ios/olm

@@ -1 +0,0 @@
-Subproject commit 930c4677547ebb3058680a9c3ad88186bb2030da

pubspec.yaml

@@ -56,6 +56,7 @@ dependencies:
   moor: ^3.0.2
   random_string: ^2.0.1
   flutter_typeahead: ^1.8.1
+  flutter_olm: ^1.0.1
 
   intl: ^0.16.0
   intl_translation: ^0.17.9