From 1946f07126476040d9331a6203091ca034c673a9 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Mon, 22 Aug 2016 00:44:58 +0200 Subject: [PATCH] Vespucci: Fix build --- metadata/de.blau.android.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/metadata/de.blau.android.txt b/metadata/de.blau.android.txt index 1bc673bdfa..d0bbb949f0 100644 --- a/metadata/de.blau.android.txt +++ b/metadata/de.blau.android.txt @@ -166,13 +166,13 @@ Build:0.9.8.0.1090-fdroid,65 sed -i -e 's/Vespucci/Vespucci (F-Droid)/g' res/values/appname.xml Build:0.9.7.1.1147-fdroid,76 - disable=missing value formKey, res issue commit=63b8d0f369a6a8bf0b6cd93e5dfe3e6f388c3b78 gradle=yes forceversion=yes - rm=libs/acra*.jar,libs/xmpcore*.jar,libs/signpost*.jar - prebuild=sed -i -e '/support-v4/acompile "ch.acra:acra:4.5.0"\ncompile "com.adobe.xmp:xmpcore:5.1.2"\ncompile "oauth.signpost:signpost-core:1.2.1.2"\ncompile "oauth.signpost:signpost-commonshttp4:1.2.1.2"' -e '/versionCode/d' -e '/versionName/d' build.gradle && \ - sed -i -e 's/Vespucci/Vespucci (F-Droid)/g' res/values/appname.xml + rm=libs/xmpcore*.jar,libs/signpost*.jar + prebuild=sed -i -e '/support-v4/acompile "com.adobe.xmp:xmpcore:5.1.2"\ncompile "oauth.signpost:signpost-core:1.2.1.2"\ncompile "oauth.signpost:signpost-commonshttp4:1.2.1.2"' -e '/versionCode/d' -e '/versionName/d' build.gradle && \ + sed -i -e 's/Vespucci/Vespucci (F-Droid)/g' res/values/appname.xml && \ + echo -e "android { lintOptions { disable 'ExtraTranslation' } }" >> build.gradle Maintainer Notes: * Remove versionCode and versionName from build.gradle due to mismatch (using @@ -180,13 +180,11 @@ Maintainer Notes: https://github.com/MarcusWolschon/osmeditor4android/issues/286 * Cannot replace JAR file with com.drewnoakes:metadata-extractor:2.8.1: https://github.com/MarcusWolschon/osmeditor4android/issues/285 -* Bump ArchivePolicy with each new-repo build until back to normal. * Upstream requires -fdroid specific appname Only build 0.9.7-MAINT for now! . -Archive Policy:3 versions Auto Update Mode:None Update Check Mode:Tags Current Version:0.9.7.1.1147