Merge pull request #2021 from owncloud/parameterize_versionCode

Include configurable versionCode and update versions for the 2.5.0 be…

Author: davigonz

AndroidManifest.xml

@@ -18,7 +18,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="20400000"
+    android:versionCode="${versionCode}"
     android:versionName="${versionName}">
 
     <uses-sdk

build.gradle

@@ -89,6 +89,7 @@ android {
 
     defaultConfig {
 
+        manifestPlaceholders.versionCode = "20400000"
         manifestPlaceholders.versionName = "2.4.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -188,7 +189,8 @@ android {
 
         beta {
 
-            manifestPlaceholders.versionName = "2.5.0-beta.1"
+            manifestPlaceholders.versionCode = "20400001"
+            manifestPlaceholders.versionName = "2.5.0-beta.2"
 
             applicationIdSuffix ".beta"
         }