From e7c62e2fb3054e548a395fe7fc995d7635e6579c Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Fri, 12 Dec 2014 19:54:39 +0100 Subject: [PATCH] Update Man Man to 1.2.5 (125) --- metadata/com.adonai.manman.txt | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/metadata/com.adonai.manman.txt b/metadata/com.adonai.manman.txt index f88266712f..0083c15f56 100644 --- a/metadata/com.adonai.manman.txt +++ b/metadata/com.adonai.manman.txt @@ -50,30 +50,13 @@ Build:1.2.3,123 gradle=yes prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle -Build:1.2.4,124 - commit=1.2.4 +Build:1.2.5,125 + commit=ab2ffbc6cf41877123f7960cbb6ba37d7c3d41e8 subdir=app - gradle=Fdroid - prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' -e 's/gradle:1.0.0/gradle:0.14.0/g' build.gradle ../build.gradle - -#Build:1.2.4,124 -# commit=1.2.4 -# subdir=app -# gradle=Fdroid -# prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' -e 's/gradle:1.0.0/gradle:0.14.0/g' build.gradle ../build.gradle && \ -# echo 'task assembleFdroidRelease(dependsOn: "assembleFdroid") << { }' >> build.gradle + gradle=fdroid Maintainer Notes: -Upstream runs `gradle assembleFdroid` to generate a floss build. Building with -the "FDroid" flavor within fdroid tries to run assembleFdroidRelease. I don't -know if this is expected gradle behavior or if we make assumptions on our side -that make sense, but don't have to be true. - -Quickfix is to introduce the needed task which depends on what upstream runs. -Currently this works fine, but we are not able to pickup the apk file at the -end of the build process. - -Disabling AUM until things have been sorted out. +Reset AUM when 125 fixes are in a tagged release. . #Auto Update Mode:Version %v