mirror of
https://github.com/krille-chan/fluffychat
synced 2024-09-10 09:05:10 +00:00
Include the olm library with flutter_olm
This commit is contained in:
parent
d157a2ebe5
commit
e6ad76e687
5 changed files with 1 additions and 19 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +0,0 @@
|
||||||
[submodule "ios/olm"]
|
|
||||||
path = ios/olm
|
|
||||||
url = https://gitlab.matrix.org/matrix-org/olm.git
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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
ios/olm
|
@ -1 +0,0 @@
|
||||||
Subproject commit 930c4677547ebb3058680a9c3ad88186bb2030da
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue