From fd3da513423ed1075e8ae9066711eca5bac5b632 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 26 Jul 2016 22:30:10 -0400
Subject: [PATCH] android tagged builds exceed master versionCode

---
 android/AndroidManifest.xml     | 2 +-
 tools/update_android_version.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4afe95caa..66eb4b7b4 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.mavlink.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.0.0" android:versionCode="2970" android:installLocation="auto">
+<manifest package="org.mavlink.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.9.7b-515-g6a6d81c" android:versionCode="2972" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qgroundcontrol.qgchelper.UsbDeviceJNI" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="sensorLandscape" android:launchMode="singleTask" android:keepScreenOn="true">
             <intent-filter>
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index 4734957f1..4211dc982 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -7,6 +7,11 @@ MANIFEST_FILE=android/AndroidManifest.xml
 VERSIONCODE=`git rev-list origin/master --first-parent --count`
 VERSIONNAME=`git describe --always --tags | sed -e 's/^v//'`
 
+# increment the versionCode past master for tagged releases
+if [ "${TRAVIS_TAG}" ]; then
+	let VERSIONCODE=${VERSIONCODE}+1
+fi
+
 if [ -n "$VERSIONCODE" ]; then
 	sed -i -e "s/android:versionCode=\"[0-9][0-9]*\"/android:versionCode=\"$VERSIONCODE\"/" $MANIFEST_FILE
 	echo "Android version: ${VERSIONCODE}"
-- 
2.22.0