Merge branch 'convquicksyfixes' into 'master'

Conversation/Quicksy/Snikket - no targetSdk changes, specify webrtc version, use ndk 21

See merge request fdroid/fdroiddata!6817
This commit is contained in:
Licaon_Kter 2020-05-19 12:25:42 +00:00
commit 3057f47ad4
3 changed files with 12 additions and 11 deletions

View file

@ -1827,13 +1827,12 @@ Builds:
commit: 2.8.4
gradle:
- conversationsFreeCompat
prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
-e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
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: r21
MaintainerNotes: |-
We go back to targetSdk 25 so users can disable the foreground service (and
annoying notification) if they choose to.
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.

View file

@ -325,9 +325,10 @@ Builds:
commit: 2.8.4
gradle:
- quicksyFreeCompat
prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
-e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
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: r21
AutoUpdateMode: None
UpdateCheckMode: None

View file

@ -27,9 +27,10 @@ Builds:
commit: 2.8.3
gradle:
- conversationsFreeCompat
prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
-e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
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: r21
MaintainerNotes: |-
We go back to targetSdk 25 so users can disable the foreground service (and