From 8086f107b55917ee735b74556d43d0458172b98f Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Mon, 23 Jan 2017 21:05:13 +0100 Subject: [PATCH] Don't update FTP Server to 2.13.1 (21301): fail to build locales --- metadata/be.ppareit.swiftp_free.txt | 15 ++++++++++++--- srclibs/locales.txt | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srclibs/locales.txt diff --git a/metadata/be.ppareit.swiftp_free.txt b/metadata/be.ppareit.swiftp_free.txt index 45eedeea23..81cdaf6666 100644 --- a/metadata/be.ppareit.swiftp_free.txt +++ b/metadata/be.ppareit.swiftp_free.txt @@ -94,18 +94,27 @@ Build:2.12.0,21200 prebuild=sed -i -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' build.gradle Build:2.13.0,21300 - disable=twofortyfouram's sdk seems non-free + disable=twofortyfouram's sdk needs to be replaced commit=v2.13 subdir=app gradle=fdroid_free prebuild=sed -i -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' -e '/twofortyfouram/d' build.gradle +Build:2.13.1,21301 + disable=fail to build locales + commit=v2.13.1 + subdir=app + gradle=fdroid_free + srclibs=locales@4.0.2 + prebuild=sed -i -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' -e '/twofortyfouram/d' build.gradle && \ + cp -fR $$locales$$/pluginClientSdkLib ../ && \ + sed -i -e '/fileTree/acompile project(":pluginClientSdkLib")' build.gradle && \ + echo -e "\ninclude ':pluginClientSdkLib'" >> ../settings.gradle + Maintainer Notes: Remove shrink/minify stuff since the proguard config is missing. Enable AUM again if upstream starts tagging properly (see v2.12 vs 2.12.0). - -Tasker/Locales plugin issue, see https://github.com/ppareit/swiftp/commit/80e9665b089b4fecaa585a9c75343fb56f6eb5cb#commitcomment-20399398. . Auto Update Mode:None diff --git a/srclibs/locales.txt b/srclibs/locales.txt new file mode 100644 index 0000000000..4071734da8 --- /dev/null +++ b/srclibs/locales.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/twofortyfouram/android-plugin-client-sdk-for-locale/