From 5ad6245e7246cab840d72618193e531726bd9ab8 Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Wed, 17 Feb 2016 12:06:41 +0100 Subject: [PATCH] Add version 2.0.3 of Berlin Vegan Guide First of all we use the correct version name, version code, and commit id. We do not need the sed-command anymore: I patched the fdroidserver (see commit dd0b38a), that if the version name is not found for some reason, it just uses the git tag. That is exactly, what we want. Removing the sed-command has one other advantage: the git repository has no changes anymore or in other words it is not 'dirty' anymore. So there is no '-dirty' string attached to the version string during our gradle build process. Also add Archive Policy. Only the newest version is going to build, the other builds are referring to the old github repository and fail. --- metadata/org.berlin_vegan.bvapp.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/metadata/org.berlin_vegan.bvapp.txt b/metadata/org.berlin_vegan.bvapp.txt index 6e914dec49..1291428126 100644 --- a/metadata/org.berlin_vegan.bvapp.txt +++ b/metadata/org.berlin_vegan.bvapp.txt @@ -52,20 +52,21 @@ Build:1.9,21 cd ../../ && \ ant prod.android -Build:2.0.3-fdroid,24 - disable=remove apk to get in sync with upstream VC - commit=2.0.3 +Build:2.0.3,24 + commit=8605e55d229f7d29fb93d3d865c02702c1a41966 subdir=app gradle=foss - prebuild=sed -i -e 's/versionName gitTag ?: gitBranch/versionName \"$$VERSION$$\"/g' -e 's/def gitDescription = dirtyWorkingCopy .*/def gitDescription = gitHash/g' -e '/playstoreCompile/d' build.gradle Maintainer Notes: * Versions <= 2.0 do not build from the current repo, but one needs to use the old repo -* AUM wont work, since we rely on the versionname, which yet cannot be parsed from gradle: - Auto Update Mode:Version +-fdroid %v +* Auto Update Mode is working, but only with a hack: with commit dd0b38a in fdroidserver the tag is used as versionname, if the versionname could not be parse from the manifest or gradle files. +* Archive Policy: 'Currently the only supported format is "n versions", where n is the number of versions to keep.' +* Auto Update Mode: '... if an app always has a tag "2.7.2" corresponding to version 2.7.2, you would simply specify "Version %v"' +* Update Check Mode: '... when apps tag non-release versions such as X.X-alpha, so you can filter them out with something like .*[0-9]$ which requires tag names to end with a digit.' . -Auto Update Mode:None -Update Check Mode:Tags -Current Version:Unknown +Archive Policy:1 versions +Auto Update Mode:Version %v +Update Check Mode:Tags .*[0-9]$ +Current Version:2.0.3 Current Version Code:24