Merge branch 'convquicksy285' into 'master'

Conversations/Quicksy - 2.8.5

See merge request fdroid/fdroiddata!6859
This commit is contained in:
Licaon_Kter 2020-05-27 10:45:35 +00:00
commit 8a57f7a7a6
2 changed files with 24 additions and 4 deletions

View file

@ -1832,11 +1832,21 @@ Builds:
'/splits/,+5d' -e '/Variants.all/,+10d' build.gradle '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
ndk: r21b ndk: r21b
- versionName: 2.8.5+fcr
versionCode: 388
commit: 2.8.5
gradle:
- conversationsFreeCompat
prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
-e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
'/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
ndk: r21b
MaintainerNotes: |- MaintainerNotes: |-
For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
that won't be updated anymore so we'll need to start building locally in the future. that won't be updated anymore so we'll need to start building locally in the future.
AutoUpdateMode: Version ++fcr %v AutoUpdateMode: Version ++fcr %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 2.8.4+fcr CurrentVersion: 2.8.5+fcr
CurrentVersionCode: 387 CurrentVersionCode: 388

View file

@ -330,7 +330,17 @@ Builds:
'/splits/,+5d' -e '/Variants.all/,+10d' build.gradle '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
ndk: r21 ndk: r21
- versionName: 2.8.5+fcr
versionCode: 388
commit: 2.8.5
gradle:
- quicksyFreeCompat
prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
-e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
'/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
ndk: r21b
AutoUpdateMode: None AutoUpdateMode: None
UpdateCheckMode: None UpdateCheckMode: None
CurrentVersion: 2.8.4+fcr CurrentVersion: 2.8.5+fcr
CurrentVersionCode: 387 CurrentVersionCode: 388