Merge branch 'patch-2' into 'master'

Web Opac: cwac-wakeful library is not needed anymore

See merge request fdroid/fdroiddata!2681
This commit is contained in:
Michel Le Bihan 2017-11-26 19:17:31 +00:00
commit 9fda719040

View file

@ -1174,10 +1174,9 @@ Build:5.2.4,182
subdir=opacclient/opacapp
submodules=yes
gradle=yes
srclibs=CWACAdapter@v1.0.1,CWACWakeful@v1.0.5,Endless@v1.2.3
srclibs=CWACAdapter@v1.0.1,Endless@v1.2.3
rm=opacclient/opacapp/libs/*.jar
prebuild=cp -fR $$CWACAdapter$$/src/com src/main/java/ && \
cp -fR $$CWACWakeful$$/wakeful/src/com src/main/java/ && \
cp -fR $$Endless$$/src/com src/main/java/ && \
sed -i -e '/adapter/d' -e '/wakeful/d' -e '/endless/d' build.gradle
preassemble=downloadJson