Merge branch 'criticalmaps' into 'master'

Critical Maps: Fix build receipt for 2.2.0

Tested and works for me.

See merge request !1194
This commit is contained in:
Daniel Martí 2016-02-08 09:09:39 +00:00
commit 10db8d5057

View file

@ -101,13 +101,15 @@ Build:2.1.0,25
Build:2.2.0,27 Build:2.2.0,27
commit=2.2.0 commit=2.2.0
subdir=app subdir=app
init=sed -i "/dependencies {/a compile project(':OSMBonusPack')" build.gradle && \
sed -i "$ ainclude ':OSMBonusPack'" ../settings.gradle && \
sed -i "/<\/manifest>/i <uses-sdk tools:overrideLibrary='org.osmdroid.bonuspack'/>" src/main/AndroidManifest.xml && \
sed -i "/<manifest/a xmlns:tools='http://schemas.android.com/tools'" src/main/AndroidManifest.xml
gradle=yes gradle=yes
srclibs=OSMBonusPack@v5.3 srclibs=OSMBonusPack@v5.3
rm=app/libs rm=app/libs
prebuild=cp -r $$OSMBonusPack$$/src/main/java/org src/main/java &&cp -r $$OSMBonusPack$$/src/main/res src/main && \ prebuild=sed -i -e '/slf4j-android/d' $$OSMBonusPack$$/build.gradle && \
sed -n -e "27,28p" $$OSMBonusPack$$/build.gradle > temp.txt && \ cp -r $$OSMBonusPack$$ ../
sed -i '/dependencies/ r temp.txt' build.gradle && \
find . -name *.java -exec sed -i 's/org\.osmdroid\.bonuspack\.R/de\.stephanlindauer\.criticalmaps\.R/g' {} \;
Auto Update Mode:Version %v Auto Update Mode:Version %v
Update Check Mode:Tags Update Check Mode:Tags