From f8fcb918f2cff14d95a310c18aed98a534a49f6d Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 25 Jan 2015 15:05:35 +0100 Subject: [PATCH] Don't update Lumicall to 1.11.11 (166): Builds, but needs testing and jarcheck. --- metadata/org.lumicall.android.txt | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/metadata/org.lumicall.android.txt b/metadata/org.lumicall.android.txt index 8a368f4bec..6cc9aa84bf 100644 --- a/metadata/org.lumicall.android.txt +++ b/metadata/org.lumicall.android.txt @@ -152,9 +152,11 @@ Build:1.11.10,165 commit=1.11.10 buildjni=yes submodules=yes + extlibs=android/android-support-v4.jar srclibs=PBKDF2@v1.1.0,dnsjava@dnsjava-2.1.6,RemoteTea@release-1.1.0,libphonenumber@libphonenumber-7.0.2 rm=libs/*.jar - prebuild=echo "project.target.apilevel=8" > ant.properties && \ + prebuild=cp assets/app.properties-prod app.properties && \ + echo "project.target.apilevel=8" > ant.properties && \ sed -i -e '//d' custom_rules.xml && \ mv zrtp zorg-java && mkdir zrtp && mv zorg-java zrtp/ && \ pushd $$PBKDF2$$ && gradle install && popd && cp $$PBKDF2$$/build/libs/PBKDF2-1.1.0.jar libs/ && \ @@ -162,6 +164,21 @@ Build:1.11.10,165 pushd $$libphonenumber$$/java/ && $$MVN3$$ package && popd && cp $$libphonenumber$$/java/libphonenumber/target/libphonenumber-7.0.2.jar libs/ && \ pushd $$RemoteTea$$ && ant -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 jar && popd && cp $$RemoteTea$$/classes/oncrpc*jar libs/oncrpc-1.0.7.jar && cp libs/oncrpc-1.0.7.jar gmetric4j/lib/oncrpc-1.0.7.jar +Build:1.11.11,166 + disable=builds, needs testing, needs jarcheck + commit=b77763126bbefa70868b17ce2195448dd5334360 + buildjni=yes + submodules=yes + extlibs=android/android-support-v4.jar + srclibs=PBKDF2@v1.1.0,dnsjava@dnsjava-2.1.6,RemoteTea@release-1.1.0,libphonenumber@libphonenumber-7.0.2 + rm=libs/*.jar + prebuild=cp assets/app.properties-prod app.properties && \ + echo "project.target.apilevel=8" > ant.properties && \ + pushd $$PBKDF2$$ && gradle install && popd && cp $$PBKDF2$$/build/libs/PBKDF2-1.1.0.jar libs/ && \ + pushd $$dnsjava$$ && ant jar && popd && cp $$dnsjava$$/dnsjava-*.jar libs/ && \ + pushd $$libphonenumber$$/java/ && $$MVN3$$ package && popd && cp $$libphonenumber$$/java/libphonenumber/target/libphonenumber-7.0.2.jar libs/ && \ + pushd $$RemoteTea$$ && ant -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 jar && popd && cp $$RemoteTea$$/classes/oncrpc*jar libs/oncrpc-1.0.7.jar && cp libs/oncrpc-1.0.7.jar gmetric4j/lib/oncrpc-1.0.7.jar + Maintainer Notes: TODO: oncrpc 1.0.7 is 7dda2ba52e7d999c52648ead1e747dd7ca64325c ; last/only tag is release-1.1.0 .