Merge pull request #1631 from nextcloud/centralizeAppVersioning

Centralize app's version code and name
nextcloud · Oct 16, 2017 · 4b66a0f · 4b66a0f
2 parents 860ffe0 + f1c2039
commit 4b66a0f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -77,6 +77,9 @@ android {
 
         multiDexEnabled true
 
+        versionCode = 20000099
+        versionName = "2.0.0"
+
         // adapt structure from Eclipse to Gradle/Android Studio expectations;
         // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
 

diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml
@@ -18,9 +18,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.owncloud.android"
-          android:versionCode="20000009"
-          android:versionName="2.0.0RC9">
+          package="com.owncloud.android">
 
     <application
         android:name=".MainApp"

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -19,9 +19,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.owncloud.android"
-          android:versionCode="20000009"
-          android:versionName="2.0.0RC9">
+          package="com.owncloud.android">
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/src/modified/AndroidManifest.xml b/src/modified/AndroidManifest.xml
@@ -18,9 +18,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.owncloud.android"
-          android:versionCode="20000009"
-          android:versionName="2.0.0RC9">
+          package="com.owncloud.android">
 
     <application
         android:name=".MainApp"