From 869340cd369b84e61ecd3d3530f0a8a112165a6b Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 15 Apr 2019 15:57:42 +0200 Subject: [PATCH] minivector: add 0.8.29 Switch olm sourcelib to mirror while git.matrix.org is down. Explicitly point to the commit hash instead of a tag for olm because everyone can verify the commit is the same as in the upstream repo. The 3.0.0 tag signed by uhoreg/Hubert Chathi points to this commit. --- metadata/com.lavadip.miniVector.yml | 31 +++++++++++++++++++++++++++-- srclibs/olmsdk.txt | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/metadata/com.lavadip.miniVector.yml b/metadata/com.lavadip.miniVector.yml index 3d2df6d0f5..d32a15b03b 100644 --- a/metadata/com.lavadip.miniVector.yml +++ b/metadata/com.lavadip.miniVector.yml @@ -401,7 +401,34 @@ Builds: libs/matrix-sdk.aar ndk: r17b + versionCode: 82900 + commit: miniv0.8.29-fdroid + subdir: vector + gradle: + - appfdroid + srclibs: + - mini-matrixsdk@v0.9.20-no-webrtc + - olmsdk@ec2695b9c945fa577c6fc4501d65a186208ecfed + prebuild: + - sed -i -e '/com.google.firebase/d' build.gradle + - sed -i -e '/com.google.gms.google-services/d' build.gradle + - mkdir -p libs + build: + - pushd $$olmsdk$$/android + - echo ndk.dir=$$NDK$$ > local.properties + - gradle assembleRelease + - popd + - cp $$olmsdk$$/android/olm-sdk/build/outputs/aar/olm-sdk-release-*.aar libs/olm-sdk.aar + - mkdir -p $$mini-matrixsdk$$/matrix-sdk/libs + - cp $$olmsdk$$/android/olm-sdk/build/outputs/aar/olm-sdk-release-*.aar $$mini-matrixsdk$$/matrix-sdk/libs/olm-sdk.aar + - pushd $$mini-matrixsdk$$ + - gradle clean assembleRelease + - popd + - cp $$mini-matrixsdk$$/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar + libs/matrix-sdk.aar + ndk: r17c + AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 0.8.28 -CurrentVersionCode: 82800 +CurrentVersion: 0.8.29 +CurrentVersionCode: 82900 diff --git a/srclibs/olmsdk.txt b/srclibs/olmsdk.txt index 27a3d41503..054f2207f3 100644 --- a/srclibs/olmsdk.txt +++ b/srclibs/olmsdk.txt @@ -1,2 +1,2 @@ -Repo:http://git.matrix.org/git/olm.git +Repo:https://github.com/Bubu/olm-mirror Repo Type:git