Merge branch 'nova' into 'master'

fix incorrect version pickup during autoupdate and remove unnecessary prebuild items

See merge request fdroid/fdroiddata!6994
This commit is contained in:
Licaon_Kter 2020-06-21 19:09:49 +00:00
commit 0c35f70f84

View file

@ -70,33 +70,6 @@ Builds:
gradleprops:
- universal
- versionName: $vName
versionCode: 404812
commit: v$vName_c404812
subdir: Video
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y -t testing nasm
- apt-get install -y ninja-build maven build-essential
- pip3 install meson==0.53.2
gradle:
- noamazon
output: build/outputs/apk/noamazon/release/Video-universal-release-unsigned.apk
rm:
- native/libtorrent/bin*
- native/torrentd/libs
- native/dav1d-android-builder/build-*
- native/ffmpeg-android-builder/dist-full-*
- MediaLib/libs/*jar
prebuild:
- sed -i -e 's/^\(\s*versionName\).*/\1 "$$VERSION$$"/g' build.gradle
- sed -i -e 's/^\(\s*\)2108380 .*/\1$$VERCODE$$/g' build.gradle
- rm -f FileCoreLibrary/libs/*jar
ndk: r21b
gradleprops:
- universal
- versionName: 4.48.13
versionCode: 404813
commit: v4.48.13_c404813
@ -116,10 +89,7 @@ Builds:
- native/dav1d-android-builder/build-*
- native/ffmpeg-android-builder/dist-full-*
- MediaLib/libs/*jar
prebuild:
- sed -i -e 's/^\(\s*versionName\).*/\1 "$$VERSION$$"/g' build.gradle
- sed -i -e 's/^\(\s*\)2108380 .*/\1$$VERCODE$$/g' build.gradle
- rm -f FileCoreLibrary/libs/*jar
prebuild: rm -f FileCoreLibrary/libs/*jar
ndk: r21b
gradleprops:
- universal