inex/FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

Merge branch 'lukaslihotzki/flutter_olm' into 'master'

Browse source 
Include the olm library with flutter_olm

See merge request ChristianPauly/fluffychat-flutter!105
This commit is contained in:
Christian Pauly 2020-07-19 07:02:23 +00:00
parent be398cddaa 56d60369fa
commit f8eba58b12
5 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

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

14
android/app/build.gradle
View file

@ -49,11 +49,6 @@ android {
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
arguments "-DOLM_TESTS=NO"
}
}
} }
signingConfigs { signingConfigs {
@ -77,15 +72,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 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 { flutter {

1
ios/Podfile
View file

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

1
ios/olm

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

1
pubspec.yaml
View file

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