Merge branch 'owncloudnewsreader' into 'master'

ownCloud News Reader: Replace untrusted repos with srclibs and reactivate



See merge request !1157
This commit is contained in:
Boris Kraut 2016-01-21 16:48:50 +00:00
commit 2edf9fce09
3 changed files with 18 additions and 1 deletions

View file

@ -325,11 +325,24 @@ Build:0.9.7.5,102
gradle=yes gradle=yes
Build:0.9.7.6,103 Build:0.9.7.6,103
disable=untrusted maven repos!
commit=v.0.9.7.6 commit=v.0.9.7.6
subdir=News-Android-App subdir=News-Android-App
submodules=yes submodules=yes
init=sed -i -e '/com.nbsp:library/d' build.gradle && \
sed -i -e '/com.gu:option/d' build.gradle && \
sed -i -e '/maven { url/d' build.gradle && \
sed -i "/repositories {/a flatDir { dirs 'libs' }" build.gradle && \
sed -i "/dependencies {/a compile project(':MaterialFilePicker:library')" build.gradle && \
sed -i "$ ainclude ':MaterialFilePicker:library'" ../settings.gradle
gradle=yes gradle=yes
srclibs=MaterialFilePicker@6817d91,JavaOptionClass@e933c3a
prebuild=rm -rf $$MaterialFilePicker$$/app && \
cp -r $$MaterialFilePicker$$ ../ && \
pushd $$JavaOptionClass$$ && \
$$MVN3$$ package -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 && \
popd && \
mkdir libs && \
mv $$JavaOptionClass$$/target/option-1.3-SNAPSHOT.jar libs/option-1.3.jar
Maintainer Notes: Maintainer Notes:
# Auto Update Mode:Version v.%v # Auto Update Mode:Version v.%v

View file

@ -0,0 +1,2 @@
Repo Type:git
Repo:https://github.com/guardian/Option

View file

@ -0,0 +1,2 @@
Repo Type:git
Repo:https://github.com/nbsp-team/MaterialFilePicker