From c38759ac0d24f9145f9526e40f28f03ba41e2f30 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 20 Jul 2015 11:22:14 +0200
Subject: [PATCH 1/2] Create and explain version code schema.

---
 app/src/main/AndroidManifest.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 064c333b2..c6dd71353 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod"
-    android:versionCode="61"
-    android:versionName="1.3">
+    android:versionCode="1030001"
+    android:versionName="1.3-RC1">
+    <!--
+      Version code schema:
+      "1.2.3-SNAPSHOT" -> 1020300
+      "1.2.3-RC4"      -> 1020304
+      "1.2.3[-RELEASE] -> 1020399
+    -->
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

From 4e8f9a13aa15c50e3dacede393a4c3d40fbb4bcf Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 20 Jul 2015 11:35:26 +0200
Subject: [PATCH 2/2] Don't show version code, commit is short hash only (no
 tag)

---
 app/build.gradle                  | 3 +--
 app/src/main/templates/about.html | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 167e12933..daeb9ca39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,8 +121,7 @@ task filterAbout {
         from 'src/main/templates/about.html'
         into 'src/main/assets'
         filter(ReplaceTokens, tokens: [versionname: android.defaultConfig.versionName,
-                                       versioncode: android.defaultConfig.versionCode.toString(),
-                                       commit: "git describe".execute().text])
+                                       commit: "git rev-parse --short HEAD".execute().text])
     }
 }
 
diff --git a/app/src/main/templates/about.html b/app/src/main/templates/about.html
index f37c28229..7dd00cd16 100644
--- a/app/src/main/templates/about.html
+++ b/app/src/main/templates/about.html
@@ -41,8 +41,8 @@
 <div id="header" align="center">
     <img src="logo.png" alt="Logo" width="100px" height="100px"/>
 
-    <p>AntennaPod, Version @versionname@, Build @versioncode@</p>
-    <p>commit: @commit@</p>
+    <p>AntennaPod, Version @versionname@</p>
+    <p>Commit: @commit@</p>
 
     <p>Created by Daniel Oeh</p>