From 70cb8fb3edafcc9cceffdcdf16c2c3741a7c3362 Mon Sep 17 00:00:00 2001 From: Johan von Forstner Date: Thu, 20 Oct 2016 23:44:04 +0200 Subject: [PATCH] Web Opac: run downloadJson task before assemble somehow F-Droid does not run this automatically even though assembleRelease depends on it --- metadata/de.geeksfactory.opacclient.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/metadata/de.geeksfactory.opacclient.txt b/metadata/de.geeksfactory.opacclient.txt index 5cf003d4f4..decbad13bf 100644 --- a/metadata/de.geeksfactory.opacclient.txt +++ b/metadata/de.geeksfactory.opacclient.txt @@ -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