Merge branch 'master' into 'master'

Web Opac: run downloadJson task before assemble

We need to run this custom Gradle task do download configuration files for the app (one for each of the 1000+ libraries) from our server.

Somehow F-Droid does not run it automatically even though `assembleRelease` depends on it. So I put it to the `preassemble` option.

See merge request !1771
This commit is contained in:
Boris Kraut 2016-10-23 19:18:43 +00:00
commit 44c900cf83

View file

@ -885,6 +885,7 @@ Build:5.0.0,158
prebuild=cp -fR $$Endless$$/src/com src/main/java/ && \
cp -fR $$CWACAdapter$$/src/com src/main/java/ && \
sed -i -e '/endless/d' -e '/adapter/d' build.gradle
preassemble=downloadJson
Build:5.0.1,159
disable=crash
@ -896,6 +897,7 @@ Build:5.0.1,159
sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \
sed -i -e '/support-v4/acompile "com.commonsware.cwac:endless:1.2.3"' build.gradle && \
sed -i -e '/support-v4/acompile "com.commonsware.cwac:adapter:1.0.1"' build.gradle
preassemble=downloadJson
Build:5.0.2,160
disable=crash, wait for rebuild
@ -903,10 +905,11 @@ Build:5.0.2,160
subdir=opacclient/opacapp
submodules=yes
gradle=yes
srclibs=Endless@v1.2.3,CWACAdapter@v1.0.1
prebuild=cp -fR $$Endless$$/src/com src/main/java/ && \
cp -fR $$CWACAdapter$$/src/com src/main/java/ && \
sed -i -e '/endless/d' -e '/adapter/d' build.gradle
prebuild=echo 'repositories { maven { url "https://s3.amazonaws.com/repo.commonsware.com" } }' >> build.gradle && \
sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \
sed -i -e '/support-v4/acompile "com.commonsware.cwac:endless:1.2.3"' build.gradle && \
sed -i -e '/support-v4/acompile "com.commonsware.cwac:adapter:1.0.1"' build.gradle
preassemble=downloadJson
Auto Update Mode:Version %v
Update Check Mode:Tags