From 56d60369fabf6276082250a51cc0221ba7f92969 Mon Sep 17 00:00:00 2001
From: Lukas Lihotzki <lukas@lihotzki.de>
Date: Thu, 16 Jul 2020 17:32:11 +0200
Subject: [PATCH] Include the olm library with flutter_olm

---
 .gitmodules              |  3 ---
 android/app/build.gradle | 14 --------------
 ios/Podfile              |  1 -
 ios/olm                  |  1 -
 pubspec.yaml             |  1 +
 5 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 ios/olm

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f651483..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ios/olm"]
-	path = ios/olm
-	url = https://gitlab.matrix.org/matrix-org/olm.git
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2255470..0689123 100644
--- a/android/app/build.gradle
+++ b/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 {
diff --git a/ios/Podfile b/ios/Podfile
index 2bd2b5c..5b12b73 100644
--- a/ios/Podfile
+++ b/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
 
diff --git a/ios/olm b/ios/olm
deleted file mode 160000
index 930c467..0000000
--- a/ios/olm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 930c4677547ebb3058680a9c3ad88186bb2030da
diff --git a/pubspec.yaml b/pubspec.yaml
index 60db4c5..040cc5c 100644
--- a/pubspec.yaml
+++ b/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