mirror of
https://github.com/krille-chan/fluffychat
synced 2024-09-10 09:45:14 +00:00
[Android] Add and build olm module
Switch to famedly flutter images Took 4 minutes
This commit is contained in:
parent
fff216c46c
commit
3bb22f1c59
5 changed files with 24 additions and 7 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -44,3 +44,4 @@ lib/generated_plugin_registrant.dart
|
||||||
|
|
||||||
/key.jks
|
/key.jks
|
||||||
/android/key.properties
|
/android/key.properties
|
||||||
|
**/android/app/.cxx
|
|
@ -1,5 +1,5 @@
|
||||||
image:
|
image:
|
||||||
name: cirrusci/flutter
|
name: registry.gitlab.com/famedly/container/flutter-dockerimages:stable
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- coverage
|
- coverage
|
||||||
|
@ -19,16 +19,14 @@ test:
|
||||||
|
|
||||||
build_web:
|
build_web:
|
||||||
stage: coverage
|
stage: coverage
|
||||||
image: cirrusci/flutter:beta-web
|
image: registry.gitlab.com/famedly/container/flutter-dockerimages:beta
|
||||||
script:
|
script:
|
||||||
|
- sudo apt update
|
||||||
|
- sudo apt install curl -y
|
||||||
- rm -r assets/js/package
|
- rm -r assets/js/package
|
||||||
- cd assets/js/ && curl -O 'https://janian.de/index.php/s/ZKpQi4xFkGWPMHQ/download' && cd ../../
|
- cd assets/js/ && curl -O 'https://janian.de/index.php/s/ZKpQi4xFkGWPMHQ/download' && cd ../../
|
||||||
- cd assets/js/ && mv download olm.tar.gz && cd ../../
|
- cd assets/js/ && mv download olm.tar.gz && cd ../../
|
||||||
- cd assets/js/ && tar xaf olm.tar.gz && cd ../../
|
- cd assets/js/ && tar xaf olm.tar.gz && cd ../../
|
||||||
- flutter channel beta
|
|
||||||
- flutter upgrade
|
|
||||||
- flutter doctor --verbose
|
|
||||||
- flutter config --enable-web
|
|
||||||
- flutter pub get
|
- flutter pub get
|
||||||
- flutter clean
|
- flutter clean
|
||||||
- flutter build web --release --verbose
|
- flutter build web --release --verbose
|
||||||
|
|
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "ios/olm"]
|
||||||
|
path = ios/olm
|
||||||
|
url = https://gitlab.matrix.org/matrix-org/olm.git
|
|
@ -49,6 +49,11 @@ 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 {
|
||||||
|
@ -73,6 +78,15 @@ 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/olm
Submodule
1
ios/olm
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 930c4677547ebb3058680a9c3ad88186bb2030da
|
Loading…
Reference in a new issue