Merge branch 'master' into 'master'

Update Conversations to 0.5 (21)

local compile successful (sub-project "MemorizingTrustManager" needs target "android-7")

See merge request !186
This commit is contained in:
Ciaran Gultnieks 2014-07-26 15:25:37 +00:00
commit 4c36587afb

View file

@ -148,6 +148,22 @@ Build:0.5-beta,20
cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
Build:0.5,21
commit=0.5
submodules=yes
srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50
rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar
prebuild=pushd $$BouncyCastle$$ && \
ant -f ant/jdk15+.xml build-provider && \
popd && \
cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \
pushd $$Otr4j-jitsi$$ && \
$$MVN3$$ clean && \
$$MVN3$$ package && \
popd && \
cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
Auto Update Mode:None
Update Check Mode:Tags
Current Version:0.5